Merge pull request #253 from fleetbase/dev-v0.4.22

dev-v0.4.22

.dockerignore

@@ -14,6 +14,7 @@ concourse/
 infra/*
 vagrant/*
 docker/Dockerfile
+docker/database/
 deploy/*
 media/*
 data/*
@@ -23,4 +24,4 @@ docker-compose-prod.yml
 docker-compose.yml
 $virtualenv.tar.gz
 $node_modules.tar.gz
-docker-compose.override.yml
+docker-compose.override.yml

.github/workflows/cd.yml

@@ -2,14 +2,15 @@ name: Fleetbase CI/CD
 
 on:
   push:
-    branches: [ "deploy/*" ]
+    branches: ["deploy/*"]
 
 concurrency:
-    group: ${{ github.ref }}
-    cancel-in-progress: true
+  group: ${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   PROJECT: ${{ secrets.PROJECT }}
+  GITHUB_AUTH_KEY: ${{ secrets._GITHUB_AUTH_TOKEN }}
 
 jobs:
   build_service:
@@ -17,59 +18,52 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write # This is required for requesting the JWT
-      contents: read  # This is required for actions/checkout
+      contents: read # This is required for actions/checkout
 
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
-    - name: Set Dynamic ENV Vars
-      run: |
+      - name: Set Dynamic ENV Vars
+        run: |
           SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
           echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
           echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
 
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
-        role-session-name: github
-        aws-region: ${{ secrets.AWS_REGION }}
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}
 
-    - name: Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
 
-    - name: Prepare Composer Auth Secret
-      run: |
-        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
-          echo '{"github-oauth": {"github.com": "'${{ secrets._GITHUB_AUTH_TOKEN }}'"}}' > composer-auth.json
-        else
-          echo '{}' > composer-auth.json
-        fi
+      - name: Build and Release
+        uses: docker/bake-action@v2
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
+          VERSION: ${{ env.VERSION }}
+          GITHUB_AUTH_KEY: ${{ env.GITHUB_AUTH_KEY }}
+          CACHE: type=gha
+        with:
+          push: true
+          files: |
+            ./docker-bake.hcl
 
-    - name: Build and Release
-      uses: docker/bake-action@v2
-      env: 
-        REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
-        VERSION: ${{ env.VERSION }}
-        CACHE: type=gha
-      with:
-        push: true
-        files: |
-          ./docker-bake.hcl
-
-    - name: Download ecs-tool
-      run: |
+      - 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
-    
-    - name: Deploy the images 🚀
-      run: |-
+
+      - 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
@@ -81,29 +75,29 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write # This is required for requesting the JWT
-      contents: read  # This is required for actions/checkout
+      contents: read # This is required for actions/checkout
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: true
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
 
-    - name: Set Dynamic ENV Vars
-      run: |
+      - name: Set Dynamic ENV Vars
+        run: |
           SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
           echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
           echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
 
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
-        role-session-name: github
-        aws-region: ${{ secrets.AWS_REGION }}
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}
 
-    - name: Get infra-provided configuration
-      run: |
+      - name: Get infra-provided configuration
+        run: |
           set -eu
 
           wget -O- https://github.com/springload/ssm-parent/releases/download/1.8.0/ssm-parent_1.8.0_linux_amd64.tar.gz | tar xvzf - ssm-parent
@@ -112,52 +106,52 @@ jobs:
           # remove double quotes and pipe into the env
           cat /tmp/dotenv.file | sed -e 's/"//g' >> $GITHUB_ENV
 
-    - name: Install Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
 
-    - uses: pnpm/action-setup@v2
-      name: Install pnpm
-      id: pnpm-install
-      with:
-        version: 8
-        run_install: false
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false
 
-    - name: Get pnpm Store Directory
-      id: pnpm-cache
-      shell: bash
-      run: |
-        echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - name: Get pnpm Store Directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
-      name: Setup pnpm Cache
-      with:
-        path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-store-
+      - uses: actions/cache@v3
+        name: Setup pnpm Cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
-    - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
-      run: |
-        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
-        fi
-      working-directory: ./console
+      - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+        run: |
+          if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
+            echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
+          fi
+        working-directory: ./console
 
-    - name: Install dependencies
-      run: pnpm install
-      working-directory: ./console
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: ./console
 
-    - name: Build
-      run: |
-        set -eu
+      - name: Build
+        run: |
+          set -eu
 
-        pnpm build
-      working-directory: ./console
-    
-    - name: Deploy Console 🚀
-      run: |
+          pnpm build --environment production
+        working-directory: ./console
+
+      - name: Deploy Console 🚀
+        run: |
           set -u
 
           DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}

.github/workflows/eks-cd.yml

@@ -0,0 +1,170 @@
+name: Fleetbase EKS CI/CD
+
+on:
+  push:
+    branches: ["eksdeploy/*"]
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  PROJECT: ${{ secrets.PROJECT }}
+  GITHUB_AUTH_KEY: ${{ secrets._GITHUB_AUTH_TOKEN }}
+
+jobs:
+  build_service:
+    name: Build and Deploy the Service
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read # This is required for actions/checkout
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set Dynamic ENV Vars
+        run: |
+          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
+          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
+          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.EKS_DEPLOYER_ROLE }}
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build and Release
+        uses: docker/bake-action@v2
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
+          VERSION: ${{ env.VERSION }}
+          GITHUB_AUTH_KEY: ${{ env.GITHUB_AUTH_KEY }}
+          CACHE: type=gha
+        with:
+          push: true
+          files: |
+            ./docker-bake.hcl
+
+      - name: Update kube config
+        run: aws eks update-kubeconfig --name ${{ secrets.EKS_CLUSTER_NAME }} --region ${{ secrets.AWS_REGION }}
+
+      - name: Deploy the images 🚀
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
+        run: |-
+          set -eu
+          # run deploy.sh script before deployments
+          helm upgrade -i ${{ env.PROJECT }} infra/helm -n ${{ env.PROJECT}}-${{ env.STACK }} --set image.repository=${{ env.REGISTRY }} \
+            --set image.tag=${{ env.VERSION }} --set 'api_host=${{ secrets.API_HOST }}' --set 'socketcluster_host=${{ secrets.SOCKETCLUSTER_HOST }}' \
+            --set gcp=false --set 'ingress.annotations.kubernetes\.io/ingress\.class=null' --set 'ingress.annotations.alb\.ingress\.kubernetes\.io/scheme=internet-facing' \
+            --set serviceAccount.name=default --set serviceAccount.create=false --set ingress.className=alb \
+            --set 'ingress.annotations.alb\.ingress\.kubernetes\.io/listen-ports=[{"HTTPS":443}]' \
+            --set service.type=NodePort
+
+  build_frontend:
+    name: Build and Deploy the Console
+    needs: [build_service]
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read # This is required for actions/checkout
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set Dynamic ENV Vars
+        run: |
+          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
+          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
+          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.EKS_DEPLOYER_ROLE }}
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Get infra-provided configuration
+        run: |
+          set -eu
+
+          wget -O- https://github.com/springload/ssm-parent/releases/download/1.8.0/ssm-parent_1.8.0_linux_amd64.tar.gz | tar xvzf - ssm-parent
+
+          ./ssm-parent -n /actions/${{ env.PROJECT }}/${{ env.STACK }}/configuration dotenv /tmp/dotenv.file
+          # remove double quotes and pipe into the env
+          cat /tmp/dotenv.file | sed -e 's/"//g' >> $GITHUB_ENV
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm Store Directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        name: Setup pnpm Cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+        run: |
+          if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
+            echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
+          fi
+        working-directory: ./console
+
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: ./console
+
+      - name: Build
+        env:
+          API_HOST: ${{ secrets.API_HOST }}
+          SOCKETCLUSTER_HOST: ${{ secrets.SOCKETCLUSTER_HOST }}
+          SOCKETCLUSTER_PORT: "443" # it uses common ingress so port 443
+        run: |
+          set -eu
+
+          pnpm build --environment production
+        working-directory: ./console
+
+      - name: Deploy Console 🚀
+        run: |
+          set -u
+
+          DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}
+          # 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
+          ./s3deploy -region ${AWS_REGION} -source console/dist -bucket ${DEPLOY_BUCKET}

.github/workflows/gcp-cd.yml

@@ -0,0 +1,185 @@
+name: Fleetbase CI/CD
+
+on:
+  push:
+    branches: [ "gcpdeploy/*" ]
+
+concurrency:
+    group: ${{ github.ref }}
+    cancel-in-progress: true
+
+env:
+  PROJECT: ${{ vars.PROJECT }}
+  REGISTRY: ${{ vars.REGISTRY }}
+  SOCKETCLUSTER_HOST: ${{ vars.SOCKETCLUSTER_HOST }}
+  API_HOST: ${{ vars.API_HOST }}
+  K8S_CLUSTER_NAME: ${{ vars.K8S_CLUSTER_NAME }}
+  K8S_CLUSTER_LOCATION: ${{ vars.K8S_CLUSTER_LOCATION }}
+  GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+  GCP_SERVICE_ACCOUNT: ${{ vars.GCP_SERVICE_ACCOUNT }}
+  GCP: "True" # switches docker builds to GCP-style registry
+
+jobs:
+  build_service:
+    name: Build and Deploy the Service
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Set Dynamic ENV Vars
+      run: |
+          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
+          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
+          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
+          echo "REGISTRY_HOST=$(dirname $(dirname $REGISTRY))" >> $GITHUB_ENV
+
+    - id: 'auth'
+      name: 'Authenticate to Google Cloud'
+      uses: 'google-github-actions/auth@v1'
+      with:
+        token_format: "access_token"
+        create_credentials_file: true
+        workload_identity_provider: ${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+        service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
+
+    - name: 'Set up Cloud SDK'
+      uses: 'google-github-actions/setup-gcloud@v1'
+
+    - id: 'get-credentials'
+      uses: 'google-github-actions/get-gke-credentials@v1'
+      with:
+        cluster_name: ${{ env.K8S_CLUSTER_NAME }}
+        location: ${{ env.K8S_CLUSTER_LOCATION }}
+
+    - uses: 'docker/login-action@v3'
+      with:
+        registry: ${{ env.REGISTRY_HOST }}
+        username: 'oauth2accesstoken'
+        password: '${{ steps.auth.outputs.access_token }}'
+
+    - name: Prepare Composer Auth Secret
+      run: |
+        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
+          echo '{"github-oauth": {"github.com": "'${{ secrets._GITHUB_AUTH_TOKEN }}'"}}' > composer-auth.json
+        else
+          echo '{}' > composer-auth.json
+        fi
+
+    - name: nullify ssm-parent config
+      run: |
+        # this is needed to disable ssm-parent, which is used on AWS
+        echo > api/.ssm-parent.yaml
+
+    - name: Build and Release
+      uses: docker/bake-action@v2
+      env: 
+        REGISTRY: ${{ env.REGISTRY }}
+        VERSION: ${{ env.VERSION }}
+        CACHE: type=gha
+      with:
+        push: true
+        files: |
+          ./docker-bake.hcl
+
+    - name: deploy with helm
+      run: |
+        helm upgrade -i fleetbase infra/helm -n ${{ env.PROJECT }}-${{ env.STACK }} --set image.repository=${{ env.REGISTRY }} --set image.tag=${{ env.VERSION }} --set 'api_host=${{ env.API_HOST }}' --set 'socketcluster_host=${{ env.SOCKETCLUSTER_HOST }}' --set 'ingress.annotations.kubernetes\.io/ingress\.global-static-ip-name=${{ env.PROJECT }}-${{ env.STACK }}' 
+
+  build_frontend:
+    name: Build and Deploy the Console
+    needs: [build_service]
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Set Dynamic ENV Vars
+      run: |
+          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
+          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
+          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
+
+    - id: 'auth'
+      name: 'Authenticate to Google Cloud'
+      uses: 'google-github-actions/auth@v1'
+      with:
+        token_format: "access_token"
+        create_credentials_file: true
+        workload_identity_provider: ${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+        service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
+
+    - name: 'Set up Cloud SDK'
+      uses: 'google-github-actions/setup-gcloud@v1'
+
+    - name: Install Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+    - uses: pnpm/action-setup@v2
+      name: Install pnpm
+      id: pnpm-install
+      with:
+        version: 8
+        run_install: false
+
+    - name: Get pnpm Store Directory
+      id: pnpm-cache
+      shell: bash
+      run: |
+        echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+    - uses: actions/cache@v3
+      name: Setup pnpm Cache
+      with:
+        path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-store-
+
+    - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+      run: |
+        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
+          echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
+        fi
+      working-directory: ./console
+
+    - name: Install dependencies
+      run: pnpm install
+      working-directory: ./console
+
+    - name: Build
+      env:
+        SOCKETCLUSTER_HOST: ${{ env.SOCKETCLUSTER_HOST }}
+        SOCKETCLUSTER_SECURE: "true"
+        SOCKETCLUSTER_PORT: "443"
+        API_HOST: ${{ env.API_HOST }}
+      run: |
+        set -eu
+
+        pnpm build --environment production
+      working-directory: ./console
+
+    - name: Deploy Console 🚀
+      run: |
+          set -eu
+
+          gcloud app deploy --appyaml console/app.yaml console/dist
+          # leave 2 versions
+          gcloud app versions list --filter="traffic_split=0" --sort-by '~version' --format 'value(version.id)' | sed '1d' | xargs -r gcloud app versions delete

.gitignore

@@ -15,12 +15,22 @@ api/vendor
 api/composer.dev.json
 api/composer-install-dev.sh
 api/auth.json
+api/crontab
 act.sh
 composer-auth.json
-packages/billing-api
-packages/billing-engine
-packages/flespi-engine
-packages/flespi-integration
-packages/projectargus-engine
 docker/database/*
-docker/database/mysql/*
+docker/database/mysql/*
+.talismanrc
+verdaccio/minio
+verdaccio/config/htpasswd
+verdaccio/storage
+# private packages
+packages/billing
+packages/flespi
+packages/loconav
+packages/internals
+packages/projectargus-engine
+# wip
+packages/solid
+solid
+verdaccio

.gitmodules

@@ -39,6 +39,3 @@
 [submodule "docs/api-reference"]
 	path = docs/api-reference
 	url = git@github.com:fleetbase/api-reference.git
-[submodule "packages/solid"]
-	path = packages/solid
-	url = git@github.com:fleetbase/solid.git

.s3deploy.yml

@@ -7,7 +7,11 @@ routes:
     headers:
       Cache-Control: "max-age=600, no-transform, public"
     gzip: false
-  - route: "^.+\\.(html|xml|json)$"
+  - route: "^.+\\.(xml|json)$"
+    headers:
+      Cache-Control: "max-age=600, no-transform, public"
+    gzip: true
+  - route: "^.+\\.(html)$"
     headers:
       Cache-Control: "public, max-age=0, must-revalidate"
     gzip: true

COMMERCIAL_LICENSE.md

@@ -0,0 +1,11 @@
+FLEETBASE DUAL LICENSE
+
+COPYRIGHT (C) 2024 FLEETBASE PTE LTD.
+
+PERMISSION IS HEREBY GRANTED, FREE OF CHARGE, TO ANY PERSON OBTAINING A COPY OF THIS SOFTWARE AND ASSOCIATED DOCUMENTATION FILES (THE "SOFTWARE"), TO USE THE SOFTWARE FOR NON-COMMERCIAL PURPOSES ONLY. NON-COMMERCIAL PURPOSES INCLUDE INTERNAL OPERATIONS, ACADEMIC RESEARCH, PERSONAL PROJECTS, OR ANY OTHER USE THAT IS NOT INTENDED FOR COMMERCIAL GAIN.
+
+FOR VERSIONS 0.4.10 ONWARDS, YOU ARE PERMITTED TO USE THE SOFTWARE FOR NON-COMMERCIAL PURPOSES FREE OF CHARGE. HOWEVER, COMMERCIAL USE OF THIS SOFTWARE, INCLUDING BUT NOT LIMITED TO BUILDING SAAS PLATFORMS, OFFERING SERVICES TO THIRD PARTIES, OR INTEGRATING WITH COMMERCIAL PRODUCTS, REQUIRES THE PURCHASE OF A COMMERCIAL LICENSE FROM FLEETBASE PTE LTD.
+
+FOR INQUIRIES REGARDING COMMERCIAL LICENSING OR ANY OTHER QUESTIONS RELATED TO FLEETBASE, PLEASE CONTACT HELLO@FLEETBASE.IO.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Caddyfile

@@ -0,0 +1,12 @@
+{
+	frankenphp
+	order php_server before file_server
+}
+
+http://:8000 {
+	root * /fleetbase/api/public
+	encode zstd gzip
+	php_server {
+		resolve_root_symlink
+	}
+}

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Fleetbase Pte Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

LICENSE.md

@@ -0,0 +1,21 @@
+MIT LICENSE
+
+COPYRIGHT (C) 2023 FLEETBASE PTE LTD
+
+PERMISSION IS HEREBY GRANTED, FREE OF CHARGE, TO ANY PERSON OBTAINING A COPY
+OF THIS SOFTWARE AND ASSOCIATED DOCUMENTATION FILES (THE "SOFTWARE"), TO DEAL
+IN THE SOFTWARE WITHOUT RESTRICTION, INCLUDING WITHOUT LIMITATION THE RIGHTS
+TO USE, COPY, MODIFY, MERGE, PUBLISH, DISTRIBUTE, SUBLICENSE, AND/OR SELL
+COPIES OF THE SOFTWARE, AND TO PERMIT PERSONS TO WHOM THE SOFTWARE IS
+FURNISHED TO DO SO, SUBJECT TO THE FOLLOWING CONDITIONS:
+
+THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN ALL
+COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,60 +1,47 @@
 <div id="hero">
   <p align="center" dir="auto">
       <a href="https://fleetbase.io" rel="nofollow">
-        <img src="https://user-images.githubusercontent.com/58805033/191936702-fed04b0f-7966-4041-96d0-95e27bf98248.png" alt="Fleetbase logo" width="600" height="140" style="max-width: 100%;">
+        <img src="https://user-images.githubusercontent.com/58805033/191936702-fed04b0f-7966-4041-96d0-95e27bf98248.png" alt="Fleetbase logo" width="500" height="120" style="max-width: 100%;">
       </a>
     </p>
     <p align="center" dir="auto">
-      Open Source Modular Logistics Platform
+      Modular logistics and supply chain operating system
       <br>
-      <a href="https://fleetbase.github.io/guides" rel="nofollow">Fleetbase Documentation →</a>
-      <br>
-      <br>
-      <a href="https://meetings.hubspot.com/shiv-thakker" rel="nofollow">Book a Demo</a>
-      <br>
-      <br>
-      <a href="https://github.com/fleetbase/fleetbase/issues">Report an Issue</a>
+      <a href="https://fleetbase.github.io/guides" rel="nofollow">Documentation</a>
       ·
-      <a href="https://fleetbase.github.io/api-reference">API Reference</a>
-      ·
-      <a href="https://fleetbase.github.io/guides">Guides</a>
-      ·
-      <a href="https://github.com/fleetbase/fleetbase/issues">Request a Feature</a>
-      ·
-      <a href="https://www.fleetbase.io/blog-2" rel="nofollow">Blog</a>
+      <a href="https://console.fleetbase.io" rel="nofollow">Cloud Version</a>
       ·
       <a href="https://fleetbase.apichecker.com" target="_api_status" rel="nofollow">API Status</a>
       ·
+      <a href="https://meetings.hubspot.com/shiv-thakker" rel="nofollow">Book a Demo</a>
+      ·
       <a href="https://discord.gg/V7RVWRQ2Wm" target="discord" rel="nofollow">Discord</a>
     </p>
     <hr />
 </div>
 
-# ⭐️ Overview
+## What is Fleetbase?
 
-Fleetbase is an open-source modular platform designed for the efficient management and orchestration of logistics operations. It serves as both a powerful operational tool for businesses and a flexible foundation for developers. The platform's core is built around a collection of "extensions," which create a customizable framework capable of meeting a wide range of supply chain and logistics requirements.
-
-Each extension in Fleetbase is purposefully engineered to fulfill specific roles within the logistics ecosystem. Users have the freedom to create their own extensions, expanding the platform's ecosystem and ensuring its adaptability to various use cases. This extensible nature keeps Fleetbase at the forefront of addressing diverse logistical and supply chain needs now and in the future.
+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/deef79fa-e30c-4ce9-8a04-0dee990ffd9d" alt="Fleetbase Console" width="600" style="max-width: 100%;" />
+  <img src="https://github.com/fleetbase/fleetbase/assets/816371/125348c9-c88a-49fe-b098-9abec9d7dff8" alt="Fleetbase Console" width="1200" style="max-width: 100%;" />
 </p>
 
-<div align="center">
-  <a href="https://www.producthunt.com/posts/fleetbase-alpha" target="_producthunt">🚀 We've just announced our Alpha release on Product Hunt! 🚀</a>
-  <p>Check Fleetbase out on ProductHunt, and support with a Upvote!</p>
-  <a href="https://www.producthunt.com/posts/fleetbase-alpha?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-fleetbase&#0045;alpha" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=399731&theme=light" alt="Fleetbase&#0032;&#0040;Alpha&#0041; - The&#0032;open&#0032;source&#0032;OnFleet&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-  
+**Quickstart**
 
-# 📖 Table of contents
+```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
+```
 
-  - [What's Included](#-whats-included)
-  - [Getting Started](#-getting-started)
-  - [Use Cases](#-use-cases)
-  - [Installation](#-installation)
-  - [Extensions](#-extensions)
-  - [Apps](#-apps)
+## 📖 Table of contents
+
+  - [Features](#-features)
+  - [Install](#-install)
   - [Roadmap](#-roadmap)
   - [Bugs and Feature Requests](#-bugs-and--feature-requests)
   - [Documentation](#-documentation)
@@ -63,245 +50,85 @@ Each extension in Fleetbase is purposefully engineered to fulfill specific roles
   - [Creators](#-creators)
   - [License & Copyright](#-license-and-copyright)
 
-# 📦 What's Included
+## 📦 Features
+- **Extensible:** Build installable extensions and additional functionality directly into the OS via modular architecture.
+- **Developer Friendly:** RESTful API, socket, and webhooks to seamlessly integrate with external systems or develop custom applications.
+- **Native Apps:** Collection of open-source and native apps designed for operations and customer facing.
+- **Collaboration:** Dedicated chat and comments system for collaboration across your organization.
+- **Security:** Secure data encryption, adherence to industry-standard security practices, and a comprehensive dynamic Identity and Access Management (IAM) system.  
+- **Telematics:** Integrate and connect to hardware devices and sensors to provide more feedback and visibility into operations.
+- **Internationalized:** Translate into multiple languages to accommodate diverse user bases and global operations.
+- **Framework:** PHP core built around logistics and supply chain abstractions to streamline extension development.
+- **Dynamic:** Configurable rules, flows and logic to enable automation and customization.
+- **UI/UX:** Clean, responsive user-friendly interface for efficient management and operations from desktop or mobile.
+- **Dashboards:** Create custom dashboards and widgets to get full visibility into operations.  
+- **Scalability:** Uninterrupted growth with scalable infrastructure and design, capable of handling increasing data volume and user demand as your business expands.
+- **Continuous Improvements:** Commitment to continuous improvement, providing regular updates that seamlessly introduce optimizations, new features, and overall enhancements to the OS.
+- **Open Source:** Deploy it either on-premise or in the cloud according to your organization's needs and preferences.
 
-Fleetbase is more than just a platform; it's a versatile ecosystem carefully architected to empower developers and businesses alike. Fleetbase comes pre-installed with a few extensions that provide base functionality to get users and businesses started:
-
-<ul>
-  <li>
-    <strong>Console</strong>: Fleetbase's frontend console is built with Ember.js and Ember Engines, offering a modular and extensible design. This design allows the system to easily adapt and scale according to your evolving needs while simplifying the integration of new extensions. By leveraging the console's design, extensions can be seamlessly installed using their respective package managers, reducing complexity and integration time.
-  </li>
-  <li>
-    <strong>Fleetbase API</strong>: Fleetbase's backend API and framework are built with Laravel, providing a robust and flexible infrastructure for extension development and integration. The system efficiently manages complex data structures and transactions while seamlessly incorporating new extensions through package managers. We offer additional packages for developers to create custom extensions, enhancing the flexibility and extensibility of the Fleetbase ecosystem.
-  </li>
-  <li>
-    <strong>Extensions</strong>: Fleetbase is designed to provide immediate utility out-of-the-box. It comes pre-installed with several key extensions
-    <ul>
-      <li><strong>FleetOps</strong>: FleetOps, our comprehensive fleet management extension, caters to all aspects of last-mile operations. Some of it's features include:
-        <ul>
-          <li>
-            Real-time tracking for vehicles and assets, ensuring optimal operational efficiency.
-          </li>
-          <li>
-            Order creation and management, facilitating seamless transaction processing.
-            Service rates management, helping maintain financial transparency and profitability.
-          </li>
-          <li>
-            Fleet management, providing a holistic view and control of your fleet.
-          </li>
-          <li>
-            Third-party vendor integrations, allowing you to consolidate your resources.
-          </li>
-          <li>
-            API & Webhooks that not only offer increased interconnectivity but also serve to facilitate integrations with other services and applications, making FleetOps a truly versatile solution.
-          </li>
-        </ul>
-      </li>
-      <li>
-        <strong>Storefront</strong>: Storefront is an extension that delivers headless commerce functionality, ideal for businesses aspiring to develop on-demand stores or marketplaces. It aims to facilitate seamless transactions while focusing on providing an excellent user experience.
-      </li>
-      <li><strong>Dev Console</strong>: The Dev Console extension is a developer's toolbox, providing resources such as:
-        <ul>
-          <li>
-            API keys management, ensuring secure interactions with the application programming interface.
-          </li>
-          <li>
-            Webhooks management, enabling real-time data exchanges.
-          </li>
-          <li>
-            Sockets management, facilitating bi-directional client-server communication.
-          </li>
-          <li>
-            Logs management, crucial for system monitoring and troubleshooting.
-          </li>
-          <li>
-            API events management, keeping a pulse on system communications.
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </li>
-</ul>
-
-# 🏁 Getting Started
-
-Before you can get started with Fleetbase, you'll need to make sure you have the following prerequisites:
-
-<ol>
-  <li>
-    A computer running either Linux, Mac OS, or Windows
-  </li>
-  <li>Docker installed</li>
-  <li>Git installed</li>
-  <li>If you want to try now, the <a href="https://console.fleetbase.io/" target="_fleetbase" alt="Fleetbase">cloud hosted version of Fleetbase available here.</a></li>
-</ol>
-
-# 🚦 Use Cases
-
-Fleetbase's comprehensive suite of features and the modular design make it highly versatile, catering to a broad array of applications across different industries. Here are a few use cases:
-<ul>
-  <li><strong>Logistics and Supply Chain Management</strong>: Fleetbase could be employed by a logistics company to streamline its operations. Real-time tracking provided by FleetOps would help maintain visibility of fleet vehicles and assets at all times. This would ensure timely delivery, reduce operational inefficiencies, and enable proactive management of any logistical issues. Additionally, the order creation and management feature could be used to manage deliveries, pickups, and routing.</li>
+## 💾 Install
+Getting up and running with Fleetbase via Docker is the quickest and most straightforward way. If you’d like to use Fleetbase without docker read the [full install guide in the Fleetbase documentation](https://docs.fleetbase.io/install).  
   
-  <li><strong>On-demand Delivery Services</strong>: On-demand services like food delivery or courier companies could utilize Fleetbase to manage their fleet of delivery agents. The real-time tracking functionality would help to optimize routes and ensure prompt deliveries, while the order creation and management system would efficiently handle incoming orders.</li>
+Make sure you have both the latest versions of docker and docker-compose installed on your system.
+
+```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
+```
+
+### Accessing Fleetbase
+Once successfully installed and running you can then access the Fleetbase console on port 4200 and the API will be accessible from port 8000.  
   
-  <li><strong>E-Commerce Platforms</strong>: E-commerce businesses could leverage Fleetbase to manage their backend logistics. The Storefront extension would enable seamless online transactions, while FleetOps could manage all aspects of the delivery process, ensuring a smooth shopping experience for the customers.</li>
+Fleetbase Console: http://localhost:4200
+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.  
   
-  <li><strong>Ride-Hailing Services</strong>: Fleetbase could be a perfect fit for ride-hailing or car rental services. FleetOps would manage real-time tracking of vehicles, maintaining optimal vehicle utilization, while the API and Webhooks would facilitate integration with mobile apps to provide real-time updates to customers.</li>
+**Routing:** Fleetbase ships with its own OSRM server hosted at `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.  
   
-  <li><strong>Third-party Logistics (3PL) Provider</strong>: A 3PL provider could use Fleetbase for comprehensive management of its services. From real-time tracking of cargo to managing service rates and integration with other vendors in the supply chain, Fleetbase could provide an all-in-one solution.</li>
-  
-  <li><strong>Developer Resource Management</strong>: Developers building complex, resource-intensive applications could benefit from Fleetbase's Dev Console. API keys and webhook management could streamline the secure interaction between different software components. At the same time, sockets, logs, and API events management tools would assist in maintaining, troubleshooting, and improving the system.</li>
+**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.
 
-  <li><strong>Public Transportation Systems</strong>: City transportation services could use Fleetbase to optimize their bus or subway operations. With FleetOps, they could have real-time tracking of their vehicles, ensuring that schedules are met promptly and delays are handled effectively. Moreover, service rates management could assist in setting and adjusting fares, while the API and Webhooks functionality could integrate with public apps to provide real-time updates to commuters about arrivals, delays, and route changes.</li>
+```yaml
+version: “3.8”
+services:  
+  application:  
+    environment:  
+      MAIL_MAILER: (ses, smtp, mailgun, postmark, sendgrid)
+      OSRM_HOST: https://routing.fleetbase.io
+      IPINFO_API_KEY:
+      GOOGLE_MAPS_API_KEY:  
+      GOOGLE_MAPS_LOCALE: us
+      TWILIO_SID:  
+      TWILIO_TOKEN:
+      TWILIO_FROM:
+      CONSOLE_HOST: http://localhost:4200
+```
 
-  <li><strong>Fleet Leasing Companies</strong>: Fleet leasing companies could employ Fleetbase to manage their vehicle assets and track their status in real time. From managing service rates to ensuring the best utilization of assets, FleetOps could provide a holistic solution. Moreover, the Storefront extension could be used to list available vehicles and manage online reservations seamlessly.</li>
+You can learn more about full installation, and configuration in the [official documentation](https://docs.fleetbase.io).
 
-  <li><strong>Emergency Services</strong>: Emergency services like ambulance or firefighting departments could use Fleetbase to manage their operations. FleetOps would provide real-time tracking, ensuring that emergency vehicles are dispatched quickly and the fastest routes are chosen. In addition, the API and Webhooks functionality could allow integration with emergency call centers, ensuring a seamless flow of information and a swift response to emergencies.</li>
-</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…
 
-Remember, these are just a few examples. Given the modular and extensible nature of Fleetbase, it can be customized and scaled to fit many other use cases across different industries.
-
-# 💾 Installation
-
-Getting Fleetbase up and running on your system using Docker and Docker-compose is straightforward. Please follow the steps below:
-
-### Prerequisites
-
-<ul>
-  <li>Ensure that you have Docker and Docker-compose installed on your system. If not, you can download and install them from their respective official websites:
-    <ul>
-      <li><a href="https://docs.docker.com/get-docker/" target="_docker">Docker</a></li>
-      <li><a href="https://docs.docker.com/compose/install/" target="_docker_compose">Docker Compose</a></li>
-    </ul>
-  </li>
-  <li>
-    Clone the Fleetbase repository to your local machine:
-    <pre>git clone git@github.com:fleetbase/fleetbase.git</pre>
-  </li>
-  <li>
-    Navigate to the cloned repository:
-    <pre>cd fleetbase</pre>
-  </li>
-  <li>
-    Initialize and pull submodules:
-    <pre>git submodule update --init --recursive</pre>
-  </li>
-</ul>
-
-### Build and Run Fleetbase
-
-<ol>
-  <li>
-    <strong>Start the Docker daemon:</strong>
-    Ensure the Docker daemon is running on your machine. You can either start Docker Desktop or either executed by running:
-    <pre>service docker start</pre>
-  </li>
-  <li>
-    <strong>Build the Docker containers:</strong>
-Use Docker Compose to build and run the necessary containers. In the root directory of the Fleetbase repository, run:
-  <pre>docker-compose up -d</pre>
-  </li>
-</ol>
-
-### Additional Steps
-
-<ol>
-   <li>Fleetbase will try to find the current hostname or public IP address to whitelist in for CORS, but if this fails you will need to manually add your hostname or instance URL to <code>api/config/cors.php</code> in the <code>allowed_origins</code> array. This will whitelist the console for CORS access to your instance backend.
-  </li>
-  <li>🛣 Routing! By default Fleetbase currently will use it's own routing engine which is hosted at <a href="https://routing.fleetbase.io" target="_fleetbase_routing_machine">https://routing.fleetbase.io</a>, this routing engine only works for a few enabled countries which include USA, Canada, Belgium, Spain, Serbia, Taiwan, Malaysia, Singapore, Brunei, Mongolia, India, Ghana. We can enable more regions and countries upon request. There is a Roadmap item to allow users to easily change to any routing engine provider such as Mapbox, Google Maps, and other 3rd Party Routing services. Optionally, you can switch out Fleetase Routing engine with any OSRM compatible service such as OpenStreetMap by changing the console environment variable <code>OSRM_HOST</code> which can be found in <code>console/environments/*.env</code>.
-  </li>
-  <li>If you find any bugs or unexpected issues please <a href="https://github.com/fleetbase/fleetbase/issues/new/choose">post an issue</a> to the repo or join our <a href="https://discord.gg/V7RVWRQ2Wm" target="_discord" alt="Fleetbase Discord">Discord</a>.
-  </li>
-</ol>
-
-### Troubleshoot
-
-Have an issue with the installation, try a few of these workarounds.
-
-<ul>
-  <li><strong>Installer not working?</strong> <br>If you encounter issues with the web based installer use this workaround to get going.
-  <ol>
-    <li>Login to the application container. 
-      <pre class="bash">docker exec -ti fleetbase-application-1 bash</pre>
-    </li>
-    <li>Manually run the database setup and migrations.
-      <pre class="bash">php artisan mysql:createdb
-php artisan migrate:refresh --seed</pre>
-      </li>
-    <li>After completing these steps you should be able to proceed with account creation.</li>
-  </ol>
-  </li>
-</ul>
-
-### Access Fleetbase
-
-Now that Fleetbase is up and running via Docker you can find the console and the API accessible:
-
-<ul>
-  <li>Fleetbase Console: <code>http://localhost:4200</code></li>
-  <li>Fleetbase API: <code>http://localhost:8000</code></li>
-</ul>
-
-# 🧩 Extensions
-
-Fleetbase extensions provide a powerful way to enhance and customize the functionality of Fleetbase to suit your specific needs. They are standalone modules that seamlessly integrate with Fleetbase's frontend and backend, allowing you to extend its capabilities.
-
-### What are Fleetbase Extensions?
-Fleetbase Extensions are built using both a backend PHP package and a frontend Ember Engine Addon. They are designed to blend seamlessly into the Fleetbase ecosystem, utilizing shared services, utilities, stylesheets, components, and template helpers.
-
-### How do Extensions Work?
-<ul>
-  <li><strong>Backend</strong>: The backend of an extension is developed as a PHP package. This package should utilize the composer package <code>fleetbase/core-api</code>, which provides core API functionalities, making it easier to integrate your extension with Fleetbase's backend.</li>
-  
-  <li><strong>Engine</strong>: The frontend of an extension is built as an Ember Engine Addon. The Addon must require the packages <code>@fleetbase/ember-core</code> and <code>@fleetbase/ember-ui</code>. The <code>@fleetbase/ember-core</code> package provides core services and utilities that help to align your extension with Fleetbase's frontend. The <code>@fleetbase/ember-ui</code> package, on the other hand, supplies all the stylesheets, components, and template helpers needed to design a Fleetbase extension that seamlessly matches the look and feel of the Fleetbase UI.</li>
-</ul>
-
-### Building a Fleetbase Extension
-To create a Fleetbase extension, follow these steps:
-
-<ul>
-  <li><strong>Backend PHP Package Creation</strong>: Begin by creating a backend PHP package. Make sure to use the composer package <code>fleetbase/core-api</code> to ensure smooth integration with Fleetbase's backend.</li>
-  
-  <li><strong>Frontend Ember Engine Addon</strong>: Next, you need to create the frontend of the extension using Ember Engine. Be sure to include the <code>@fleetbase/ember-core</code> and <code>@fleetbase/ember-ui</code> packages. These packages provide necessary services, utilities, and design components for aligning your extension with Fleetbase's UI.</li>
-
-  <li><strong>Integrate Your Extension</strong>: Once you have the backend and frontend ready, you can integrate your extension into Fleetbase by installing it via the respective package managers. In the future you will be able to publish your extension to the Fleetbase extensions repository making it available to all instances of Fleetbase with the ability to even sell your extension.</li>
-</ul>
-
-With Fleetbase's modular architecture, you can develop your extensions to solve unique problems, enhance existing functionality, or add entirely new capabilities to your Fleetbase instance. This extensibility allows Fleetbase to adapt and evolve with your growing business needs.
-
-# 📱 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.
-
-<ul>
-  <li><a href="https://github.com/fleetbase/storefront-app">Storefront App</a>: Fleetbase based ecommerce/on-demand app for launching your very own shop or marketplace to Apple or Android playstore.</li>
-  <li><a href="https://github.com/fleetbase/navigator-app">Navigator App</a>: Fleetbase based driver app which can be used for drivers to manage and update order, additionally provides real time driver location which can be viewed in the Fleetbase Console.</li>
-</ul>
-
-# 🛣 Roadmap
-
-<ol>
-  <li>Open Source Extension Repository</li>
-  <li>🌎 Internationalize</li>
-  <li>Multiple and Custom Routing Engine's in FleetOps</li>
-  <li>Identity & Access Management (IAM) Extension</li>
-  <li>Inventory and Warehouse Management Extension</li>
-  <li>Freight Forwarder Quote Parser/ System Extension</li>
-</ol>
-
-# 🪲 Bugs and 💡 Feature Requests
+## 🪲 Bugs and 💡 Feature Requests
 
 Have a bug or a feature request? Please check the <a href="https://github.com/fleetbase/fleetbase/issues">issue tracker</a> and search for existing and closed issues. If your problem or idea is not addressed yet, please <a href="https://github.com/fleetbase/fleetbase/issues/new">open a new issue</a>.
 
-# 📚 Documentation
-
-View and contribute to our <a href="https://github.com/fleetbase/guides">Fleetbase Guide's</a> and <a href="https://github.com/fleetbase/api-reference">API Reference</a>
-
-# 👨‍💻 Contributing
+## 👨‍💻 Contributing
 
 Please read through our <a href="https://github.com/fleetbase/fleetbase/blob/main/CONTRIBUTING.md">contributing guidelines</a>. Included are directions for opening issues, coding standards, and notes on development.
 
-# 👥 Community
+## 👥 Community
 
 Get updates on Fleetbase's development and chat with the project maintainers and community members by joining our <a href="https://discord.gg/V7RVWRQ2Wm">Discord</a>.
 
@@ -313,7 +140,7 @@ Get updates on Fleetbase's development and chat with the project maintainers and
 <p dir="auto">See the <a href="https://github.com/fleetbase/fleetbase/releases">Releases</a> section of our GitHub project for changelogs for each release version of Fleetbase.</p>
 <p>Release announcement posts on <a href="https://www.fleetbase.io/blog-2" rel="nofollow">the official Fleetbase blog</a> contain summaries of the most noteworthy changes made in each release.</p>
 
-# Creators
+## Creators
 
 <p dir="auto"><strong>Ronald A. Richardson</strong>- Co-founder &amp; CTO</p>
 <img src="https://user-images.githubusercontent.com/58805033/230263021-212f2553-1269-473d-be94-313cb3eecfa5.png" alt="Ron Image" width="75" height="75" style="max-width: 100%;">          

api/.gitignore

@@ -13,4 +13,7 @@ npm-debug.log
 yarn-error.log
 /.idea
 /.vscode
-.composer.dev.json
+.composer.dev.json
+/caddy
+frankenphp
+frankenphp-worker.php

api/app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

api/composer.json

@@ -1,42 +1,41 @@
 {
-    "name": "laravel/laravel",
+    "name": "fleetbase/fleetbase",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "Modular logistics and supply chain operating system (LSOS)",
     "keywords": [
         "framework",
         "laravel"
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.3.2",
-        "fleetbase/fleetops-api": "^0.3.5",
-        "fleetbase/storefront-api": "^0.2.4",
-        "fleetbase/solid-api": "^0.0.1",
-        "fruitcake/laravel-cors": "^2.0",
+        "php": "^8.0",
+        "fleetbase/core-api": "^1.4.23",
+        "fleetbase/fleetops-api": "^0.4.28",
+        "fleetbase/storefront-api": "^0.3.8",
         "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.75",
-        "laravel/sanctum": "^2.11",
-        "laravel/tinker": "^2.5",
-        "league/flysystem-aws-s3-v3": "^1.0",
+        "laravel/framework": "^10.0",
+        "laravel/octane": "^2.3",
+        "laravel/tinker": "^2.9",
+        "league/flysystem-aws-s3-v3": "^3.0",
         "maatwebsite/excel": "^3.1",
         "phpoffice/phpspreadsheet": "^1.28",
         "predis/predis": "^2.1",
-        "psr/http-factory-implementation": "*"
+        "psr/http-factory-implementation": "*",
+        "s-ichikawa/laravel-sendgrid-driver": "^4.0"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
+        "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": "^5.10",
-        "phpunit/phpunit": "^9.5.10"
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.0"
     },
     "repositories": [
         {
-            "type": "path",
-            "url": "../packages/solid"
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/laravel-model-caching"
         }
     ],
     "autoload": {
@@ -91,6 +90,7 @@
         }
     },
     "config": {
+        "secure-http": false, 
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,

api/config/app.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Fleetbase'),
 
     /*
     |--------------------------------------------------------------------------
@@ -52,7 +52,7 @@ return [
     |
     */
 
-    'url' => env('APP_URL', 'http://localhost'),
+    'url' => env('APP_URL', 'http://localhost:8000'),
 
     'asset_url' => env('ASSET_URL', null),
 

api/config/cors.php

@@ -1,5 +1,7 @@
 <?php
 
+use Fleetbase\Support\Utils;
+
 return [
 
     /*
@@ -19,13 +21,13 @@ return [
 
     'allowed_methods' => ['*'],
 
-    'allowed_origins' => ['http://localhost:4200', env('CONSOLE_HOST')],
+    'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST'))]),
 
     'allowed_origins_patterns' => [],
 
     'allowed_headers' => ['*'],
 
-    'exposed_headers' => [],
+    'exposed_headers' => ['x-compressed-json', 'access-console-sandbox', 'access-console-sandbox-key'],
 
     'max_age' => 0,
 

api/config/filesystems.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('FILESYSTEM_DRIVER', 'local'),
+    'default' => env('FILESYSTEM_DRIVER', 'public'),
 
     /*
     |--------------------------------------------------------------------------
@@ -32,13 +32,13 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app')
         ],
 
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'url' => env('APP_URL') . '/storage',
         ],
 
         's3' => [
@@ -51,6 +51,15 @@ return [
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
         ],
 
+        'gcs' => [
+            'driver' => 'gcs',
+            'project_id' => env('GOOGLE_CLOUD_PROJECT_ID', 'your-project-id'),
+            'key_file' => env('GOOGLE_CLOUD_KEY_FILE', null),
+            'bucket' => env('GOOGLE_CLOUD_STORAGE_BUCKET', env('AWS_BUCKET')),
+            'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', null),
+            'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', env('AWS_URL')),
+            'visibility_handler' => \League\Flysystem\GoogleCloudStorage\UniformBucketLevelAccessVisibility::class,
+        ],
     ],
 
     /*
@@ -65,8 +74,7 @@ return [
     */
 
     'links' => [
-        public_path('storage') => storage_path('app/public'),
-        public_path('uploads') => storage_path('app/uploads'),
+        public_path('storage') => storage_path('app/public')
     ],
 
 ];

api/config/mail.php

@@ -60,6 +60,10 @@ return [
             'transport' => 'postmark',
         ],
 
+        'sendgrid' => [
+            'transport' => 'sendgrid',
+        ],
+
         'sendmail' => [
             'transport' => 'sendmail',
             'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
@@ -96,7 +100,7 @@ return [
 
     'from' => [
         'address' => env('MAIL_FROM_ADDRESS', 'hello@fleetbase.io'),
-        'name' => env('MAIL_FROM_NAME', 'Fleetbase'),
+        'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Fleetbase')),
     ],
 
     /*

api/config/octane.php

@@ -0,0 +1,223 @@
+<?php
+
+use Laravel\Octane\Contracts\OperationTerminated;
+use Laravel\Octane\Events\RequestHandled;
+use Laravel\Octane\Events\RequestReceived;
+use Laravel\Octane\Events\RequestTerminated;
+use Laravel\Octane\Events\TaskReceived;
+use Laravel\Octane\Events\TaskTerminated;
+use Laravel\Octane\Events\TickReceived;
+use Laravel\Octane\Events\TickTerminated;
+use Laravel\Octane\Events\WorkerErrorOccurred;
+use Laravel\Octane\Events\WorkerStarting;
+use Laravel\Octane\Events\WorkerStopping;
+use Laravel\Octane\Listeners\CollectGarbage;
+use Laravel\Octane\Listeners\DisconnectFromDatabases;
+use Laravel\Octane\Listeners\EnsureUploadedFilesAreValid;
+use Laravel\Octane\Listeners\EnsureUploadedFilesCanBeMoved;
+use Laravel\Octane\Listeners\FlushOnce;
+use Laravel\Octane\Listeners\FlushTemporaryContainerInstances;
+use Laravel\Octane\Listeners\FlushUploadedFiles;
+use Laravel\Octane\Listeners\ReportException;
+use Laravel\Octane\Listeners\StopWorkerIfNecessary;
+use Laravel\Octane\Octane;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Server
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the default "server" that will be used by Octane
+    | when starting, restarting, or stopping your server via the CLI. You
+    | are free to change this to the supported server of your choosing.
+    |
+    | Supported: "roadrunner", "swoole", "frankenphp"
+    |
+    */
+
+    'server' => env('OCTANE_SERVER', 'frankenphp'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Force HTTPS
+    |--------------------------------------------------------------------------
+    |
+    | When this configuration value is set to "true", Octane will inform the
+    | framework that all absolute links must be generated using the HTTPS
+    | protocol. Otherwise your links may be generated using plain HTTP.
+    |
+    */
+
+    'https' => env('OCTANE_HTTPS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Listeners
+    |--------------------------------------------------------------------------
+    |
+    | All of the event listeners for Octane's events are defined below. These
+    | listeners are responsible for resetting your application's state for
+    | the next request. You may even add your own listeners to the list.
+    |
+    */
+
+    'listeners' => [
+        WorkerStarting::class => [
+            EnsureUploadedFilesAreValid::class,
+            EnsureUploadedFilesCanBeMoved::class,
+        ],
+
+        RequestReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            ...Octane::prepareApplicationForNextRequest(),
+            //
+        ],
+
+        RequestHandled::class => [
+            //
+        ],
+
+        RequestTerminated::class => [
+            // FlushUploadedFiles::class,
+        ],
+
+        TaskReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            //
+        ],
+
+        TaskTerminated::class => [
+            //
+        ],
+
+        TickReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            //
+        ],
+
+        TickTerminated::class => [
+            //
+        ],
+
+        OperationTerminated::class => [
+            FlushOnce::class,
+            FlushTemporaryContainerInstances::class,
+            // DisconnectFromDatabases::class,
+            // CollectGarbage::class,
+        ],
+
+        WorkerErrorOccurred::class => [
+            ReportException::class,
+            StopWorkerIfNecessary::class,
+        ],
+
+        WorkerStopping::class => [
+            //
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Warm / Flush Bindings
+    |--------------------------------------------------------------------------
+    |
+    | The bindings listed below will either be pre-warmed when a worker boots
+    | or they will be flushed before every new request. Flushing a binding
+    | will force the container to resolve that binding again when asked.
+    |
+    */
+
+    'warm' => [
+        ...Octane::defaultServicesToWarm(),
+    ],
+
+    'flush' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Swoole Tables
+    |--------------------------------------------------------------------------
+    |
+    | While using Swoole, you may define additional tables as required by the
+    | application. These tables can be used to store data that needs to be
+    | quickly accessed by other workers on the particular Swoole server.
+    |
+    */
+
+    'tables' => [
+        'example:1000' => [
+            'name' => 'string:1000',
+            'votes' => 'int',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Swoole Cache Table
+    |--------------------------------------------------------------------------
+    |
+    | While using Swoole, you may leverage the Octane cache, which is powered
+    | by a Swoole table. You may set the maximum number of rows as well as
+    | the number of bytes per row using the configuration options below.
+    |
+    */
+
+    'cache' => [
+        'rows' => 1000,
+        'bytes' => 10000,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Watching
+    |--------------------------------------------------------------------------
+    |
+    | The following list of files and directories will be watched when using
+    | the --watch option offered by Octane. If any of the directories and
+    | files are changed, Octane will automatically reload your workers.
+    |
+    */
+
+    'watch' => [
+        'app',
+        'bootstrap',
+        'config',
+        'database',
+        'public/**/*.php',
+        'resources/**/*.php',
+        'routes',
+        'composer.lock',
+        '.env',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Garbage Collection Threshold
+    |--------------------------------------------------------------------------
+    |
+    | When executing long-lived PHP scripts such as Octane, memory can build
+    | up before being cleared by PHP. You can force Octane to run garbage
+    | collection if your application consumes this amount of megabytes.
+    |
+    */
+
+    'garbage' => 50,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Maximum Execution Time
+    |--------------------------------------------------------------------------
+    |
+    | The following setting configures the maximum execution time for requests
+    | being handled by Octane. You may set this value to 0 to indicate that
+    | there isn't a specific time limit on Octane request execution time.
+    |
+    */
+
+    'max_execution_time' => 30,
+
+];

api/config/services.php

@@ -30,4 +30,8 @@ return [
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
+    'sendgrid' => [
+        'api_key' => env('SENDGRID_API_KEY'),
+    ],
+
 ];

api/deploy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Exit the script as soon as a command fails
 set -e
@@ -13,4 +13,13 @@ php artisan migrate --force
 php artisan sandbox:migrate --force
 
 # Seed database
-php artisan fleetbase:seed
+php artisan fleetbase:seed
+
+# Restart queue
+php artisan queue:restart
+
+# Sync scheduler
+php artisan schedule-monitor:sync
+
+# Clear cache
+php artisan cache:clear

api/public/uploads

@@ -1 +0,0 @@
-/var/www/html/api/storage/app/uploads

console/.ember-cli

@@ -1,15 +1,7 @@
 {
   /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
-  */
-  "disableAnalytics": false,
-
-  /**
-  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
-  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
   "isTypeScriptProject": false
 }

console/.eslintignore

@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

console/.eslintrc.js

@@ -2,12 +2,13 @@
 
 module.exports = {
     root: true,
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
     parserOptions: {
-        ecmaVersion: 2018,
+        ecmaVersion: 'latest',
         sourceType: 'module',
-        ecmaFeatures: {
-            legacyDecorators: true,
+        requireConfigFile: false,
+        babelOptions: {
+            plugins: [['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }]],
         },
     },
     plugins: ['ember'],
@@ -29,7 +30,7 @@ module.exports = {
         'ember/no-empty-glimmer-component-classes': 'off',
         'ember/no-get': 'off',
         'ember/classic-decorator-no-classic-methods': 'off',
-        'node/no-unpublished-require': [
+        'n/no-unpublished-require': [
             'error',
             {
                 allowModules: [
@@ -50,18 +51,18 @@ module.exports = {
         'no-prototype-builtins': 'off',
     },
     overrides: [
-        // node files
         {
             files: [
                 './.eslintrc.js',
                 './.prettierrc.js',
+                './.stylelintrc.js',
                 './.template-lintrc.js',
                 './ember-cli-build.js',
-                './index.js',
                 './testem.js',
                 './blueprints/*/index.js',
                 './config/**/*.js',
-                './tests/dummy/config/**/*.js',
+                './lib/*/index.js',
+                './server/**/*.js',
             ],
             parserOptions: {
                 sourceType: 'script',
@@ -70,13 +71,7 @@ module.exports = {
                 browser: false,
                 node: true,
             },
-            plugins: ['node'],
-            extends: ['plugin:node/recommended'],
-        },
-        {
-            // test files
-            files: ['tests/**/*-test.{js,ts}'],
-            extends: ['plugin:qunit/recommended'],
+            extends: ['plugin:n/recommended'],
         },
     ],
 };

console/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]  # Build on Node.js 16
+        node-version: [18.x]  # Build on Node.js 18
 
     steps:
     - uses: actions/checkout@v2
@@ -57,4 +57,4 @@ jobs:
       run: pnpm run lint
 
     - name: Build
-      run: npx ember build --environment production
+      run: npx ember build --environment production

console/.gitignore

@@ -1,22 +1,17 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
+/scripts/node_modules/
 
 # misc
 /.env*
 /environments/.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
@@ -24,7 +19,6 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try

console/.prettierignore

@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
-.eslintcache
-.lint-todo/
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

console/.prettierrc.js

@@ -8,7 +8,7 @@ module.exports = {
     printWidth: 190,
     overrides: [
         {
-            files: '*.hbs',
+            files: '*.{hbs,js,ts}',
             options: {
                 singleQuote: false,
             },

console/.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

console/.stylelintrc.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+    extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+    rules: {
+        'import-notation': null,
+    },
+};

console/.template-lintrc.js

@@ -6,7 +6,6 @@ module.exports = {
         'no-bare-strings': 'off',
         'no-invalid-interactive': 'off',
         'no-yield-only': 'off',
-        'no-down-event-binding': 'off',
         'table-groups': 'off',
         'link-href-attributes': 'off',
         'require-input-label': 'off',

console/.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

console/Dockerfile

@@ -1,5 +1,5 @@
 # ---- Build Stage ----
-FROM node:16.20-alpine AS builder
+FROM node:18.15.0-alpine AS builder
 
 # Set the working directory in the container to /app
 WORKDIR /app
@@ -8,6 +8,9 @@ WORKDIR /app
 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
 
@@ -33,7 +36,7 @@ RUN pnpm install
 COPY console .
 
 # Build the application
-RUN pnpm build
+RUN pnpm build --environment $ENVIRONMENT
 
 # ---- Serve Stage ----
 FROM nginx:alpine

console/app.yaml

@@ -0,0 +1,12 @@
+runtime: python312
+
+handlers:
+- url: /(.*\..+)$
+  static_files: \1
+  upload: (.+)
+  secure: always
+  expiration: 1h
+- url: /.*
+  static_files: index.html
+  upload: index.html
+  secure: always

console/app/components/configure/2fa.hbs

@@ -0,0 +1 @@
+{{yield}}

console/app/components/configure/2fa.js

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

console/app/components/configure/filesystem.hbs

@@ -7,6 +7,31 @@
         <InputGroup @name="S3 URL" @value={{this.s3Url}} disabled={{this.isLoading}} />
         <InputGroup @name="S3 Endpoint" @value={{this.s3Endpoint}} disabled={{this.isLoading}} />
     {{/if}}
+    {{#if (eq this.driver "gcs")}}
+        {{#if this.isGoogleCloudStorageEnvConfigued}}
+            <div class="border border-yellow-900 shadow-sm rounded-lg bg-yellow-200 mb-4">
+                <div class="px-3 py-2 text-sm text-yellow-900 flex items-center">
+                    <FaIcon @icon="triangle-exclamation" @size="md" class="mr-1.5" />
+                    Warning! GCS is already configured in the server environment. Changing values below may break this.
+                </div>
+            </div>
+        {{/if}}
+        <InputGroup @name="GCS Bucket" @value={{this.gcsBucket}} disabled={{this.isLoading}} />
+        <InputGroup @name="GCS Service Account Key File" @wrapperClass="">
+            <div class="flex flex-row items-center mb-0i">
+                <UploadButton @name="firebase-service-account" @accept="text/plain,text/javascript,application/json" @onFileAdded={{this.uploadGcsCredentialsFile}} @buttonText="Upload Service Account JSON" @icon="upload" class="w-auto m-0i mt-0i" />
+                {{#if this.gcsCredentialsFile}}
+                    <div class="ml-2.5 text-sm dark:text-white text-black flex flex-row items-center border border-blue-500 rounded-lg px-2 py-0.5 -mt-1">
+                        <FaIcon @icon="file-text" @size="sm" class="mr-2 dark:text-white text-black" />
+                        <span>{{this.gcsCredentialsFile.original_filename}}</span>
+                        <a href="javascript:;" class="text-red-500 ml-2" {{on "click" this.removeGcsCredentialsFile}}>
+                            <FaIcon @icon="times" class="text-red-500" />
+                        </a>
+                    </div>
+                {{/if}}
+            </div>
+        </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">
             <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'}}" />

console/app/components/configure/filesystem.js

@@ -6,6 +6,7 @@ import { action } from '@ember/object';
 export default class ConfigureFilesystemComponent extends Component {
     @service fetch;
     @service notifications;
+    @service currentUser;
     @tracked isLoading = false;
     @tracked testResponse;
     @tracked disks = [];
@@ -13,6 +14,10 @@ export default class ConfigureFilesystemComponent extends Component {
     @tracked s3Bucket = null;
     @tracked s3Url = null;
     @tracked s3Endpoint = null;
+    @tracked gcsBucket = null;
+    @tracked gcsCredentialsFileId = null;
+    @tracked gcsCredentialsFile = null;
+    @tracked isGoogleCloudStorageEnvConfigued = false;
 
     /**
      * Creates an instance of ConfigureFilesystemComponent.
@@ -59,6 +64,8 @@ export default class ConfigureFilesystemComponent extends Component {
                     url: this.s3Url,
                     endpoint: this.s3Endpoint,
                 },
+                gcsCredentialsFileId: this.gcsCredentialsFileId,
+                gcsBucket: this.gcsBucket,
             })
             .then(() => {
                 this.notifications.success('Filesystem configuration saved.');
@@ -82,4 +89,31 @@ export default class ConfigureFilesystemComponent extends Component {
                 this.isLoading = false;
             });
     }
+
+    @action removeGcsCredentialsFile() {
+        this.gcsCredentialsFileId = undefined;
+        this.gcsCredentialsFile = undefined;
+    }
+
+    @action uploadGcsCredentialsFile(file) {
+        try {
+            this.fetch.uploadFile.perform(
+                file,
+                {
+                    path: 'gcs',
+                    subject_uuid: this.currentUser.companyId,
+                    subject_type: 'company',
+                    type: 'gcs_credentials',
+                },
+                (uploadedFile) => {
+                    console.log('uploadedFile', uploadedFile);
+                    this.gcsCredentialsFileId = uploadedFile.id;
+                    this.gcsCredentialsFile = uploadedFile;
+                    console.log('this.gcsCredentialsFile', this.gcsCredentialsFile);
+                }
+            );
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
 }

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

@@ -6,7 +6,7 @@
         <Textarea class="form-input w-full" @value={{this.apn.private_key_content}} placeholder="APN Private Key" rows="10" disabled={{this.isLoading}} />
     </InputGroup> --}}
     <InputGroup @wrapperClass="flex flex-row items-center">
-        <UploadButton @name="apn-key" @accept="text/plain,application/x-pem-file,application/x-pkcs12,application/x-x509-ca-cert,.p12,.pem,.p8" @onFileAdded={{this.uploadApnKey}} @buttonText="Upload P8 Key File" @uploadIcon="upload" class="w-auto m-0i mt-0i" />
+        <UploadButton @name="apn-key" @accept="text/plain,application/x-pem-file,application/x-pkcs12,application/x-x509-ca-cert,.p12,.pem,.p8" @onFileAdded={{this.uploadApnKey}} @buttonText="Upload P8 Key File" @icon="upload" class="w-auto m-0i mt-0i" />
         {{#if this.apn.private_key_file}}
             <div class="ml-2.5 text-sm dark:text-white text-black flex flex-row items-center border border-blue-500 rounded-lg px-2 py-0.5 -mt-1">
                 <FaIcon @icon="file-text" @size="sm" class="mr-2 dark:text-white text-black" />
@@ -15,16 +15,32 @@
             </div>
         {{/if}}
     </InputGroup>
-    <InputGroup>
+    <InputGroup @wrapperClass="mb-0i">
         <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{fn (mut this.apn.production)}} @disabled={{this.isLoading}} />
     </InputGroup>
+</ContentPanel>
+
+<ContentPanel @title="Firebase Configutation" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+    <InputGroup @wrapperClass="flex flex-row items-center mb-0i">
+        <UploadButton @name="firebase-service-account" @accept="text/plain,text/javascript,application/json" @onFileAdded={{this.uploadFirebaseCredentials}} @buttonText="Upload Service Account JSON" @icon="upload" class="w-auto m-0i mt-0i" />
+        {{#if this.firebase.credentials_file}}
+            <div class="ml-2.5 text-sm dark:text-white text-black flex flex-row items-center border border-blue-500 rounded-lg px-2 py-0.5 -mt-1">
+                <FaIcon @icon="file-text" @size="sm" class="mr-2 dark:text-white text-black" />
+                <span>{{this.firebase.credentials_file.original_filename}}</span>
+                <a href="javascript:;" class="text-red-500 ml-2" {{on "click" this.removeFirebaseCredentialsFile}}><FaIcon @icon="times" class="text-red-500" /></a>
+            </div>
+        {{/if}}
+    </InputGroup>
+</ContentPanel>
+
+<ContentPanel @title="Test Push Notification" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-900">
     {{#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>
     {{/if}}
-    <div class="mt-3 rounded-lg bg-gray-900 shadow-inner p-3">
+    <div class="">
         <div class="flex flex-col space-y-2">
             <div class="flex flex-row items-center">
                 <div class="text-sm w-40">Title:</div>
@@ -47,6 +63,8 @@
     </div>
 </ContentPanel>
 
+<Spacer @height="300px" />
+
 <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}} />
 </EmberWormhole>

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

@@ -18,14 +18,13 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         team_id: '',
         app_bundle_id: '',
         private_key_path: '',
+        _private_key_path: '',
         private_key_file_id: '',
         private_key_file: null,
         production: true,
     };
-    @tracked fcm = {
-        firebase_credentials_json: '',
-        firebase_database_url: '',
-        firebase_project_name: '',
+    @tracked firebase = {
+        credentials: '',
     };
 
     constructor() {
@@ -38,26 +37,36 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         apnConfig.private_key_file = null;
         apnConfig.private_key_file_id = '';
         apnConfig.private_key_path = '';
+        apnConfig._private_key_path = '';
 
         this.apn = apnConfig;
     }
 
+    @action removeFirebaseCredentialsFile() {
+        const firebaseConfig = this.firebase;
+        firebaseConfig.credentials_file = null;
+        firebaseConfig.credentials_file_id = '';
+        firebaseConfig.credentials = '';
+
+        this.firebase = firebaseConfig;
+    }
+
     @action uploadApnKey(file) {
         try {
             this.fetch.uploadFile.perform(
                 file,
                 {
-                    disk: 'local',
-                    path: `apn`,
+                    path: 'apn',
                     subject_uuid: this.currentUser.companyId,
-                    subject_type: `company`,
-                    type: `apn_key`,
+                    subject_type: 'company',
+                    type: 'apn_key',
                 },
                 (uploadedFile) => {
                     const apnConfig = this.apn;
                     apnConfig.private_key_file = uploadedFile;
                     apnConfig.private_key_file_id = uploadedFile.id;
                     apnConfig.private_key_path = uploadedFile.path;
+                    apnConfig._private_key_path = uploadedFile.path;
 
                     this.apn = apnConfig;
                 }
@@ -67,6 +76,30 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         }
     }
 
+    @action uploadFirebaseCredentials(file) {
+        try {
+            this.fetch.uploadFile.perform(
+                file,
+                {
+                    path: 'firebase',
+                    subject_uuid: this.currentUser.companyId,
+                    subject_type: 'company',
+                    type: 'firebase_credentials',
+                },
+                (uploadedFile) => {
+                    const firebaseConfig = this.firebase;
+                    firebaseConfig.credentials_file = uploadedFile;
+                    firebaseConfig.credentials_file_id = uploadedFile.id;
+                    firebaseConfig.credentials_file_path = uploadedFile.path;
+
+                    this.firebase = firebaseConfig;
+                }
+            );
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
     @action setConfigValues(config) {
         for (const key in config) {
             if (this[key] !== undefined) {
@@ -94,9 +127,13 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         const apnConfig = this.apn;
         delete apnConfig.private_key_file;
 
+        const firebaseConfig = this.firebase;
+        delete firebaseConfig.credentials_file;
+
         this.fetch
             .post('settings/notification-channels-config', {
                 apn: apnConfig,
+                firebase: firebaseConfig,
             })
             .then(() => {
                 this.notifications.success("Notification channel's configuration saved.");
@@ -112,6 +149,7 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         this.fetch
             .post('settings/test-notification-channels-config', {
                 apn: this.apn,
+                firebase: this.firebase,
                 title: this.testTitle,
                 message: this.testMessage,
                 apnToken: this.apnToken,

console/app/components/console-wormhole.hbs

@@ -0,0 +1 @@
+<div id="console-wormhole" />

console/app/components/dashboard.hbs

@@ -1,7 +1,99 @@
-<div class="fleetbase-dashboard-grid">
-    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-        {{#each this.dashboards as |dashboard index|}}
-            <Dashboard::Create @index={{index}} @dashboard={{dashboard}} />
-        {{/each}}
+<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,48 +1,140 @@
 import Component from '@glimmer/component';
-import loadExtensions from '@fleetbase/ember-core/utils/load-extensions';
-import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { isArray } from '@ember/array';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency-decorators';
+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 {
-    @service fetch;
-    @tracked extensions;
-    @tracked dashboards = [];
-    @tracked isLoading;
+    /**
+     * 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.loadExtensions();
+        this.dashboard.loadDashboards.perform();
     }
 
-    @action async loadExtensions() {
-        this.extensions = await loadExtensions();
-        this.loadDashboardBuilds.perform();
+    /**
+     * Action to select a dashboard.
+     * @param {Object} dashboard - The dashboard to be selected.
+     */
+    @action selectDashboard(dashboard) {
+        this.dashboard.selectDashboard.perform(dashboard);
     }
 
-    @task *loadDashboard(extension) {
-        this.isLoading = extension.extension;
-        let dashboardBuild;
-
-        try {
-            dashboardBuild = yield this.fetch.get(extension.fleetbase.dashboard, {}, { namespace: '' });
-        } catch {
-            return;
-        }
-
-        if (isArray(dashboardBuild)) {
-            this.dashboards = [...this.dashboards, ...dashboardBuild.map((build) => ({ ...build, extension }))];
-        }
+    /**
+     * Sets the context for the widget selector panel.
+     * @param {Object} widgetSelectorContext - The context object for the widget selector.
+     */
+    @action setWidgetSelectorPanelContext(widgetSelectorContext) {
+        this.widgetSelectorContext = widgetSelectorContext;
     }
 
-    @task({ enqueue: true, maxConcurrency: 1 }) *loadDashboardBuilds() {
-        const extensionsWithDashboards = this.extensions.filter((extension) => typeof extension.fleetbase?.dashboard === 'string');
+    /**
+     * 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();
 
-        for (let i = 0; i < extensionsWithDashboards.length; i++) {
-            const extension = extensionsWithDashboards[i];
-            yield this.loadDashboard.perform(extension);
+                // 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.hbs

@@ -1,6 +1,6 @@
-<div class="dashboard-component-count lg:col-span-2">
-    <h3 class="text-sm dark:text-gray-100 text-black mb-4">{{@options.title}}</h3>
-    <h1 class="text-3xl font-bold dark:text-gray-100 text-black mb-4">
-        {{this.displayValue}}
+<div class="dashboard-component-count lg:col-span-2 h-full {{@options.wrapperClass}}">
+    <h3 class="text-sm dark:text-gray-100 text-black mb-4 {{@options.titleClass}}">{{this.title}}</h3>
+    <h1 class="text-3xl font-bold dark:text-gray-100 text-black {{@options.valueClass}}">
+        {{this.value}}
     </h1>
 </div>

console/app/components/dashboard/count.js

@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import { computed } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 import formatCurrency from '@fleetbase/ember-ui/utils/format-currency';
 import formatMeters from '@fleetbase/ember-ui/utils/format-meters';
 import formatBytes from '@fleetbase/ember-ui/utils/format-bytes';
@@ -7,11 +7,40 @@ import formatDuration from '@fleetbase/ember-ui/utils/format-duration';
 import formatDate from '@fleetbase/ember-ui/utils/format-date';
 
 export default class DashboardCountComponent extends Component {
-    @computed('args.options.{currency,dateFormat,format,value}') get displayValue() {
-        let format = this.args.options?.format;
-        let currency = this.args.options?.currency;
-        let dateFormat = this.args.options?.dateFormat;
-        let value = this.args.options?.value;
+    /**
+     * The title of the metric count.
+     *
+     * @memberof WidgetKeyMetricsCountComponent
+     */
+    @tracked title;
+
+    /**
+     * The value to render
+     *
+     * @memberof WidgetKeyMetricsCountComponent
+     */
+    @tracked value;
+
+    /**
+     * Creates an instance of WidgetKeyMetricsCountComponent.
+     * @param {EngineInstance} owner
+     * @param {Object} { options }
+     * @memberof WidgetKeyMetricsCountComponent
+     */
+    constructor(owner, { options, title }) {
+        super(...arguments);
+        this.title = title;
+        this.createRenderValueFromOptions(options);
+    }
+
+    /**
+     * Creates the value to render using the options provided.
+     *
+     * @param {Object} [options={}]
+     * @memberof WidgetKeyMetricsCountComponent
+     */
+    createRenderValueFromOptions(options = {}) {
+        let { format, currency, dateFormat, value } = options;
 
         switch (format) {
             case 'money':
@@ -38,6 +67,6 @@ export default class DashboardCountComponent extends Component {
                 break;
         }
 
-        return value;
+        this.value = value;
     }
 }

console/app/components/dashboard/create.hbs

@@ -1,18 +1,14 @@
-<div class="col-span-{{or @dashboard.size 12}}">
-    <div class="dashboard-title flex flex-col lg:flex-row lg:items-center">
-        <div class="flex flex-row items-center mb-2 lg:mb-0">
-            {{#if this.isLoading}}
-                <Spinner class="mr-2i" />
-            {{/if}}
-            <h2 class="text-sm font-bold dark:text-gray-100 text-black">{{@dashboard.title}}</h2>
-        </div>
-        <div>
-            <Dashboard::QueryParams @params={{@dashboard.queryParams}} @onChange={{this.onQueryParamsChanged}} />
-        </div>
-    </div>
-    <div class="grid grid-cols-2 lg:grid-cols-12 gap-4">
-        {{#each this.dashboard.widgets as |widget|}}
-            {{component (concat "dashboard/" widget.component) options=widget.options}}
+<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}}
-    </div>
+    </GridStack>
 </div>

console/app/components/dashboard/create.js

@@ -1,41 +1,99 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { action, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { isArray } from '@ember/array';
-import { task } from 'ember-concurrency-decorators';
 
+/**
+ * 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 {
-    @service fetch;
-    @tracked isLoading = false;
-    @tracked dashboard;
+    /**
+     * Notifications service for displaying alerts or errors.
+     * @type {Service}
+     */
+    @service notifications;
 
-    constructor() {
-        super(...arguments);
-        this.dashboard = this.args.dashboard;
+    /**
+     * 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;
     }
 
-    @action onQueryParamsChanged(changedParams) {
-        this.reloadDashboard.perform(changedParams);
+    /**
+     * 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);
+            }
+        });
     }
 
-    @task *reloadDashboard(params) {
-        const { extension } = this.args.dashboard;
-        const index = this.args.index;
-        let dashboards = [];
+    /**
+     * 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;
 
-        this.isLoading = true;
-
-        try {
-            dashboards = yield this.fetch.get(extension.fleetbase.dashboard, params, { namespace: '' });
-        } catch {
-            return;
+        if (dashboard) {
+            dashboard.removeWidget(widget.id).catch((error) => {
+                this.notifications.serverError(error);
+            });
         }
+    }
 
-        this.isLoading = false;
-
-        if (isArray(dashboards)) {
-            this.dashboard = dashboards.objectAt(index);
-        }
+    /**
+     * 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.hbs

@@ -0,0 +1,18 @@
+<div class="col-span-{{or @dashboard.size 12}}">
+    <div class="dashboard-title flex flex-col lg:flex-row lg:items-center">
+        <div class="flex flex-row items-center mb-2 lg:mb-0">
+            {{#if this.isLoading}}
+                <Spinner class="mr-2i" />
+            {{/if}}
+            <h2 class="text-sm font-bold dark:text-gray-100 text-black">{{this.dashboard.title}}</h2>
+        </div>
+        <div>
+            <Dashboard::QueryParams @params={{this.dashboard.queryParams}} @onChange={{this.onQueryParamsChanged}} />
+        </div>
+    </div>
+    <div class="grid grid-cols-2 lg:grid-cols-12 gap-4">
+        {{#each this.dashboard.widgets as |widget|}}
+            {{component (concat "dashboard/" widget.component) options=widget.options}}
+        {{/each}}
+    </div>
+</div>

console/app/components/dashboard/metric.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 { isArray } from '@ember/array';
+import { task } from 'ember-concurrency-decorators';
+
+export default class MetricComponent extends Component {
+    @service fetch;
+    @tracked isLoading = false;
+    @tracked dashboard;
+
+    constructor() {
+        super(...arguments);
+        this.loadDashboard.perform();
+    }
+
+    @action onQueryParamsChanged(changedParams) {
+        this.loadDashboard.perform(changedParams);
+    }
+
+    @task *loadDashboard(params) {
+        let dashboards = [];
+
+        this.isLoading = true;
+
+        try {
+            dashboards = yield this.fetch.get(this.args.options.endpoint, params, { namespace: '' });
+        } catch {
+            return;
+        }
+
+        this.isLoading = false;
+
+        if (isArray(dashboards)) {
+            this.dashboard = dashboards.objectAt(0);
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+<Overlay @isOpen={{@isOpen}} @onLoad={{this.setOverlayContext}} @position="right" @noBackdrop={{true}} @fullHeight={{true}} @width={{or this.width @width "400px"}}>
+    <Overlay::Header @title={{t "component.dashboard-widget-panel.select-widgets"}} @hideStatusDot={{true}} @titleWrapperClass="leading-5">
+        <div class="flex flex-1 justify-end">
+            <Button @type="default" @icon="times" @helpText={{t "component.dashboard-widget-panel.close-and-save"}} @onClick={{this.onPressClose}} />
+        </div>
+    </Overlay::Header>
+
+    <Overlay::Body @wrapperClass="new-service-rate-overlay-body px-4 space-y-4 pt-4">
+        <div class="grid grid-cols-1 gap-4 text-xs dark:text-gray-100">
+            {{#each this.availableWidgets as |widget|}}
+                <div
+                    class="rounded-lg border border-gray-300 bg-white dark:border-gray-700 dark:bg-gray-800 hover:bg-gray-100 dark:hover:bg-gray-700 transition-all duration-300 ease-in-out shadow-md px-4 py-2 cursor-pointer"
+                    {{on "click" (fn this.addWidgetToDashboard widget)}}
+                >
+                    <div class="flex flex-row items-center leading-6 mb-2.5">
+                        <div class="w-8 flex items-center justify-start">
+                            <FaIcon @icon={{widget.icon}} class="text-lg text-gray-600 dark:text-gray-300" />
+                        </div>
+                        <p class="text-sm truncate font-semibold dark:text-gray-100 text-gray-800">
+                            {{t "component.dashboard-widget-panel.widget-name" widgetName=widget.name}}
+                        </p>
+                    </div>
+                    <div>
+                        <p class="text-xs dark:text-gray-100 text-gray-800">{{widget.description}}</p>
+                    </div>
+                </div>
+            {{/each}}
+        </div>
+        <Spacer @height="300px" />
+    </Overlay::Body>
+</Overlay>

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

@@ -0,0 +1,60 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DashboardWidgetPanelComponent extends Component {
+    @service universe;
+    @tracked availableWidgets = [];
+    @tracked dashboard;
+    @tracked isOpen = true;
+    @service notifications;
+
+    /**
+     * Constructs the component and applies initial state.
+     */
+    constructor(owner, { dashboard }) {
+        super(...arguments);
+
+        this.availableWidgets = this.universe.getDashboardWidgets();
+        this.dashboard = dashboard;
+    }
+
+    /**
+     * Sets the overlay context.
+     *
+     * @action
+     * @param {OverlayContextObject} overlayContext
+     */
+    @action setOverlayContext(overlayContext) {
+        this.context = overlayContext;
+
+        if (typeof this.args.onLoad === 'function') {
+            this.args.onLoad(...arguments);
+        }
+    }
+
+    @action addWidgetToDashboard(widget) {
+        // If widget is a component definition/class
+        if (typeof widget.component === 'function') {
+            widget.component = widget.component.name;
+        }
+
+        this.args.dashboard.addWidget(widget).catch((error) => {
+            this.notifications.serverError(error);
+        });
+    }
+
+    /**
+     * Handles cancel button press.
+     *
+     * @action
+     */
+    @action onPressClose() {
+        this.isOpen = false;
+
+        if (typeof this.args.onClose === 'function') {
+            this.args.onClose();
+        }
+    }
+}

console/app/components/github-card.hbs

@@ -5,14 +5,14 @@
                 <Spinner />
             </div>
         {{else}}
-            <div class="flex flex-row p-4 border-b dark:border-gray-700 border-gray-200">
+            <div class="flex flex-row p-3 border-b dark:border-gray-700 border-gray-200">
                 <div class="w-12 flex-shrink-0"><img src={{this.data.owner.avatar_url}} alt="fleetbase/fleetbase" class="rounded-full w-8 h-8" width="32" height="32" /></div>
                 <div class="flex-1 -mt-2">
                     <div class="flex flex-1 flex-row items-center justify-between mb-2">
-                        <a href={{this.data.html_url}} target="_github" class="dark:text-gray-100 text-black text-lg font-semibold">{{this.data.full_name}}</a>
+                        <a href={{this.data.html_url}} target="_github" class="dark:text-gray-100 text-black text-base font-semibold">{{this.data.full_name}}</a>
                         <a href={{this.data.html_url}} target="_github" class="btn btn-xs btn-default">
                             <FaIcon @icon="star" class="text-yellow-400" />
-                            <span class="hidden lg:flex ml-2.5">Star on Github</span>
+                            <span class="hidden truncate lg:flex ml-2.5">Star on Github</span>
                         </a>
                     </div>
                     <p class="dark:text-gray-100 text-black text-sm">{{this.data.description}}</p>
@@ -40,7 +40,7 @@
                     </div>
                     <div class="col-span-3 dark:text-gray-100 text-black text-xs flex flex-row">
                         <span class="font-bold mr-1">{{this.data.open_issues_count}}</span>
-                        <span><span class="hidden lg:inline-flex">Open</span> Issues</span>
+                        <span class="truncate"><span class="hidden lg:inline-flex">Open</span> Issues</span>
                     </div>
                 </div>
             </div>

console/app/components/github-card.js

@@ -1,11 +1,15 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
+import { computed } from '@ember/object';
 import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
+import { task } from 'ember-concurrency';
+import { storageFor } from 'ember-local-storage';
+import { add, isPast } from 'date-fns';
 import fetch from 'fetch';
 
 export default class GithubCardComponent extends Component {
+    @storageFor('local-cache') localCache;
     @tracked data;
     @tracked tags;
     @tracked isLoading = false;
@@ -30,29 +34,47 @@ export default class GithubCardComponent extends Component {
 
     constructor() {
         super(...arguments);
-        this.loadRepositoryData();
-        this.loadRepositoryTags();
+        this.getRepositoryData.perform();
+        this.getRepositoryTags.perform();
     }
 
-    @action loadRepositoryData() {
-        this.isLoading = true;
+    @task *getRepositoryData() {
+        // Check if cached data and expiration are available
+        const cachedData = this.localCache.get('fleetbase-github-data');
+        const expiration = this.localCache.get('fleetbase-github-data-expiration');
 
-        return fetch('https://api.github.com/repos/fleetbase/fleetbase')
-            .then((response) => {
-                return response.json().then((data) => {
-                    this.data = data;
-                });
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+        // Check if the cached data is still valid
+        if (cachedData && expiration && !isPast(new Date(expiration))) {
+            // Use cached data
+            this.data = cachedData;
+        } else {
+            // Fetch new data
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase');
+            if (response.ok) {
+                this.data = yield response.json();
+                this.localCache.set('fleetbase-github-data', this.data);
+                this.localCache.set('fleetbase-github-data-expiration', add(new Date(), { hours: 6 }));
+            }
+        }
     }
 
-    @action loadRepositoryTags() {
-        return fetch('https://api.github.com/repos/fleetbase/fleetbase/tags').then((response) => {
-            return response.json().then((data) => {
-                this.tags = data;
-            });
-        });
+    @task *getRepositoryTags() {
+        // Check if cached tags and expiration are available
+        const cachedTags = this.localCache.get('fleetbase-github-tags');
+        const expiration = this.localCache.get('fleetbase-github-tags-expiration');
+
+        // Check if the cached tags are still valid
+        if (cachedTags && expiration && !isPast(new Date(expiration))) {
+            // Use cached tags
+            this.tags = cachedTags;
+        } else {
+            // Fetch new tags
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase/tags');
+            if (response.ok) {
+                this.tags = yield response.json();
+                this.localCache.set('fleetbase-github-tags', this.tags);
+                this.localCache.set('fleetbase-github-tags-expiration', add(new Date(), { hours: 6 }));
+            }
+        }
     }
 }

console/app/components/modals/create-dashboard.hbs

@@ -0,0 +1,5 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container">
+        <InputGroup @name="Dashboard name" @value={{@options.name}} @helpText="Enter the name of your dashboard" />
+    </div>
+</Modal::Default>

console/app/components/modals/validate-password.hbs

@@ -0,0 +1,13 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="px-5">
+        {{#if @options.body}}
+            <p class="dark:text-gray-400 text-gray-700 mb-4">{{@options.body}}</p>
+        {{/if}}
+        <InputGroup>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                <InputGroup @name="Password" @type="password" @value={{this.password}} @wrapperClass="mb-0i" />
+                <InputGroup @name="Confirm Password" @type="password" @value={{this.confirmPassword}} @wrapperClass="mb-0i" />
+            </div>
+        </InputGroup>
+    </div>
+</Modal::Default>

console/app/components/modals/validate-password.js

@@ -0,0 +1,49 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency';
+
+export default class ModalsValidatePasswordComponent extends Component {
+    @service fetch;
+    @service notifications;
+    @tracked options = {};
+    @tracked password;
+    @tracked confirmPassword;
+
+    constructor(owner, { options }) {
+        super(...arguments);
+        this.options = options;
+        this.setupOptions();
+    }
+
+    setupOptions() {
+        this.options.title = 'Validate Current Password';
+        this.options.acceptButtonText = 'Validate Password';
+        this.options.declineButtonHidden = true;
+        this.options.confirm = (modal) => {
+            modal.startLoading();
+            return this.validatePassword.perform();
+        };
+    }
+
+    @task *validatePassword() {
+        let isPasswordValid = false;
+
+        try {
+            yield this.fetch.post('users/validate-password', {
+                password: this.password,
+                password_confirmation: this.confirmPassword,
+            });
+
+            isPasswordValid = true;
+        } catch (error) {
+            this.notifications.serverError(error, 'Invalid current password.');
+        }
+
+        if (typeof this.options.onValidated === 'function') {
+            this.options.onValidated(isPasswordValid);
+        }
+
+        return isPasswordValid;
+    }
+}

console/app/components/two-fa-enforcement-alert.hbs

@@ -0,0 +1,14 @@
+{{#if this.shouldRender}}
+    <InfoBlock @icon="triangle-exclamation" class="two-fa-enforcement-alert bg-yellow-100 border-2 border-yellow-600 dark:border-yellow-500 rounded-lg py-3.5 px-5">
+        <div class="flex flex-row justify-between">
+            <div class="flex-1 pr-2">
+                <p class="text-sm dark:text-yellow-900 mb-2">
+                    {{t "component.two-fa-enforcement-alert.message"}}
+                </p>
+            </div>
+            <div class="flex-shrink-0">
+                <Button id="two-fa-setup-button" @text={{t "component.two-fa-enforcement-alert.button-text"}} @icon="shield-halved" @type="warning" @buttonType="button" @onClick={{this.transitionToTwoFactorSettings}} />
+            </div>
+        </div>
+    </InfoBlock>
+{{/if}}

console/app/components/two-fa-enforcement-alert.js

@@ -0,0 +1,74 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency-decorators';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+
+/**
+ * Glimmer component for handling notification enforcement.
+ *
+ * @class EnforceNotificationComponent
+ * @extends Component
+ */
+export default class TwoFaEnforcementAlertComponent extends Component {
+    /**
+     * Flag to determine whether the component should render or not.
+     *
+     * @property {boolean} shouldRender
+     * @default false
+     * @tracked
+     */
+    @tracked shouldRender = false;
+
+    /**
+     * Ember Router service for transitioning between routes.
+     *
+     * @type {RouterService}
+     */
+    @service router;
+
+    /**
+     * Fetch service for making HTTP requests.
+     *
+     * @property {FetchService} fetch
+     * @inject
+     */
+    @service fetch;
+
+    /**
+     * Constructor method for the ConsoleAccountAuthController.
+     *
+     * @constructor
+     */
+    constructor() {
+        super(...arguments);
+        this.checkTwoFactorEnforcement.perform();
+    }
+
+    /**
+     * Transition to the users auth page.
+     *
+     * @method transitionToTwoFa
+     * @memberof ConsoleHomeController
+     */
+    @action transitionToTwoFactorSettings() {
+        this.router.transitionTo('console.account.auth');
+    }
+
+    @task *checkTwoFactorEnforcement() {
+        const shouldRender = yield this.fetch.get('two-fa/enforce').catch((error) => {
+            this.notifications.serverError(error);
+        });
+
+        /**
+         * Task to check whether two-factor authentication enforcement is required.
+         *
+         * @method checkTwoFactorEnforcement
+         * @memberof TwoFaEnforcementAlertComponent
+         * @task
+         */
+        if (shouldRender) {
+            this.shouldRender = shouldRender.shouldEnforce;
+        }
+    }
+}

console/app/components/two-fa-settings.hbs

@@ -0,0 +1,31 @@
+<div class="flex items-center space-x-4">
+    <label class="text-base font-medium">Enable Two-Factor Authentication</label>
+    <Toggle @isToggled={{this.isTwoFaEnabled}} @onToggle={{this.onTwoFaToggled}} />
+</div>
+
+{{#if this.isTwoFaEnabled}}
+    <div class="mt-6">
+        {{#if this.showEnforceOption}}
+            <div class="flex items-center space-x-4 mb-6">
+                <label class="text-base font-medium">Require Users to Set-Up 2FA</label>
+                <Toggle @isToggled={{this.isTwoFaEnforced}} @onToggle={{this.onTwoFaEnforcedToggled}} />
+            </div>
+        {{/if}}
+        {{#if this.showMethodSelection}}
+            <label class="text-base font-medium">Choose an authentication method</label>
+            <p class="text-sm text-gray-600 dark:text-gray-300 mt-1">In addition to your username and password, you'll have to enter a code (delivered via app or SMS) to sign in to your account</p>
+            {{#each @twoFaMethods as |method|}}
+                <div class="border rounded-lg px-4 py-3 mt-2 transition duration-300 {{if (eq this.selectedTwoFaMethod method.key) 'border-blue-500' 'border-gray-200 dark:border-gray-700'}}">
+                    <input type="radio" name="2fa-method" id="{{method.name}}" checked={{eq this.selectedTwoFaMethod method.key}} {{on "change" (fn this.onTwoFaSelected method.key)}} />
+                    <label for="{{method.name}}">
+                        {{method.name}}
+                        {{#if method.recommended}}
+                            <span class="bg-blue-500 rounded-xl text-white px-2 py-1 ml-2 text-xs font-semibold">Recommended</span>
+                        {{/if}}
+                        <p class="text-sm text-gray-600 dark:text-gray-300 mt-1">{{method.description}}</p>
+                    </label>
+                </div>
+            {{/each}}
+        {{/if}}
+    </div>
+{{/if}}

console/app/components/two-fa-settings.js

@@ -0,0 +1,169 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { inject as service } from '@ember/service';
+
+/**
+ * Default Two-Factor Authentication method when not explicitly selected.
+ *
+ * @property {string} DEFAULT_2FA_METHOD
+ * @private
+ */
+const DEFAULT_2FA_METHOD = 'email';
+
+/**
+ * Glimmer component for managing Two-Factor Authentication settings.
+ *
+ * @class TwoFaSettingsComponent
+ * @extends Component
+ */
+export default class TwoFaSettingsComponent extends Component {
+    /**
+     * The fetch service for making HTTP requests.
+     *
+     * @property {Service} fetch
+     * @public
+     */
+    @service fetch;
+
+    /**
+     * The notifications service for displaying user notifications.
+     *
+     * @property {Service} notifications
+     * @public
+     */
+    @service notifications;
+
+    /**
+     * The currently selected Two-Factor Authentication method.
+     *
+     * @property {string} selectedTwoFaMethod
+     * @public
+     */
+    @tracked selectedTwoFaMethod;
+
+    /**
+     * Indicates whether Two-Factor Authentication is currently enabled.
+     *
+     * @property {boolean} isTwoFaEnabled
+     * @public
+     */
+    @tracked isTwoFaEnabled;
+
+    /**
+     * Indicates whether Two-Factor Authentication is required for all users.
+     *
+     * @property {boolean} isTwoFaEnforced
+     * @public
+     */
+    @tracked isTwoFaEnforced;
+
+    /**
+     * Indicates whether the settings should render an option to `enforce`
+     * Enforce is a flag that indicates that users either under a company or system must setup 2FA.
+     *
+     * @property {boolean} showEnforceOption
+     * @public
+     */
+    @tracked showEnforceOption;
+
+    /**
+     * Indicates whether the settings should render an option to select 2fa `mn=ethod`
+     * Method is a flag that indicates which method users can receive a 2FA code from.
+     *
+     * @property {boolean} showEnforceOption
+     * @public
+     */
+    @tracked showMethodSelection;
+
+    /**
+     * Class constructor to initialize the component.
+     *
+     * @constructor
+     * @param {Object} owner - The owner of the component.
+     * @param {Object} options - Options passed during component instantiation.
+     * @param {Object} options.twoFaSettings - The current Two-Factor Authentication settings.
+     * @param {Array} options.twoFaMethods - Available Two-Factor Authentication methods.
+     */
+    constructor(owner, { twoFaSettings, twoFaMethods, showEnforceOption, showMethodSelection = true }) {
+        super(...arguments);
+
+        const userSelectedMethod = isArray(twoFaMethods) ? twoFaMethods.find(({ key }) => key === twoFaSettings.method) : null;
+
+        this.showMethodSelection = showMethodSelection === true;
+        this.showEnforceOption = showEnforceOption === true;
+        this.isTwoFaEnabled = twoFaSettings.enabled === true;
+        this.isTwoFaEnforced = twoFaSettings.enforced === true;
+        this.selectedTwoFaMethod = userSelectedMethod ? userSelectedMethod.key : DEFAULT_2FA_METHOD;
+    }
+
+    /**
+     * Action handler for toggling Two-Factor Authentication.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} isTwoFaEnabled - Indicates whether Two-Factor Authentication is enabled.
+     * @return {void}
+     * @public
+     */
+    @action onTwoFaToggled(isTwoFaEnabled) {
+        this.isTwoFaEnabled = isTwoFaEnabled;
+
+        if (isTwoFaEnabled) {
+            const recommendedMethod = isArray(this.args.twoFaMethods) ? this.args.twoFaMethods.find((method) => method.recommended) : null;
+            if (recommendedMethod) {
+                this.selectedTwoFaMethod = recommendedMethod.key;
+            }
+        } else {
+            this.selectedTwoFaMethod = null;
+        }
+
+        if (typeof this.args.onTwoFaToggled === 'function') {
+            this.args.onTwoFaToggled(...arguments);
+        }
+
+        if (typeof this.args.onTwoFaMethodSelected === 'function') {
+            this.args.onTwoFaMethodSelected(this.selectedTwoFaMethod);
+        }
+    }
+
+    /**
+     * Action handler for toggling Two-Factor Authentication.
+     *
+     * @method onTwoFaEnforcedToggled
+     * @param {boolean} isTwoFaEnforced - Indicates whether Two-Factor Authentication is enabled.
+     * @return {void}
+     * @public
+     */
+    @action onTwoFaEnforcedToggled(isTwoFaEnforced) {
+        this.isTwoFaEnforced = isTwoFaEnforced;
+
+        if (typeof this.args.onTwoFaEnforcedToggled === 'function') {
+            this.args.onTwoFaEnforcedToggled(...arguments);
+        }
+    }
+
+    /**
+     * Action handler for selecting a Two-Factor Authentication method.
+     *
+     * @method onTwoFaSelected
+     * @param {string} method - The selected Two-Factor Authentication method.
+     * @return {void}
+     * @public
+     */
+    @action onTwoFaSelected(method) {
+        this.selectedTwoFaMethod = method;
+
+        if (typeof this.args.onTwoFaMethodSelected === 'function') {
+            this.args.onTwoFaMethodSelected(...arguments);
+        }
+    }
+
+    @action onRequireUsersToSetUpToggled(isTwoFaEnforced) {
+        this.isTwoFaEnforced = isTwoFaEnforced;
+
+        if (typeof this.args.onTwoFaEnforcedToggled === 'function') {
+            this.args.onTwoFaEnforcedToggled(isTwoFaEnforced);
+        }
+    }
+}

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

@@ -18,6 +18,13 @@ export default class AuthForgotPasswordController extends Controller {
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @memberof AuthForgotPasswordController
+     */
+    @service intl;
+
     /**
      * The email variable
      *
@@ -55,7 +62,7 @@ export default class AuthForgotPasswordController extends Controller {
         this.fetch
             .post('auth/get-magic-reset-link', { email })
             .then(() => {
-                this.notifications.success('Check your email to continue!');
+                this.notifications.success(this.intl.t('auth.forgot-password.success-message'));
                 this.isSent = true;
             })
             .catch((error) => {

console/app/controllers/auth/login.js

@@ -33,6 +33,27 @@ export default class AuthLoginController extends Controller {
      */
     @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;
+
     /**
      * Whether or not to remember the users session
      *
@@ -89,29 +110,62 @@ export default class AuthLoginController extends Controller {
      */
     @tracked failedAttempts = 0;
 
-    /**
-     * Authenticate the user
-     *
-     * @void
-     */
+    @tracked token;
+
     @action async login(event) {
         // firefox patch
         event.preventDefault();
-
         // get user credentials
-        const { email, password, rememberMe } = this;
+        const { identity, password, rememberMe } = this;
+
+        // If no password error
+        if (!identity) {
+            return this.notifications.warning(this.intl.t('auth.login.no-identity-notification'));
+        }
+
+        // If no password error
+        if (!password) {
+            return this.notifications.warning(this.intl.t('auth.login.no-identity-notification'));
+        }
 
         // start loader
         this.set('isLoading', true);
-
         // set where to redirect on login
         this.setRedirect();
 
+        // send request to check for 2fa
         try {
-            await this.session.authenticate('authenticator:fleetbase', { email, password }, rememberMe);
+            let { twoFaSession, isTwoFaEnabled } = await this.session.checkForTwoFactor(identity);
+
+            if (isTwoFaEnabled) {
+                return this.session.store
+                    .persist({ identity })
+                    .then(() => {
+                        return this.router.transitionTo('auth.two-fa', { queryParams: { token: twoFaSession } }).then(() => {
+                            this.reset('success');
+                        });
+                    })
+                    .catch((error) => {
+                        this.notifications.serverError(error);
+                        this.reset('error');
+
+                        throw error;
+                    });
+            }
+        } catch (error) {
+            return this.notifications.serverError(error);
+        }
+
+        try {
+            await this.session.authenticate('authenticator:fleetbase', { identity, password }, rememberMe);
         } catch (error) {
             this.failedAttempts++;
 
+            // Handle unverified user
+            if (error.toString().includes('not verified')) {
+                return this.sendUserForEmailVerification(identity);
+            }
+
             return this.failure(error);
         }
 
@@ -124,20 +178,38 @@ export default class AuthLoginController extends Controller {
      * Transition user to onboarding screen
      */
     @action transitionToOnboard() {
-        return this.transitionToRoute('onboard');
+        return this.router.transitionTo('onboard');
     }
 
     /**
      * Transition to forgot password screen, if email is set - set it.
      */
     @action forgotPassword() {
-        return this.transitionToRoute('auth.forgot-password').then(() => {
+        return this.router.transitionTo('auth.forgot-password').then(() => {
             if (this.email) {
                 this.forgotPasswordController.email = this.email;
             }
         });
     }
 
+    /**
+     * Creates an email verification session and transitions user to verification route.
+     *
+     * @param {String} email
+     * @return {Promise<Transition>}
+     * @memberof AuthLoginController
+     */
+    @action sendUserForEmailVerification(email) {
+        return this.fetch.post('auth/create-verification-session', { email, send: true }).then(({ token, session }) => {
+            return this.session.store.persist({ email }).then(() => {
+                this.notifications.warning(this.intl.t('auth.login.unverified-notification'));
+                return this.router.transitionTo('auth.verification', { queryParams: { token, hello: session } }).then(() => {
+                    this.reset('error');
+                });
+            });
+        });
+    }
+
     /**
      * Sets correct route to send user to after login.
      *
@@ -177,7 +249,7 @@ export default class AuthLoginController extends Controller {
      * @void
      */
     slowConnection() {
-        this.notifications.error('Experiencing connectivity issues.');
+        this.notifications.error(this.intl.t('auth.login.slow-connection-message'));
     }
 
     /**

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

@@ -1,7 +1,7 @@
 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 AuthResetPasswordController extends Controller {
     /**
@@ -18,6 +18,20 @@ export default class AuthResetPasswordController extends Controller {
      */
     @service notifications;
 
+    /**
+     * Inject the `router` service
+     *
+     * @memberof AuthResetPasswordController
+     */
+    @service router;
+
+    /**
+     * Inject the `intl` service
+     *
+     * @memberof AuthResetPasswordController
+     */
+    @service intl;
+
     /**
      * The code param.
      *
@@ -40,38 +54,23 @@ export default class AuthResetPasswordController extends Controller {
     @tracked password_confirmation;
 
     /**
-     * Loading stae of password reset.
+     * The reset password task.
      *
      * @memberof AuthResetPasswordController
      */
-    @tracked isLoading;
-
-    /**
-     * The reset password action.
-     *
-     * @memberof AuthResetPasswordController
-     */
-    @action resetPassword(event) {
-        // firefox patch
+    @task *resetPassword(event) {
         event.preventDefault();
 
         const { code, password, password_confirmation } = this;
         const { id } = this.model;
 
-        this.isLoading = true;
+        try {
+            yield this.fetch.post('auth/reset-password', { link: id, code, password, password_confirmation });
+        } catch (error) {
+            return this.notifications.serverError(error);
+        }
 
-        this.fetch
-            .post('auth/reset-password', { link: id, code, password, password_confirmation })
-            .then(() => {
-                this.notifications.success('Your password has been reset! Login to continue.');
-
-                return this.transitionToRoute('auth.login');
-            })
-            .catch((error) => {
-                this.notifications.serverError(error);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+        this.notifications.success(this.intl.t('auth.reset-password.success-message'));
+        yield this.router.transitionTo('auth.login');
     }
 }

console/app/controllers/auth/two-fa.js

@@ -0,0 +1,274 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+/**
+ * Controller responsible for handling two-factor authentication.
+ * @class AuthTwoFaController
+ * @extends Controller
+ */
+export default class AuthTwoFaController extends Controller {
+    /**
+     * Router service.
+     *
+     * @var {Service}
+     */
+    @service router;
+
+    /**
+     * Fetch service for making HTTP requests.
+     *
+     * @var {Service}
+     */
+    @service fetch;
+
+    /**
+     * Notifications service for handling notifications.
+     *
+     * @var {Service}
+     */
+    @service notifications;
+
+    /**
+     * Session service for managing user sessions.
+     *
+     * @var {Service}
+     */
+    @service session;
+
+    /**
+     * Internationalization service.
+     *
+     * @var {Service}
+     */
+    @service intl;
+
+    /**
+     * Tracked property for storing the verification token.
+     *
+     * @property {string} token
+     * @tracked
+     */
+    @tracked token;
+
+    /**
+     * The current 2FA identity in memory
+     * @property {string} identity
+     * @tracked
+     */
+    @tracked identity;
+
+    /**
+     * Tracked property representing the client token from the validated 2fa session.
+     *
+     * @property {number} clientToken
+     * @tracked
+     * @default null
+     */
+    @tracked clientToken;
+
+    /**
+     * Tracked property for storing the verification code.
+     *
+     * @property {string} verificationCode
+     * @tracked
+     */
+    @tracked verificationCode = '';
+
+    /**
+     * Tracked property for storing the verification code.
+     *
+     * @property {string} verificationCode
+     * @tracked
+     */
+    @tracked otpValue = '';
+
+    /**
+     * Tracked property representing the date the 2fa session will expire
+     * @property {Date|null} twoFactorSessionExpiresAfter
+     * @tracked
+     * @default null
+     */
+    @tracked twoFactorSessionExpiresAfter;
+
+    /**
+     * Tracked property representing when the countdown is ready to start.
+     *
+     * @property {Boolean} countdownReady
+     * @tracked
+     * @default false
+     */
+    @tracked countdownReady = false;
+
+    /**
+     * Tracked property representing when verification code has expired.
+     *
+     * @property {Boolean} isCodeExpired
+     * @tracked
+     * @default false
+     */
+    @tracked isCodeExpired = false;
+
+    /**
+     * Query parameters for the controller.
+     *
+     * @property {Array} queryParams
+     */
+    queryParams = ['token', 'clientToken'];
+
+    /**
+     * Action method for verifying the entered verification code.
+     *
+     * @method verifyCode
+     * @action
+     */
+    @action async verifyCode(event) {
+        // prevent form default behaviour
+        if (event && typeof event.preventDefault === 'function') {
+            event.preventDefault();
+        }
+
+        try {
+            const { token, verificationCode, clientToken, identity } = this;
+
+            if (!clientToken) {
+                this.notifications.error(this.intl.t('auth.two-fa.verify-code.invalid-session-error-notification'));
+                return;
+            }
+
+            // Call the backend API to verify the entered verification code
+            const { authToken } = await this.fetch.post('two-fa/verify', {
+                token,
+                code: verificationCode,
+                clientToken,
+                identity,
+            });
+
+            // If verification is successful, transition to the desired route
+            this.notifications.success(this.intl.t('auth.two-fa.verify-code.verification-successful-notification'));
+
+            // authenticate user
+            return this.session.authenticate('authenticator:fleetbase', { authToken }).then(() => {
+                return this.router.transitionTo('console');
+            });
+        } catch (error) {
+            if (error.message.includes('Verification code has expired')) {
+                this.notifications.info(this.intl.t('auth.two-fa.verify-code.verification-code-expired-notification'));
+            } else {
+                this.notifications.error(this.intl.t('auth.two-fa.verify-code.verification-code-failed-notification'));
+            }
+        }
+    }
+
+    /**
+     * Resends the verification code for Two-Factor Authentication.
+     * Disables the countdown timer while processing and handles success or error notifications.
+     *
+     * @returns {Promise<void>}
+     * @action
+     */
+    @action async resendCode() {
+        // disable countdown timer
+        this.countdownReady = false;
+
+        try {
+            const { identity, token } = this;
+            const { clientToken } = await this.fetch.post('two-fa/resend', {
+                identity,
+                token,
+            });
+
+            if (clientToken) {
+                this.clientToken = clientToken;
+                this.twoFactorSessionExpiresAfter = this.getExpirationDateFromClientToken(clientToken);
+                this.countdownReady = true;
+                this.isCodeExpired = false;
+                this.notifications.success(this.intl.t('auth.two-fa.resend-code.verification-code-resent-notification'));
+            } else {
+                this.notifications.error(this.intl.t('auth.two-fa.resend-code.verification-code-resent-error-notification'));
+            }
+        } catch (error) {
+            // Handle errors, show error notifications, etc.
+            this.notifications.error(this.intl.t('auth.two-fa.resend-code.verification-code-resent-error-notification'));
+        }
+    }
+
+    /**
+     * Cancels the current Two-Fa session and redirects to login screen.
+     *
+     * @returns {Promise<Transition>}
+     * @memberof AuthTwoFaController
+     */
+    @action cancelTwoFactor() {
+        return this.fetch
+            .post('two-fa/invalidate', {
+                identity: this.identity,
+                token: this.token,
+            })
+            .then(() => {
+                return this.router.transitionTo('auth.login');
+            });
+    }
+
+    /**
+     * Set that the verification code has expired and allow user to resend.
+     *
+     * @memberof AuthTwoFaController
+     */
+    @action handleCodeExpired() {
+        this.isCodeExpired = true;
+        this.countdownReady = false;
+    }
+
+    /**
+     * Handles the input of the OTP (One-Time Password) and triggers the verification process.
+     *
+     * @param {string} otpValue - The OTP value entered by the user.
+     * @returns {void}
+     * @action
+     */
+    @action handleOtpInput(otpValue) {
+        this.verificationCode = otpValue;
+        this.verifyCode();
+    }
+
+    /**
+     * Converts a base64 encoded client token to a Date representing the expiration date.
+     *
+     * @method getExpirationDateFromClientToken
+     * @param {string} clientToken - Base64 encoded client token.
+     * @returns {Date|null} - Date representing the expiration date, or null if invalid.
+     */
+    getExpirationDateFromClientToken(clientToken) {
+        const decoder = new TextDecoder();
+        const binString = atob(clientToken);
+        const bytes = Uint8Array.from(binString, (m) => m.codePointAt(0));
+        const decodedString = decoder.decode(bytes);
+
+        if (typeof decodedString === 'string' && decodedString.includes('|')) {
+            const parts = decodedString.split('|');
+            const expiresAt = this.convertUtcToClientTime(parts[0]);
+
+            if (expiresAt instanceof Date) {
+                return expiresAt;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Converts a UTC date-time string to client time zone.
+     *
+     * @method convertUtcToClientTime
+     * @param {string} utcDateTimeString - UTC date-time string.
+     * @returns {Date} - Date in client time zone.
+     */
+    convertUtcToClientTime(utcDateTimeString) {
+        const utcDate = new Date(utcDateTimeString);
+        const clientTimezoneOffset = new Date().getTimezoneOffset();
+        const clientDate = new Date(utcDate.getTime() - clientTimezoneOffset * 60 * 1000);
+        return clientDate;
+    }
+}

console/app/controllers/auth/verification.js

@@ -0,0 +1,254 @@
+import Controller from '@ember/controller';
+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';
+
+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;
+
+    /**
+     * The session paramerer.
+     *
+     * @memberof OnboardVerifyEmailController
+     */
+    @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;
+
+    /**
+     * 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);
+
+        later(
+            this,
+            () => {
+                this.stillWaiting = true;
+            },
+            this.waitTimeout
+        );
+    }
+
+    /**
+     * 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;
+        } else {
+            this.isReadyToSubmit = false;
+        }
+    }
+
+    /**
+     * Validates input on the first render
+     *
+     * @param {HTMLElement} el
+     * @memberof AuthVerificationController
+     */
+    @action validateInitInput(el) {
+        const value = el.value;
+        if (value.length > 5) {
+            this.isReadyToSubmit = true;
+        } else {
+            this.isReadyToSubmit = false;
+        }
+    }
+
+    /**
+     * Submits to verify code.
+     *
+     * @return {Promise}
+     * @memberof OnboardVerifyEmailController
+     */
+    @action verifyCode() {
+        const { token, code, email } = this;
+
+        this.isLoading = true;
+
+        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');
+                }
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
+
+    /**
+     * 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) => {
+                modal.startLoading();
+                const phone = modal.getOption('phone');
+
+                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);
+                    });
+            },
+        });
+    }
+
+    /**
+     * 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) => {
+                modal.startLoading();
+                const email = modal.getOption('email');
+
+                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);
+                    });
+            },
+        });
+    }
+}

console/app/controllers/console.js

@@ -51,6 +51,13 @@ export default class ConsoleController extends Controller {
      */
     @service router;
 
+    /**
+     * Inject the `intl` service.
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `universe` service.
      *
@@ -72,6 +79,20 @@ export default class ConsoleController extends Controller {
      */
     @tracked sidebarContext;
 
+    /**
+     * State of sidebar toggle icon
+     *
+     * @var {SidebarContext}
+     */
+    @tracked sidebarToggleEnabled = true;
+
+    /**
+     * The sidebar toggle state.
+     *
+     * @var {SidebarContext}
+     */
+    @tracked sidebarToggleState = {};
+
     /**
      * Routes which should hide the sidebar menu.
      *
@@ -101,18 +122,49 @@ export default class ConsoleController extends Controller {
      */
     constructor() {
         super(...arguments);
-
         this.router.on('routeDidChange', (transition) => {
             if (this.sidebarContext) {
-                if (this.hiddenSidebarRoutes.includes(transition.to.name)) {
+                // Determine if the new route should hide the sidebar
+                const shouldHideSidebar = this.hiddenSidebarRoutes.includes(transition.to.name);
+
+                // Check if the sidebar was manually toggled and is currently closed
+                const isSidebarManuallyClosed = this.sidebarToggleState.clicked && !this.sidebarToggleState.isOpen;
+
+                // Hide the sidebar if the current route is in hiddenSidebarRoutes
+                if (shouldHideSidebar) {
+                    this.sidebarContext.hideNow();
+                    this.sidebarToggleEnabled = false;
+                    return; // Exit early as no further action is required
+                }
+
+                // If the sidebar was manually closed and not on a hidden route, keep it closed
+                if (isSidebarManuallyClosed) {
                     this.sidebarContext.hideNow();
                 } else {
+                    // Otherwise, show the sidebar
                     this.sidebarContext.show();
                 }
+
+                // Ensure toggle is enabled unless on a hidden route
+                this.sidebarToggleEnabled = !shouldHideSidebar;
             }
         });
     }
 
+    /**
+     * When sidebar is manually toggled
+     *
+     * @param {SidebarContext} sidebar
+     * @param {boolean} isOpen
+     * @memberof ConsoleController
+     */
+    @action onSidebarToggle(sidebar, isOpen) {
+        this.sidebarToggleState = {
+            clicked: true,
+            isOpen,
+        };
+    }
+
     /**
      * Sets the sidebar context
      *
@@ -122,9 +174,11 @@ export default class ConsoleController extends Controller {
     @action setSidebarContext(sidebarContext) {
         this.sidebarContext = sidebarContext;
         this.universe.sidebarContext = sidebarContext;
+        this.universe.trigger('sidebarContext.available', sidebarContext);
 
         if (this.hiddenSidebarRoutes.includes(this.router.currentRouteName)) {
             this.sidebarContext.hideNow();
+            this.sidebarToggleEnabled = false;
         }
     }
 
@@ -159,8 +213,8 @@ export default class ConsoleController extends Controller {
         const country = this.currentUser.country;
 
         this.modalsManager.show('modals/create-or-join-org', {
-            title: 'Create or join a organization',
-            acceptButtonText: 'Confirm',
+            title: this.intl.t('console.create-or-join-organization.modal-title'),
+            acceptButtonText: this.intl.t('common.confirm'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
             action: 'join',
@@ -180,13 +234,22 @@ export default class ConsoleController extends Controller {
                 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('You have joined a new organization!');
-                        setTimeout(() => {
-                            window.location.reload();
-                        }, 900);
-                    });
+                    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
@@ -200,7 +263,7 @@ export default class ConsoleController extends Controller {
                     })
                     .then(() => {
                         this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success('You have created a new organization!');
+                        this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
                         later(
                             this,
                             () => {
@@ -208,6 +271,9 @@ export default class ConsoleController extends Controller {
                             },
                             900
                         );
+                    })
+                    .catch((error) => {
+                        this.notifications.serverError(error);
                     });
             },
         });
@@ -224,9 +290,9 @@ export default class ConsoleController extends Controller {
         }
 
         this.modalsManager.confirm({
-            title: `Are you sure you want to switch organization to ${organization.name}?`,
-            body: `By confirming your account will remain logged in, but your primary organization will be switched.`,
-            acceptButtonText: `Yes, I want to switch organization`,
+            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: (modal) => {
                 modal.startLoading();
@@ -235,10 +301,14 @@ export default class ConsoleController extends Controller {
                     .post('auth/switch-organization', { next: organization.uuid })
                     .then(() => {
                         this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success('You have switched organizations');
-                        setTimeout(() => {
-                            window.location.reload();
-                        }, 900);
+                        this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
+                        later(
+                            this,
+                            () => {
+                                window.location.reload();
+                            },
+                            900
+                        );
                     })
                     .catch((error) => {
                         this.notifications.serverError(error);
@@ -249,8 +319,8 @@ export default class ConsoleController extends Controller {
 
     @action viewChangelog() {
         this.modalsManager.show('modals/changelog', {
-            title: 'Changelog',
-            acceptButtonText: 'OK',
+            title: this.intl.t('common.changelog'),
+            acceptButtonText: this.intl.t('common.ok'),
             hideDeclineButton: true,
         });
     }

console/app/controllers/console/account/auth.js

@@ -0,0 +1,229 @@
+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 getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
+
+/**
+ * Controller for managing user authentication and password-related actions in the console.
+ *
+ * @class ConsoleAccountAuthController
+ * @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;
+
+    /**
+     * The new password the user intends to set.
+     *
+     * @type {string}
+     */
+    @tracked newPassword;
+
+    /**
+     * The user's confirmation of the new password.
+     *
+     * @type {string}
+     */
+    @tracked newConfirmPassword;
+
+    /**
+     * System-wide two-factor authentication configuration.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaConfig = {};
+
+    /**
+     * User-specific two-factor authentication settings.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaSettings = {};
+
+    /**
+     * Flag indicating whether system-wide two-factor authentication is enabled.
+     *
+     * @type {boolean}
+     */
+    @tracked isSystemTwoFaEnabled = false;
+
+    /**
+     * Available two-factor authentication methods.
+     *
+     * @type {Array}
+     */
+    @tracked methods = getTwoFaMethods();
+
+    /**
+     * Constructor method for the ConsoleAccountAuthController.
+     *
+     * @constructor
+     */
+    constructor() {
+        super(...arguments);
+        this.loadSystemTwoFaConfig.perform();
+        this.loadUserTwoFaSettings.perform();
+    }
+
+    /**
+     * Handles the event when two-factor authentication is toggled.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} enabled - Whether two-factor authentication is enabled or not.
+     */
+    @action onTwoFaToggled(enabled) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            enabled,
+        };
+    }
+
+    /**
+     * Handles the event when a two-factor authentication method is selected.
+     *
+     * @method onTwoFaMethodSelected
+     * @param {string} method - The selected two-factor authentication method.
+     */
+    @action onTwoFaMethodSelected(method) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            method,
+        };
+    }
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings asynchronously.
+     *
+     * @method saveTwoFactorAuthSettings
+     */
+    @action saveTwoFactorAuthSettings() {
+        this.saveUserTwoFaSettings.perform(this.twoFaSettings);
+    }
+
+    /**
+     * Initiates the task to change the user's password asynchronously.
+     *
+     * @method changePassword
+     */
+    @task *changePassword(event) {
+        // If from event fired
+        if (event instanceof Event) {
+            event.preventDefault();
+        }
+
+        // Validate current password
+        const isPasswordValid = yield this.validatePassword.perform();
+        if (!isPasswordValid) {
+            this.newPassword = undefined;
+            this.newConfirmPassword = undefined;
+            return;
+        }
+
+        try {
+            yield this.fetch.post('users/change-password', {
+                password: this.newPassword,
+                password_confirmation: this.newConfirmPassword,
+            });
+
+            this.notifications.success('Password change successfully.');
+        } catch (error) {
+            this.notifications.serverError(error, 'Failed to change password.');
+        }
+
+        this.newPassword = undefined;
+        this.newConfirmPassword = undefined;
+    }
+
+    /**
+     * Task to validate current password
+     *
+     * @return {boolean}
+     */
+    @task *validatePassword() {
+        let isPasswordValid = false;
+
+        yield this.modalsManager.show('modals/validate-password', {
+            body: 'You must validate your current password before it can be changed.',
+            onValidated: (isValid) => {
+                isPasswordValid = isValid;
+            },
+        });
+
+        return isPasswordValid;
+    }
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings asynchronously.
+     *
+     * @method saveUserTwoFaSettings
+     * @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);
+            });
+    }
+
+    /**
+     * Initiates the task to load user-specific two-factor authentication settings asynchronously.
+     *
+     * @method loadUserTwoFaSettings
+     */
+    @task *loadUserTwoFaSettings() {
+        const twoFaSettings = yield this.fetch.get('users/two-fa');
+
+        if (twoFaSettings) {
+            this.isUserTwoFaEnabled = twoFaSettings.enabled;
+            this.twoFaSettings = twoFaSettings;
+        }
+        return twoFaSettings;
+    }
+
+    /**
+     * Initiates the task to load system-wide two-factor authentication configuration asynchronously.
+     *
+     * @method loadSystemTwoFaConfig
+     */
+    @task *loadSystemTwoFaConfig() {
+        const twoFaConfig = yield this.fetch.get('two-fa/config');
+
+        if (twoFaConfig) {
+            this.isSystemTwoFaEnabled = twoFaConfig.enabled;
+            this.twoFaConfig = twoFaConfig;
+        }
+        return twoFaConfig;
+    }
+}

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

@@ -1,8 +1,8 @@
 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 { task } from 'ember-concurrency';
 
 export default class ConsoleAccountIndexController extends Controller {
     /**
@@ -18,6 +18,7 @@ export default class ConsoleAccountIndexController extends Controller {
      * @memberof ConsoleAccountIndexController
      */
     @service fetch;
+
     /**
      * Inject the `notifications` service.
      *
@@ -26,11 +27,11 @@ export default class ConsoleAccountIndexController extends Controller {
     @service notifications;
 
     /**
-     * The loading state of request.
+     * Inject the `modalsManager` service.
      *
      * @memberof ConsoleAccountIndexController
      */
-    @tracked isLoading = false;
+    @service modalsManager;
 
     /**
      * Alias to the currentUser service user record.
@@ -50,9 +51,9 @@ export default class ConsoleAccountIndexController extends Controller {
             file,
             {
                 path: `uploads/${this.user.company_uuid}/users/${this.user.slug}`,
-                key_uuid: this.user.id,
-                key_type: `user`,
-                type: `user_avatar`,
+                subject_uuid: this.user.id,
+                subject_type: 'user',
+                type: 'user_avatar',
             },
             (uploadedFile) => {
                 this.user.setProperties({
@@ -66,27 +67,64 @@ export default class ConsoleAccountIndexController extends Controller {
     }
 
     /**
-     * Save the Profile settings.
+     * Starts the task to change password
      *
-     * @return {Promise}
+     * @param {Event} event
      * @memberof ConsoleAccountIndexController
      */
-    @action saveProfile() {
-        const user = this.user;
+    @task *saveProfile(event) {
+        // If from event fired
+        if (event instanceof Event) {
+            event.preventDefault();
+        }
 
-        this.isLoading = true;
+        let canUpdateProfile = true;
+        // If email has been changed prompt for password validation
+        if (this.changedUserAttribute('email')) {
+            canUpdateProfile = yield this.validatePassword.perform();
+        }
 
-        return user
-            .save()
-            .then((user) => {
+        if (canUpdateProfile === true) {
+            try {
+                const user = yield this.user.save();
                 this.notifications.success('Profile changes saved.');
                 this.currentUser.set('user', user);
-            })
-            .catch((error) => {
+            } catch (error) {
                 this.notifications.serverError(error);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+            }
+        } else {
+            this.user.rollbackAttributes();
+        }
+    }
+
+    /**
+     * Task to validate current password
+     *
+     * @return {boolean}
+     * @memberof ConsoleAccountIndexController
+     */
+    @task *validatePassword() {
+        let isPasswordValid = false;
+
+        yield this.modalsManager.show('modals/validate-password', {
+            body: 'You must validate your password to update the account email address.',
+            onValidated: (isValid) => {
+                isPasswordValid = isValid;
+            },
+        });
+
+        return isPasswordValid;
+    }
+
+    /**
+     * Checks if any user attribute has been changed
+     *
+     * @param {string} attributeKey
+     * @return {boolean}
+     * @memberof ConsoleAccountIndexController
+     */
+    changedUserAttribute(attributeKey) {
+        const changedAttributes = this.user.changedAttributes();
+        return changedAttributes[attributeKey] !== undefined;
     }
 }

console/app/controllers/console/admin/branding.js

@@ -104,6 +104,16 @@ export default class ConsoleAdminBrandingController extends Controller {
             .save()
             .then(() => {
                 this.notifications.success('Branding settings saved.');
+
+                // if logo url is null
+                if (this.model.logo_url === null) {
+                    this.model.set('logo_url', '/images/fleetbase-logo-svg.svg');
+                }
+
+                // if icon url is null
+                if (this.model.icon_url === null) {
+                    this.model.set('icon_url', '/images/icon.png');
+                }
             })
             .finally(() => {
                 this.isLoading = false;

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

@@ -0,0 +1,169 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+/**
+ * Controller for managing organizations in the admin console.
+ *
+ * @class ConsoleAdminOrganizationsController
+ * @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;
+
+    /**
+     * The search query param value.
+     *
+     * @var {String|null}
+     */
+    @tracked query;
+
+    /**
+     * The current page of data being viewed
+     *
+     * @var {Integer}
+     */
+    @tracked page = 1;
+
+    /**
+     * The maximum number of items to show per page
+     *
+     * @var {Integer}
+     */
+    @tracked limit = 20;
+
+    /**
+     * The filterable param `sort`
+     *
+     * @var {String|Array}
+     */
+    @tracked sort = '-created_at';
+
+    /**
+     * The filterable param `name`
+     *
+     * @var {String}
+     */
+    @tracked name;
+
+    /**
+     * The filterable param `country`
+     *
+     * @var {String}
+     */
+    @tracked country;
+
+    /**
+     * Array to store the fetched companies.
+     *
+     * @var {Array}
+     */
+    @tracked companies = [];
+
+    /**
+     * Queryable parameters for this controller's model
+     *
+     * @var {Array}
+     */
+    queryParams = ['name', 'page', 'limit', 'sort'];
+
+    /**
+     * Columns for organization
+     *
+     * @memberof ConsoleAdminOrganizationsController
+     */
+    columns = [
+        {
+            label: this.intl.t('common.name'),
+            valuePath: 'name',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/string',
+        },
+        {
+            label: this.intl.t('console.admin.organizations.index.owner-name-column'),
+            valuePath: 'owner.name',
+            width: '200px',
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: this.intl.t('console.admin.organizations.index.owner-email-column'),
+            valuePath: 'owner.email',
+            width: '200px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+        },
+        {
+            label: this.intl.t('console.admin.organizations.index.phone-column'),
+            valuePath: 'owner.phone',
+            width: '200px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/string',
+        },
+        {
+            label: this.intl.t('console.admin.organizations.index.users-count-column'),
+            valuePath: 'users_count',
+            resizable: true,
+            sortable: true,
+        },
+        {
+            label: this.intl.t('common.created-at'),
+            valuePath: 'createdAt',
+        },
+    ];
+
+    /**
+     * Update search query param and reset page to 1
+     *
+     * @param {Event} event
+     * @memberof ConsoleAdminOrganizationsController
+     */
+    @action search(event) {
+        this.query = event.target.value ?? '';
+        this.page = 1;
+    }
+
+    /**
+     * Navigates to the organization-users route for the selected company.
+     *
+     * @method goToCompany
+     * @param {Object} company - The selected company.
+     */
+    @action goToCompany(company) {
+        this.router.transitionTo('console.admin.organizations.index.users', company.public_id);
+    }
+}

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

@@ -0,0 +1,136 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+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;
+
+    /**
+     * The current page of data being viewed
+     *
+     * @var {Integer}
+     */
+    @tracked nestedPage = 1;
+
+    /**
+     * The maximum number of items to show per page
+     *
+     * @var {Integer}
+     */
+    @tracked nestedLimit = 20;
+
+    /**
+     * The filterable param `sort`
+     *
+     * @var {Array|String}
+     */
+    @tracked nestedSort = '-created_at';
+
+    /**
+     * The filterable param `sort`
+     *
+     * @var {String}
+     */
+    @tracked nestedQuery = '';
+
+    /**
+     * The company loaded.
+     *
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @tracked company;
+
+    /**
+     * The overlay context API.
+     *
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @tracked contextApi;
+
+    /**
+     * Queryable parameters for this controller's model
+     *
+     * @var {Array}
+     */
+    queryParams = ['nestedPage', 'nestedLimit', 'nestedSort', 'nestedQuery'];
+
+    /**
+     * Columns to render to the table.
+     *
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    columns = [
+        {
+            label: this.intl.t('common.name'),
+            valuePath: 'name',
+        },
+        {
+            label: this.intl.t('common.phone-number'),
+            valuePath: 'phone',
+        },
+        {
+            label: this.intl.t('common.email'),
+            valuePath: 'email',
+        },
+        {
+            label: this.intl.t('common.status'),
+            valuePath: 'status',
+            cellComponent: 'table/cell/status',
+        },
+    ];
+
+    /**
+     * Update search query param and reset page to 1
+     *
+     * @param {Event} event
+     * @memberof ConsoleAdminOrganizationsController
+     */
+    @action search(event) {
+        this.nestedQuery = event.target.value ?? '';
+        this.nestedPage = 1;
+    }
+
+    /**
+     * Set the overlay component context object.
+     *
+     * @param {Object} contextApi
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action setOverlayContext(contextApi) {
+        this.contextApi = contextApi;
+    }
+
+    /**
+     * Handle closing the overlay.
+     *
+     * @return {Promise<Transition>}
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action onPressClose() {
+        if (this.contextApi && typeof this.contextApi.close === 'function') {
+            this.contextApi.close();
+        }
+
+        return this.router.transitionTo('console.admin.organizations.index');
+    }
+}

console/app/controllers/console/admin/schedule-monitor/logs.js

@@ -0,0 +1,65 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
+
+export default class ConsoleAdminScheduleMonitorLogsController extends Controller {
+    /**
+     * The router service.
+     *
+     * @memberof ConsoleAdminScheduleMonitorLogsController
+     */
+    @service router;
+    /**
+     * The fetch service.
+     *
+     * @memberof ConsoleAdminScheduleMonitorLogsController
+     */
+    @service fetch;
+
+    /**
+     * Tracked property for logs.
+     * @type {Array}
+     */
+    @tracked logs = [];
+
+    /**
+     * Tracked property for the context API.
+     * @type {Object}
+     */
+    @tracked contextApi;
+
+    /**
+     * Periodically reloads logs every 3 seconds.
+     *
+     * @memberof ConsoleAdminScheduleMonitorLogsController
+     */
+    @task *reload(task) {
+        this.logs = yield this.fetch.get(`schedule-monitor/${task.id}/logs`);
+    }
+
+    /**
+     * Set the overlay component context object.
+     *
+     * @param {Object} contextApi
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action setOverlayContext(contextApi) {
+        this.contextApi = contextApi;
+    }
+
+    /**
+     * Handle closing the overlay.
+     *
+     * @return {Promise<Transition>}
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action onPressClose() {
+        if (this.contextApi && typeof this.contextApi.close === 'function') {
+            this.contextApi.close();
+        }
+
+        return this.router.transitionTo('console.admin.schedule-monitor');
+    }
+}

console/app/controllers/console/admin/two-fa-settings.js

@@ -0,0 +1,172 @@
+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 getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
+
+/**
+ * Controller responsible for handling Two-Factor Authentication settings in the admin console.
+ *
+ * @class ConsoleAdminTwoFaSettingsController
+ * @extends Controller
+ */
+export default class ConsoleAdminTwoFaSettingsController extends Controller {
+    /**
+     * Service for handling data fetching.
+     *
+     * @type {fetch}
+     */
+    @service fetch;
+
+    /**
+     * Service for displaying notifications.
+     *
+     * @type {notifications}
+     */
+    @service notifications;
+
+    /**
+     * System-wide two-factor authentication configuration.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaConfig = {};
+
+    /**
+     * User-specific two-factor authentication settings.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaSettings = {};
+
+    /**
+     * Flag indicating whether system-wide two-factor authentication is enabled.
+     *
+     * @type {boolean}
+     */
+    @tracked isSystemTwoFaEnabled = false;
+
+    /**
+     * Flag indicating whether 2FA enforcement is required.
+     *
+     * @type {boolean}
+     */
+    @tracked isTwoFaEnforced = false;
+
+    /**
+     * Available two-factor authentication methods.
+     *
+     * @type {Array}
+     */
+    @tracked methods = getTwoFaMethods();
+
+    /**
+     * Tracked property for the loading state
+     *
+     * @memberof ConsoleAdminTwoFaSettingsController
+     * @var {Boolean}
+     */
+    @tracked isLoading = false;
+
+    /**
+     * Constructor method for the ConsoleAccountAuthController.
+     *
+     * @constructor
+     */
+    constructor() {
+        super(...arguments);
+        this.loadSystemTwoFaConfig.perform();
+    }
+
+    /**
+     * Handles the event when two-factor authentication is toggled.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} enabled - Whether two-factor authentication is enabled or not.
+     */
+    @action onTwoFaToggled(enabled) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            enabled,
+        };
+    }
+
+    /**
+     * Handles the event when a two-factor authentication method is selected.
+     *
+     * @method onTwoFaMethodSelected
+     * @param {string} method - The selected two-factor authentication method.
+     */
+    @action onTwoFaMethodSelected(method) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            method,
+        };
+    }
+
+    /**
+     * Handles the event when two-factor authentication is toggled.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} enabled - Whether two-factor authentication is enforced or not.
+     */
+    @action onTwoFaEnforceToggled(enforced) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            enforced,
+        };
+    }
+
+    /**
+     * Handles the event when 2FA enforcement is toggled.
+     *
+     * @method onTwoFaEnforceToggled
+     */
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings asynchronously.
+     *
+     * @method saveTwoFactorAuthSettings
+     */
+    @action saveSettings() {
+        this.saveTwoFactorSettingsForAdmin.perform(this.twoFaSettings);
+    }
+
+    /**
+     * Initiates the task to load system-wide two-factor authentication configuration asynchronously.
+     *
+     * @method loadSystemTwoFaConfig
+     */
+
+    @task *loadSystemTwoFaConfig() {
+        const twoFaSettings = yield this.fetch.get('two-fa/config').catch((error) => {
+            this.notifications.serverError(error);
+        });
+        if (twoFaSettings) {
+            this.twoFaSettings = twoFaSettings;
+        }
+
+        return twoFaSettings;
+    }
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings asynchronously.
+     *
+     * @method saveTwoFactorSettingsForAdmin
+     * @param {Object} twoFaSettings - User-specific two-factor authentication settings.
+     */
+    @task *saveTwoFactorSettingsForAdmin(twoFaSettings = {}) {
+        yield this.fetch
+            .post('two-fa/config', { twoFaSettings })
+            .then(() => {
+                this.notifications.success('2FA Settings saved for admin successfully.');
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
+}

console/app/controllers/console/settings/auth.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class ConsoleSettingsAuthController extends Controller {}

console/app/controllers/console/settings/two-fa.js

@@ -0,0 +1,184 @@
+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 getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
+
+export default class ConsoleSettingsTwoFaController extends Controller {
+    /**
+     * Service for handling data fetching.
+     *
+     * @type {fetch}
+     */
+    @service fetch;
+
+    /**
+     * Service for displaying notifications.
+     *
+     * @type {notifications}
+     */
+    @service notifications;
+
+    /**
+     * System-wide two-factor authentication configuration.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaConfig = {};
+
+    /**
+     * User-specific two-factor authentication settings.
+     *
+     * @type {Object}
+     */
+    @tracked twoFaSettings = {};
+
+    /**
+     * Flag indicating whether system-wide two-factor authentication is enabled.
+     *
+     * @type {boolean}
+     */
+    @tracked isSystemTwoFaEnabled = false;
+
+    /**
+     * Flag indicating whether system-wide two-factor authentication is enabled.
+     *
+     * @type {boolean}
+     */
+    @tracked isUserTwoFaEnabled = false;
+
+    /**
+     * Flag indicating whether 2FA enforcement is required.
+     *
+     * @type {boolean}
+     */
+    @tracked isTwoFaEnforced = false;
+
+    /**
+     * Available two-factor authentication methods.
+     *
+     * @type {Array}
+     */
+    @tracked methods = getTwoFaMethods();
+
+    /**
+     * Constructor method for the ConsoleAccountAuthController.
+     *
+     * @constructor
+     */
+    constructor() {
+        super(...arguments);
+        this.loadSystemTwoFaConfig.perform();
+        this.loadCompanyTwoFaSettings.perform();
+        this.loadUserTwoFaSettings.perform();
+    }
+
+    /**
+     * Handles the event when two-factor authentication is toggled.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} enabled - Whether two-factor authentication is enabled or not.
+     */
+    @action onTwoFaToggled(enabled) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            enabled,
+        };
+    }
+
+    /**
+     * Handles the event when a two-factor authentication method is selected.
+     *
+     * @method onTwoFaMethodSelected
+     * @param {string} method - The selected two-factor authentication method.
+     */
+    @action onTwoFaMethodSelected(method) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            method,
+        };
+    }
+
+    /**
+     * Handles the event when two-factor authentication is toggled.
+     *
+     * @method onTwoFaToggled
+     * @param {boolean} enabled - Whether two-factor authentication is enforced or not.
+     */
+    @action onTwoFaEnforceToggled(enforced) {
+        this.twoFaSettings = {
+            ...this.twoFaSettings,
+            enforced,
+        };
+    }
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings asynchronously.
+     *
+     * @method saveTwoFactor
+     */
+    @action saveTwoFactor() {
+        this.saveTwoFactorSettingsForCompany.perform(this.twoFaSettings);
+    }
+
+    /**
+     * Initiates the task to load user-specific two-factor authentication settings asynchronously.
+     *
+     * @method loadUserTwoFaSettings
+     */
+    @task *loadCompanyTwoFaSettings() {
+        const twoFaSettings = yield this.fetch.get('companies/two-fa');
+        if (twoFaSettings) {
+            this.twoFaSettings = twoFaSettings;
+            this.isTwoFaEnforced = twoFaSettings.enforced;
+        }
+        return twoFaSettings;
+    }
+
+    /**
+     * Initiates the task to load system-wide two-factor authentication configuration asynchronously.
+     *
+     * @method loadSystemTwoFaConfig
+     */
+    @task *loadSystemTwoFaConfig() {
+        const twoFaConfig = yield this.fetch.get('two-fa/config');
+
+        if (twoFaConfig) {
+            this.isSystemTwoFaEnabled = twoFaConfig.enabled;
+            this.twoFaConfig = twoFaConfig;
+        }
+        return twoFaConfig;
+    }
+
+    /**
+     * Initiates the task to load user-specific two-factor authentication settings asynchronously.
+     *
+     * @method loadUserTwoFaSettings
+     */
+    @task *loadUserTwoFaSettings() {
+        const twoFaSettings = yield this.fetch.get('users/two-fa');
+        if (twoFaSettings) {
+            this.isUserTwoFaEnabled = twoFaSettings.enabled;
+            this.twoFaSettings = twoFaSettings;
+        }
+        return twoFaSettings;
+    }
+
+    /**
+     * Initiates the task to save user-specific two-factor authentication settings for the company asynchronously.
+     *
+     * @method saveTwoFactorSettingsForCompany
+     * @param {Object} twoFaSettings - User-specific two-factor authentication settings.
+     */
+    @task *saveTwoFactorSettingsForCompany(twoFaSettings = {}) {
+        yield this.fetch
+            .post('companies/two-fa', { twoFaSettings })
+            .then(() => {
+                this.notifications.success('2FA Settings saved for organization successfully.');
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            });
+    }
+}

console/app/controllers/install.js

@@ -7,6 +7,7 @@ import { task } from 'ember-concurrency-decorators';
 export default class InstallController extends Controller {
     @service fetch;
     @service notifications;
+    @service router;
     @tracked error;
     @tracked steps = [
         { task: 'createdb', name: 'Create Database', status: 'pending' },
@@ -46,7 +47,7 @@ export default class InstallController extends Controller {
 
         if (isCompleted) {
             this.notifications.success('Install completed successfully!');
-            return this.transitionToRoute('onboard');
+            return this.router.transitionTo('onboard');
         }
     }
 

console/app/controllers/invite/for-user.js

@@ -8,6 +8,7 @@ export default class InviteForUserController extends Controller {
     @service session;
     @service notifications;
     @service modalsManager;
+    @service router;
     @tracked code;
     @tracked isLoading;
 
@@ -24,7 +25,7 @@ export default class InviteForUserController extends Controller {
 
                 this.isLoading = false;
 
-                return this.transitionToRoute('console').then(() => {
+                return this.router.transitionTo('console').then(() => {
                     if (response.needs_password && response.needs_password === true) {
                         this.setPassword();
                     }

console/app/controllers/onboard/index.js

@@ -21,6 +21,13 @@ export default class OnboardIndexController extends Controller {
      */
     @service session;
 
+    /**
+     * Inject the `router` service
+     *
+     * @memberof OnboardIndexController
+     */
+    @service router;
+
     /**
      * Inject the `notifications` service
      *
@@ -113,21 +120,25 @@ export default class OnboardIndexController extends Controller {
             return;
         }
 
+        // Set user timezone
+        input.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
         this.isLoading = true;
 
         return this.fetch
             .post('onboard/create-account', input)
-            .then((response) => {
-                if (response.status === 'success') {
-                    this.session.isOnboarding().manuallyAuthenticate(response.token);
+            .then(({ status, skipVerification, token, session }) => {
+                if (status === 'success') {
+                    if (skipVerification === true && token) {
+                        // only manually authenticate if skip verification
+                        this.session.isOnboarding().manuallyAuthenticate(token);
 
-                    if (response.skipVerification === true) {
-                        return this.transitionToRoute('console').then(() => {
+                        return this.router.transitionTo('console').then(() => {
                             this.notifications.success('Welcome to Fleetbase!');
                         });
                     }
 
-                    return this.transitionToRoute('onboard.verify-email', { queryParams: { hello: response.session } });
+                    return this.router.transitionTo('onboard.verify-email', { queryParams: { hello: session } });
                 }
             })
             .catch((error) => {

console/app/controllers/onboard/verify-email.js

@@ -1,125 +1,7 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
+import AuthVerificationController from '../auth/verification';
 import { action } from '@ember/object';
-import { later } from '@ember/runloop';
-import { not } from '@ember/object/computed';
-
-export default class OnboardVerifyEmailController 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;
-
-    /**
-     * The session paramerer.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked hello;
-
-    /**
-     * 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 = 800 * 60 * 2;
-
-    /**
-     * Determines if Fleetbase is still awaiting verification after a certain time.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked stillWaiting = false;
-
-    /**
-     * the input code.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked code;
-
-    /**
-     * The query param for the session token.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked queryParams = ['hello'];
-
-    /**
-     * The boolean opposite of `isReadyToSubmit`
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @not('isReadyToSubmit') isNotReadyToSubmit;
-
-    /**
-     * Creates an instance of OnboardVerifyEmailController.
-     * @memberof OnboardVerifyEmailController
-     */
-    constructor() {
-        super(...arguments);
-
-        later(
-            this,
-            () => {
-                this.stillWaiting = true;
-            },
-            this.waitTimeout
-        );
-    }
-
-    /**
-     * Validates the input
-     *
-     * @param {InputEvent} { target: { value } }
-     * @memberof OnboardVerifyEmailController
-     */
-    @action validateInput({ target: { value } }) {
-        if (value.length > 5) {
-            this.isReadyToSubmit = true;
-        } else {
-            this.isReadyToSubmit = false;
-        }
-    }
 
+export default class OnboardVerifyEmailController extends AuthVerificationController {
     /**
      * Submits to verify code.
      *
@@ -127,19 +9,24 @@ export default class OnboardVerifyEmailController extends Controller {
      * @memberof OnboardVerifyEmailController
      */
     @action verifyCode() {
-        const session = this.hello;
-        const code = this.code;
+        const { hello, code } = this;
 
         this.isLoading = true;
 
         return this.fetch
-            .post('onboard/verify-email', { session, code })
-            .then((response) => {
-                if (response.status === 'success') {
+            .post('onboard/verify-email', { session: hello, code })
+            .then(({ status, token }) => {
+                if (status === 'ok') {
                     this.notifications.success('Email successfully verified!');
-                    this.notifications.info('Welcome to Fleetbase!');
 
-                    return this.transitionToRoute('console');
+                    if (token) {
+                        this.notifications.info('Welcome to Fleetbase!');
+                        this.session.manuallyAuthenticate(token);
+
+                        return this.router.transitionTo('console');
+                    }
+
+                    return this.router.transitionTo('auth.login');
                 }
             })
             .catch((error) => {
@@ -149,46 +36,4 @@ export default class OnboardVerifyEmailController extends Controller {
                 this.isLoading = false;
             });
     }
-
-    /**
-     * 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) => {
-                modal.startLoading();
-                const phone = modal.getOption('phone');
-
-                return this.fetch.post('onboard/send-verification-sms', { phone }).then(() => {
-                    this.notifications.success('Verification code SMS sent!');
-                });
-            },
-        });
-    }
-
-    /**
-     * 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) => {
-                modal.startLoading();
-                const email = modal.getOption('email');
-
-                return this.fetch.post('onboard/send-verification-email', { email }).then(() => {
-                    this.notifications.success('Verification code email sent!');
-                });
-            },
-        });
-    }
 }

console/app/helpers/spread-widget-options.js

@@ -0,0 +1,7 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function spreadWidgetOptions([params]) {
+    const { id, options } = params;
+    const gridOptions = { id, ...options };
+    return gridOptions;
+});

console/app/initializers/load-socketcluster-client.js

@@ -1,7 +1,12 @@
 export function initialize() {
-    const socketClusterClientScript = document.createElement('script');
-    socketClusterClientScript.src = '/assets/socketcluster-client.min.js';
-    document.body.appendChild(socketClusterClientScript);
+    // Check if the script already exists
+    // Only insert the script tag if it doesn't already exist
+    if (!document.querySelector('script[data-socketcluster-client]')) {
+        const socketClusterClientScript = document.createElement('script');
+        socketClusterClientScript.setAttribute('data-socketcluster-client', '1');
+        socketClusterClientScript.src = '/assets/socketcluster-client.min.js';
+        document.body.appendChild(socketClusterClientScript);
+    }
 }
 
 export default {

console/app/instance-initializers/initialize-widgets.js

@@ -0,0 +1,36 @@
+import { faGithub } from '@fortawesome/free-brands-svg-icons';
+
+export function initialize(application) {
+    const universe = application.lookup('service:universe');
+    const defaultWidgets = [
+        {
+            widgetId: 'fleetbase-blog',
+            name: 'Fleetbase Blog',
+            description: 'Lists latest news and events from the Fleetbase official team.',
+            icon: 'newspaper',
+            component: 'fleetbase-blog',
+            grid_options: { w: 8, h: 9, minW: 8, minH: 9 },
+            options: {
+                title: 'Fleetbase Blog',
+            },
+        },
+        {
+            widgetId: 'fleetbase-github-card',
+            name: 'Github Card',
+            description: 'Displays current Github stats from the official Fleetbase repo.',
+            icon: faGithub,
+            component: 'github-card',
+            grid_options: { w: 4, h: 8, minW: 4, minH: 8 },
+            options: {
+                title: 'Github Card',
+            },
+        },
+    ];
+
+    universe.registerDefaultDashboardWidgets(defaultWidgets);
+    universe.registerDashboardWidgets(defaultWidgets);
+}
+
+export default {
+    initialize,
+};

console/app/instance-initializers/register-app-version.js

@@ -0,0 +1,21 @@
+import config from 'ember-get-config';
+
+export function initialize(owner) {
+    const universe = owner.lookup('service:universe');
+
+    if (universe) {
+        universe.registerOrganizationMenuItem(`v${config.version}`, {
+            index: 4,
+            route: null,
+            icon: 'code-branch',
+            iconSize: 'xs',
+            iconClass: 'mr-1.5',
+            wrapperClass: 'app-version-in-nav',
+            overwriteWrapperClass: true,
+        });
+    }
+}
+
+export default {
+    initialize,
+};

console/app/models/category.js

@@ -29,6 +29,7 @@ export default class CategoryModel extends Model {
     @attr('string') slug;
     @attr('string') order;
     @attr('raw') translations;
+    @attr('raw') meta;
 
     /** @dates */
     @attr('date') deleted_at;

console/app/models/chat-attachment.js

@@ -0,0 +1,84 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { getOwner } from '@ember/application';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+import isVideoFile from '@fleetbase/ember-core/utils/is-video-file';
+import isImageFile from '@fleetbase/ember-core/utils/is-image-file';
+
+export default class ChatAttachment extends Model {
+    /** @ids */
+    @attr('string') chat_channel_uuid;
+    @attr('string') sender_uuid;
+    @attr('string') file_uuid;
+    @attr('string') chat_message_uuid;
+
+    /** @relationships */
+    @belongsTo('user', { async: true }) sender;
+    @belongsTo('chat-channel', { async: true }) chatChannel;
+    @belongsTo('file', { async: true }) file;
+
+    /** @attributes */
+    @attr('string') chat_channel_uuid;
+    @attr('string') sender_uuid;
+    @attr('string') file_uuid;
+    @attr('string') url;
+    @attr('string') filename;
+    @attr('string') content_type;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+
+    @computed('content_type') get isVideo() {
+        return isVideoFile(this.content_type);
+    }
+
+    @computed('content_type') get isImage() {
+        return isImageFile(this.content_type);
+    }
+
+    /** @methods */
+    downloadFromApi() {
+        window.open(ENV.api.host + '/' + ENV.api.namespace + '/files/download?file=' + this.file_uuid, '_self');
+    }
+
+    download() {
+        const owner = getOwner(this);
+        const fetch = owner.lookup('service:fetch');
+
+        return fetch.download('files/download', { file: this.file_uuid }, { fileName: this.filename, mimeType: this.content_type });
+    }
+}

console/app/models/chat-channel.js

@@ -0,0 +1,87 @@
+import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { getOwner } from '@ember/application';
+import { format, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+
+export default class ChatChannelModel extends Model {
+    /** @ids */
+    @attr('string') public_id;
+    @attr('string') company_uuid;
+    @attr('string') created_by_uuid;
+
+    /** @attributes */
+    @attr('string') name;
+    @attr('string') title;
+    @attr('number') unread_count;
+    @attr('string') slug;
+    @attr('array') feed;
+    @attr('array') meta;
+
+    /** @relationships */
+    @hasMany('chat-participant', { async: false }) participants;
+    @belongsTo('chat-message', { async: false }) last_message;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+
+    /** @methods */
+    toJSON() {
+        return {
+            company_uuid: this.company_uuid,
+            name: this.name,
+            meta: this.meta,
+        };
+    }
+
+    reloadParticipants() {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+
+        return store.query('chat-participant', { chat_channel_uuid: this.id }).then((participants) => {
+            this.set('participants', participants);
+            return participants;
+        });
+    }
+
+    existsInFeed(type, record) {
+        return this.feed.find((_) => _.type === type && _.record.id === record.id) !== undefined;
+    }
+
+    doesntExistsInFeed(type, record) {
+        return this.feed.find((_) => _.type === type && _.record.id === record.id) === undefined;
+    }
+}

console/app/models/chat-log.js

@@ -0,0 +1,54 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+
+export default class ChatLogModel extends Model {
+    /** @ids */
+    @attr('string') company_uuid;
+    @attr('string') chat_channel_uuid;
+    @attr('string') initiator_uuid;
+
+    /** @attributes */
+    @attr('string') content;
+    @attr('string') resolved_content;
+    @attr('string') event_type;
+    @attr('string') status;
+    @attr('array') meta;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at, { addSuffix: true });
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at, { addSuffix: true });
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+}

console/app/models/chat-message.js

@@ -0,0 +1,64 @@
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+
+export default class ChatMessage extends Model {
+    /** @ids */
+    @attr('string') chat_channel_uuid;
+    @attr('string') sender_uuid;
+
+    /** @attributes */
+    @attr('string') content;
+    @attr('array') attachment_files;
+
+    /** @relationships */
+    @belongsTo('chat-participant', { async: false }) sender;
+    @hasMany('chat-attachment', { async: false }) attachments;
+    @hasMany('chat-receipt', { async: false }) receipts;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at, { addSuffix: true });
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at, { addSuffix: true });
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+
+    /** @methods */
+    hasReadReceipt(chatParticipant) {
+        return chatParticipant && this.receipts.find((receipt) => chatParticipant.id === receipt.participant_uuid) !== undefined;
+    }
+
+    doesntHaveReadReceipt(chatParticipant) {
+        return !this.hasReadReceipt(chatParticipant);
+    }
+}

console/app/models/chat-participant.js

@@ -0,0 +1,75 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+
+export default class ChatParticipant extends Model {
+    /** @ids */
+    @attr('string') user_uuid;
+    @attr('string') chat_channel_uuid;
+
+    /** @attributes */
+    @attr('string') name;
+    @attr('string') username;
+    @attr('string') phone;
+    @attr('string') email;
+    @attr('string') avatar_url;
+    @attr('boolean') is_online;
+
+    /** @relationships */
+    @belongsTo('user', { async: true }) user;
+    @belongsTo('chat-channel', { async: true }) chatChannel;
+
+    /** @dates */
+    @attr('date') last_seen_at;
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+
+    @computed('last_seen_at') get lastSeenAgo() {
+        if (!isValidDate(this.last_seen_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.last_seen_at);
+    }
+
+    @computed('last_seen_at') get lastSeenAt() {
+        if (!isValidDate(this.last_seen_at)) {
+            return null;
+        }
+
+        return formatDate(this.last_seen_at, 'PP HH:mm');
+    }
+}

console/app/models/chat-receipt.js

@@ -0,0 +1,70 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format as formatDate, formatDistanceToNow, isValid as isValidDate } from 'date-fns';
+
+export default class ChatReceipt extends Model {
+    /** @ids */
+    @attr('string') participant_uuid;
+    @attr('string') chat_message_uuid;
+
+    /** @relationships */
+    @belongsTo('chat-participant', { async: true }) participant;
+    @belongsTo('chat-message', { async: true }) chatMessage;
+
+    /** @attributes */
+    @attr('string') participant_name;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+    @attr('date') read_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.updated_at, { addSuffix: true });
+    }
+
+    @computed('updated_at') get updatedAt() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+
+        return formatDate(this.updated_at, 'PP HH:mm');
+    }
+
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.created_at, { addSuffix: true });
+    }
+
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+
+        return formatDate(this.created_at, 'PP HH:mm');
+    }
+
+    @computed('read_at') get readAgo() {
+        if (!isValidDate(this.read_at)) {
+            return null;
+        }
+
+        return formatDistanceToNow(this.read_at, { addSuffix: true });
+    }
+
+    @computed('read_at') get readAt() {
+        if (!isValidDate(this.read_at)) {
+            return null;
+        }
+
+        return formatDate(this.read_at, 'PP HH:mm');
+    }
+}

console/app/models/comment.js

@@ -0,0 +1,44 @@
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow } from 'date-fns';
+
+export default class CommentModel extends Model {
+    /** @ids */
+    @attr('string') company_uuid;
+    @attr('string') parent_comment_uuid;
+    @attr('string') subject_uuid;
+    @attr('string') subject_type;
+
+    /** @relationships */
+    @belongsTo('user') author;
+    @belongsTo('comment', { inverse: 'replies' }) parent;
+    @hasMany('comment', { inverse: 'parent' }) replies;
+
+    /** @attributes */
+    @attr('string') content;
+    @attr('boolean') editable;
+    @attr('raw') tags;
+    @attr('raw') meta;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+    @attr('date') deleted_at;
+
+    /** @computed */
+    @computed('created_at') get createdAgo() {
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        return format(this.created_at, 'PPP p');
+    }
+
+    @computed('updated_at') get updatedAgo() {
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        return format(this.updated_at, 'PPP p');
+    }
+}

console/app/models/company.js

@@ -13,6 +13,7 @@ export default class Company extends Model {
     @attr('string') place_uuid;
 
     /** @relationships */
+    @belongsTo('user') owner;
     @belongsTo('file') logo;
     @belongsTo('file') backdrop;
 
@@ -23,6 +24,7 @@ export default class Company extends Model {
     @attr('string') backdrop_url;
     @attr('string') description;
     @attr('raw') options;
+    @attr('number') users_count;
     @attr('string') type;
     @attr('string') currency;
     @attr('string') country;

console/app/models/custom-field-value.js

@@ -0,0 +1,54 @@
+import Model, { attr } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { getOwner } from '@ember/application';
+import { format, formatDistanceToNow } from 'date-fns';
+
+function isValidFileObjectJson(str) {
+    return typeof str === 'string' && str.startsWith('{') && str.endsWith('}');
+}
+
+export default class CustomFieldValueModel extends Model {
+    /** @ids */
+    @attr('string') company_uuid;
+    @attr('string') custom_field_uuid;
+    @attr('string') subject_uuid;
+    @attr('string') subject_type;
+
+    /** @attributes */
+    @attr('string') value;
+    @attr('string') value_type;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+    @attr('date') deleted_at;
+
+    /** @computed */
+    @computed('value') get asFile() {
+        const owner = getOwner(this);
+        const fetch = owner.lookup(`service:fetch`);
+        const value = this.value;
+        if (!isValidFileObjectJson(value)) {
+            return null;
+        }
+
+        const fileModel = fetch.jsonToModel(value, 'file');
+        return fileModel;
+    }
+
+    @computed('created_at') get createdAgo() {
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        return format(this.created_at, 'PPP p');
+    }
+
+    @computed('updated_at') get updatedAgo() {
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        return format(this.updated_at, 'PPP p');
+    }
+}

console/app/models/custom-field.js

@@ -0,0 +1,48 @@
+import Model, { attr } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow } from 'date-fns';
+
+export default class CustomFieldModel extends Model {
+    /** @ids */
+    @attr('string') company_uuid;
+    @attr('string') category_uuid;
+    @attr('string') subject_uuid;
+    @attr('string') subject_type;
+
+    /** @attributes */
+    @attr('string') name;
+    @attr('string') description;
+    @attr('string') help_text;
+    @attr('string') label;
+    @attr('string') type;
+    @attr('string') component;
+    @attr('string') default_value;
+    @attr('number') order;
+    @attr('boolean') required;
+    @attr('boolean', { defaultValue: true }) editable;
+    @attr('raw') options;
+    @attr('raw') validation_rules;
+    @attr('raw') meta;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+    @attr('date') deleted_at;
+
+    /** @computed */
+    @computed('created_at') get createdAgo() {
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        return format(this.created_at, 'PPP p');
+    }
+
+    @computed('updated_at') get updatedAgo() {
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        return format(this.updated_at, 'PPP p');
+    }
+}

console/app/models/dashboard-widget.js

@@ -0,0 +1,58 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow } from 'date-fns';
+
+export default class DashboardWidgetModel extends Model {
+    /** @ids */
+    @attr('string') dashboard_uuid;
+
+    /** @relationships */
+    @belongsTo('dashboard') dashboard;
+
+    /** @attributes */
+    @attr('string') name;
+    @attr('string') component;
+    @attr('object') grid_options;
+    @attr('object') options;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        return format(this.updated_at, 'PPP p');
+    }
+
+    @computed('updated_at') get updatedAtShort() {
+        return format(this.updated_at, 'PP');
+    }
+
+    @computed('created_at') get createdAgo() {
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        return format(this.created_at, 'PPP p');
+    }
+
+    @computed('created_at') get createdAtShort() {
+        return format(this.created_at, 'PP');
+    }
+
+    /**
+     * Update the dashboard widget properties on the server
+     *
+     * @param {Object} [properties={}]
+     * @return {Promise<DashboardWidgetModel>}
+     * @memberof DashboardWidgetModel
+     */
+    updateProperties(properties = {}) {
+        this.setProperties(properties);
+        return this.save();
+    }
+}

console/app/models/dashboard.js

@@ -0,0 +1,86 @@
+import Model, { attr, hasMany } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format, formatDistanceToNow } from 'date-fns';
+import { getOwner } from '@ember/application';
+
+export default class DashboardModel extends Model {
+    /** @ids */
+    @attr('string') company_uuid;
+    @attr('string') user_uuid;
+
+    /** @relationships */
+    @hasMany('dashboard-widget', { async: false }) widgets;
+
+    /** @attributes */
+    @attr('string') name;
+    @attr('boolean') is_default;
+
+    /** @dates */
+    @attr('date') created_at;
+    @attr('date') updated_at;
+
+    /** @computed */
+    @computed('updated_at') get updatedAgo() {
+        return formatDistanceToNow(this.updated_at);
+    }
+
+    @computed('updated_at') get updatedAt() {
+        return format(this.updated_at, 'PPP p');
+    }
+
+    @computed('updated_at') get updatedAtShort() {
+        return format(this.updated_at, 'PP');
+    }
+
+    @computed('created_at') get createdAgo() {
+        return formatDistanceToNow(this.created_at);
+    }
+
+    @computed('created_at') get createdAt() {
+        return format(this.created_at, 'PPP p');
+    }
+
+    @computed('created_at') get createdAtShort() {
+        return format(this.created_at, 'PP');
+    }
+
+    /** @methods */
+    addWidget(widget) {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+        const widgetRecord = store.createRecord('dashboard-widget', { ...widget, dashboard: this });
+
+        return new Promise((resolve, reject) => {
+            widgetRecord
+                .save()
+                .then((widgetRecord) => {
+                    this.widgets.pushObject(widgetRecord);
+                    resolve(widgetRecord);
+                })
+                .catch((error) => {
+                    store.unloadRecord(widgetRecord);
+                    reject(error);
+                });
+        });
+    }
+
+    removeWidget(widget) {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+        const widgetRecord = store.peekRecord('dashboard-widget', widget);
+
+        if (widgetRecord) {
+            return new Promise((resolve, reject) => {
+                widgetRecord
+                    .destroyRecord()
+                    .then(() => {
+                        this.widgets.removeObject(widgetRecord);
+                        resolve();
+                    })
+                    .catch((error) => {
+                        reject(error);
+                    });
+            });
+        }
+    }
+}