Patches branding configuration and user/company creation timestamp issue

v0.1.8

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: fleetbase

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/📚-docs-feedback.md

@@ -0,0 +1,17 @@
+---
+name: "\U0001F4DA Docs Feedback"
+about: Improve Fleetbase Documentation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the improvement**
+A clear and concise description of documentation improvement .
+
+**Related Page**
+Which section and page is this improvement related to? .
+
+**Additional context**
+Add any other context about the improvement here.

.github/ISSUE_TEMPLATE/🚀-feature-request.md

@@ -0,0 +1,20 @@
+---
+name: "\U0001F680 Feature request"
+about: Submit a proposal for a new feature
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/🪲bug-report.md

@@ -0,0 +1,41 @@
+---
+name: "\U0001FAB2Bug Report"
+about: Report a bug to help us improve.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs (if relevant)**
+Any log relevant log messages or snippets
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/cd.yml

@@ -0,0 +1,163 @@
+name: Fleetbase CI/CD
+
+on:
+  push:
+    branches: [ "deploy/*" ]
+
+concurrency:
+    group: ${{ github.ref }}
+    cancel-in-progress: true
+
+env:
+  PROJECT: ${{ secrets.PROJECT }}
+
+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@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: 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 }}
+        CACHE: type=gha
+      with:
+        push: true
+        files: |
+          ./docker-bake.hcl
+
+    - 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: |-
+          set -eu
+          # run deploy.sh script before deployments
+          env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ./ecs-tool run -l "ecs-tool" --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} --task_definition ${{ env.PROJECT }}-${{ env.STACK }}-app --container_name app ./deploy.sh
+          ./ecs-tool deploy --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} -s app -s scheduler -s events
+
+  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: 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: |
+          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
+      run: |
+        set -eu
+
+        pnpm build
+      working-directory: ./console
+    
+    - name: Deploy Console 🚀
+      run: |
+          DEPLOY_BUCKET=${{ env.PROJECT }}-${{ env.STACK }}
+          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/ci.yml

@@ -15,16 +15,23 @@ jobs:
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: recursive
 
-    - name: Install Docker Compose
-      run: |
-        sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-        sudo chmod +x /usr/local/bin/docker-compose
-        docker-compose --version
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
-    - name: Build and Start Docker Services
+    - name: Prepare Composer Auth Secret
       run: |
-        docker-compose up -d --build
+        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
+      with:
+        files: |
+          ./docker-bake.hcl

.github/workflows/cloud.yml

@@ -0,0 +1,18 @@
+name: "Close Invalid PRs"
+on:
+  pull_request:
+    branches:
+      - cloud
+
+jobs:
+  close_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close invalid PRs
+        run: |
+          if [[ "${{ github.event.pull_request.head.ref }}" != "main" ]] && [[ "${{ github.event.pull_request.head.ref }}" != "dev-cloud" ]]; then
+            echo "This PR is from '${{ github.event.pull_request.head.ref }}', but only PRs from 'main' or 'dev-cloud' are allowed. Closing PR."
+            gh pr close ${{ github.event.pull_request.number }} --repo ${{ github.repository }}
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/discord_announcement.yml

@@ -0,0 +1,48 @@
+name: Discord Announcement
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  discord_announcement:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Get tag message
+        id: tag
+        run: |
+          echo "::set-output name=version::$(git describe --tags --abbrev=0)"
+          if [[ "${ACT}" == "true" ]]; then
+            # If running with act, use an environment variable for the tag message
+            echo "::set-output name=message::$(echo -e "${TAG_MESSAGE}" | base64)"
+          else
+            # If running on GitHub, use git to get the tag message
+            echo "::set-output name=message::$(git tag -l --format='%(contents)' $(git describe --tags --abbrev=0) | base64)"
+          fi
+
+      - name: Print tag message
+        run: echo "${{ steps.tag.outputs.message }}"
+      
+      - name: Get tag name
+        id: get_tag
+        run: echo "::set-output name=tag::${GITHUB_REF/refs\/tags\//}"
+
+      - name: Decode message
+        id: decode
+        run: |
+          echo "Decoding message..."
+          echo "::set-output name=message::$(echo '${{ steps.tag.outputs.message }}' | base64 --decode)"
+
+      - name: Send message to Discord
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: "@everyone \n📦 New Fleetbase Version ${{ steps.get_tag.outputs.tag }} Released!\n${{ steps.decode.outputs.message }} \nVersion: ${{ steps.get_tag.outputs.tag }} \n[Release Notes for ${{ steps.get_tag.outputs.tag }}](https://github.com/fleetbase/fleetbase/releases/tag/${{ steps.get_tag.outputs.tag }})"
+          username: Fleetbase

.gitignore

@@ -11,4 +11,10 @@ api/public/storage
 api/storage/*.key
 api/storage/uploads
 api/storage/public
-api/vendor
+api/vendor
+act.sh
+composer-auth.json
+packages/billing-api
+packages/billing-engine
+docker/database/*
+docker/database/mysql/*

.gitmodules

@@ -1,40 +1,41 @@
 [submodule "console"]
 	path = console
 	url = git@github.com:fleetbase/console.git
+	branch = main
 [submodule "packages/core-api"]
 	path = packages/core-api
 	url = git@github.com:fleetbase/core-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetops-api"]
 	path = packages/fleetops-api
 	url = git@github.com:fleetbase/fleetops-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/ember-core"]
 	path = packages/ember-core
 	url = git@github.com:fleetbase/ember-core.git
-	branch = dev-main
+	branch = main
 [submodule "packages/ember-ui"]
 	path = packages/ember-ui
 	url = git@github.com:fleetbase/ember-ui.git
-	branch = dev-main
+	branch = main
 [submodule "packages/storefront-engine"]
 	path = packages/storefront-engine
 	url = git@github.com:fleetbase/storefront-engine.git
-	branch = dev-main
+	branch = main
 [submodule "packages/iam-engine"]
 	path = packages/iam-engine
 	url = git@github.com:fleetbase/iam-engine.git
 [submodule "packages/dev-engine"]
 	path = packages/dev-engine
 	url = git@github.com:fleetbase/dev-engine.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetbase-extensions-indexer"]
 	path = packages/fleetbase-extensions-indexer
 	url = git@github.com:fleetbase/fleetbase-extensions-indexer.git
 [submodule "packages/fleetops-engine"]
 	path = packages/fleetops-engine
 	url = git@github.com:fleetbase/fleetops-engine.git
-	branch = dev-main
+	branch = main
 [submodule "docs/guides"]
 	path = docs/guides
 	url = git@github.com:fleetbase/guides.git
@@ -44,12 +45,20 @@
 [submodule "packages/storefront-api"]
 	path = packages/storefront-api
 	url = git@github.com:fleetbase/storefront-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetops-data"]
 	path = packages/fleetops-data
 	url = git@github.com:fleetbase/fleetops-data.git
-	branch = dev-main
+	branch = main
 [submodule "socket"]
 	path = socket
 	url = git@github.com:fleetbase/socket.git
-	branch = dev-main
+	branch = main
+[submodule "packages/pallet-api"]
+	path = packages/pallet-api
+	url = git@github.com:fleetbase/pallet-api.git
+	branch = main
+[submodule "packages/pallet-engine"]
+	path = packages/pallet-engine
+	url = git@github.com:fleetbase/pallet-engine.git
+	branch = main

.s3deploy.yml

@@ -0,0 +1,13 @@
+routes:
+  - route: "^.+\\.(js|css|svg|ttf)$"
+    headers:
+      Cache-Control: "max-age=600, no-transform, public"
+    gzip: true
+  - route: "^.+\\.(png|jpg)$"
+    headers:
+      Cache-Control: "max-age=600, no-transform, public"
+    gzip: false
+  - route: "^.+\\.(html|xml|json)$"
+    headers:
+      Cache-Control: "public, max-age=0, must-revalidate"
+    gzip: true

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+hello@fleetbase.io.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing to Fleetbase
+We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
+
+- Reporting a bug
+- Discussing the current state of the code
+- Submitting a fix
+- Proposing new features
+- Becoming a maintainer
+
+## We Develop with Github
+We use github to host code, to track issues and feature requests, as well as accept pull requests.
+
+## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
+Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
+
+1. Fork the repo and create your branch from `master`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. Issue that pull request!
+
+## Any contributions you make will be under the MIT Software License
+In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
+
+## Report bugs using Github's [issues](https://github.com/fleetbase/fleetbase/issues)
+We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/fleetbase/fleetbase/issues), it's that easy!
+
+## Write bug reports with detail, background, and sample code
+
+**Great Bug Reports** tend to have:
+
+- A quick summary and/or background
+- Steps to reproduce
+  - Be specific!
+  - Give sample code if you can. 
+- What you expected would happen
+- What actually happens
+- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
+
+People *love* thorough bug reports. I'm not even kidding.
+
+## License
+By contributing, you agree that your contributions will be licensed under its MIT License.
+
+## References
+This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md)

LICENSE

@@ -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.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+### What change does this PR introduce?
+
+<!-- Explain here the changes your PR introduces and text to help us understand the context of this change. -->
+
+### Why was this change needed?
+
+<!-- If your PR fixes an open issue, use `Closes #999` to link your PR with the issue. #999 stands for the issue number you are fixing, Example: Closes #31 -->
+
+### Other information (Screenshots)
+
+<!-- Add notes or any other information here -->
+<!-- Also add all the screenshots which support your changes -->

README.md

@@ -5,33 +5,44 @@
       </a>
     </p>
     <p align="center" dir="auto">
-      Open Source Logistics & Supply Chain Platform and Infrastructure
+      Open Source Modular Logistics Platform
       <br>
-      <a href="https://docs.fleetbase.dev/api" rel="nofollow">Fleetbase Documentation →</a>
+      <a href="https://fleetbase.github.io/guides" rel="nofollow">Fleetbase Documentation →</a>
       <br>
       <br>
       <a href="https://github.com/fleetbase/fleetbase/issues">Report an Issue</a>
       ·
-      <a href="https://fleetbase.dev/api">API Reference</a>
+      <a href="https://fleetbase.github.io/api-reference">API Reference</a>
       ·
-      <a href="https://github.com/fleetbase/guides">Guides</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://fleetbase.apichecker.com" target="_api_status" rel="nofollow">API Status</a>
+      ·
+      <a href="https://discord.gg/V7RVWRQ2Wm" target="discord" rel="nofollow">Discord</a>
     </p>
     <hr />
 </div>
 
 # ⭐️ Overview
 
-Fleetbase is a comprehensive, open-source platform for the management and orchestration of logistics and supply chain operations. This dual-natured platform serves not only as an efficient operational tool for companies within these industries but also as a robust foundational layer for developers. Its versatility emanates from its core, which is skillfully constructed around a series of "extensions," creating a flexible and customizable framework that accommodates a wide spectrum of supply chain and logistics requirements.
+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.
 
-Every individual extension within Fleetbase is purposefully engineered to fulfill specific roles within the expansive ecosystem of supply chain and logistics. With inherent extensibility users have the freedom to craft their own extensions, thereby expanding the ecosystem and ensuring the platform's adaptability across a multitude of use cases. This extensible nature ensures that Fleetbase remains at the forefront of meeting diverse logistical and supply chain needs now and into the future.
+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.
 
 <p align="center" dir="auto">
-      <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/github/dark-light-layered-screenshots.png" alt="Fleetbase Console" width="600" style="max-width: 100%;" />
-    </p>
+  <img src="https://github.com/fleetbase/fleetbase/assets/816371/deef79fa-e30c-4ce9-8a04-0dee990ffd9d" alt="Fleetbase Console" width="600" 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>
+  
 
 # 📖 Table of contents
 
@@ -41,6 +52,7 @@ Every individual extension within Fleetbase is purposefully engineered to fulfil
   - [Installation](#-installation)
   - [Extensions](#-extensions)
   - [Apps](#-apps)
+  - [Roadmap](#-roadmap)
   - [Bugs and Feature Requests](#-bugs-and--feature-requests)
   - [Documentation](#-documentation)
   - [Contributing](#-contributing)
@@ -54,10 +66,10 @@ Fleetbase is more than just a platform; it's a versatile ecosystem carefully arc
 
 <ul>
   <li>
-    <strong>Console</strong>: Fleetbase's frontend console is constructed using Ember.js and Ember Engines, providing a highly modular and extensible design. This not only enables the system to adapt and scale to your growing requirements but also simplifies the process of integrating new extensions. With the console's design, extensions can be easily installed using their respective package managers, thereby reducing complexity and time spent on integration.
+    <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, developed using the reliable Laravel framework, is thoughtfully designed with extension development and integration in mind. This robust and flexible infrastructure not only manages intricate data structures and transactions with grace but also facilitates the easy incorporation of new extensions via package managers. We provide additional packages that allow developers to craft their unique extensions, further enhancing the flexibility and extensibility of the Fleetbase ecosystem.
+    <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
@@ -161,12 +173,16 @@ Getting Fleetbase up and running on your system using Docker and Docker-compose
   </li>
   <li>
     Clone the Fleetbase repository to your local machine:
-    <pre>bash git clone https://github.com/fleetbase/fleetbase.git</pre>
+    <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
@@ -175,7 +191,7 @@ Getting Fleetbase up and running on your system using Docker and Docker-compose
   <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>sudo systemctl start docker</pre>
+    <pre>service docker start</pre>
   </li>
   <li>
     <strong>Build the Docker containers:</strong>
@@ -184,6 +200,36 @@ Use Docker Compose to build and run the necessary containers. In the root direct
   </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:
@@ -202,18 +248,18 @@ Fleetbase Extensions are built using both a backend PHP package and a frontend E
 
 ### 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 `fleetbase/core-api`, which provides core API functionalities, making it easier to integrate your extension with Fleetbase's backend.</li>
+  <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 `@fleetbase/ember-core` and `@fleetbase/ember-ui`. The `@fleetbase/ember-core` package provides core services and utilities that help to align your extension with Fleetbase's frontend. The `@fleetbase/ember-ui` 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>
+  <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 `fleetbase/core-api` to ensure smooth integration with Fleetbase's backend.</li>
+  <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 `@fleetbase/ember-core` and `@fleetbase/ember-ui` packages. These packages provide necessary services, utilities, and design components for aligning your extension with Fleetbase's UI.</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>
@@ -232,8 +278,10 @@ Fleetbase offers a few open sourced apps which are built on Fleetbase which can
 # 🛣 Roadmap
 
 <ol>
-  <li>Install Flow & System Configuration from Console</li>
   <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>
@@ -248,11 +296,11 @@ View and contribute to our <a href="https://github.com/fleetbase/guides">Fleetba
 
 # 👨‍💻 Contributing
 
-Please read through our <a href="https://github.com/fleetbase/fleetbase/blob/main/.github/CONTRIBUTING.md">contributing guidelines</a>. Included are directions for opening issues, coding standards, and notes on development.
+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
 
-Get updates on Fleetbase's development and chat with the project maintainers and community members.
+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>.
 
 <ul>
   <li>Follow <a href="https://twitter.com/fleetbase_io">@fleetbase_io on Twitter</a>.</li>

SECURITY.md

@@ -0,0 +1,39 @@
+Contact: hello@fleetbase.io
+
+Based on: https://supabase.com/.well-known/security.txt
+
+
+At Fleetbase, we consider the security of our systems a top priority. But no matter how much effort we put into system security, there can still be vulnerabilities present.
+
+If you discover a vulnerability, we would like to know about it so we can take steps to address it as quickly as possible. We would like to ask you to help us better protect our clients and our systems.
+
+Out of scope vulnerabilities:
+
+- Clickjacking on pages with no sensitive actions.
+- Unauthenticated/logout/login CSRF.
+- Attacks requiring MITM or physical access to a user's device.
+- Any activity that could lead to the disruption of our service (DoS).
+- Content spoofing and text injection issues without showing an attack vector/without being able to modify HTML/CSS.
+- Email spoofing
+- Missing DNSSEC, CAA, CSP headers
+- Lack of Secure or HTTP only flag on non-sensitive cookies
+- Deadlinks
+
+Please do the following:
+
+- E-mail your findings to hello@fleetbase.io. 
+- Do not run automated scanners on our infrastructure or dashboard. If you wish to do this, contact us and we will set up a sandbox for you. 
+- Do not take advantage of the vulnerability or problem you have discovered, for example by downloading more data than necessary to demonstrate the vulnerability or deleting or modifying other people's data,
+- Do not reveal the problem to others until it has been resolved,
+- Do not use attacks on physical security, social engineering, distributed denial of service, spam or applications of third parties, and
+- Do provide sufficient information to reproduce the problem, so we will be able to resolve it as quickly as possible. Usually, the IP address or the URL of the affected system and a description of the vulnerability will be sufficient, but complex vulnerabilities may require further explanation.
+
+What we promise:
+
+- We will respond to your report within 3 business days with our evaluation of the report and an expected resolution date,
+- If you have followed the instructions above, we will not take any legal action against you in regard to the report,
+- We will handle your report with strict confidentiality, and not pass on your personal details to third parties without your permission,
+- We will keep you informed of the progress towards resolving the problem,
+- In the public information concerning the problem reported, we will give your name as the discoverer of the problem (unless you desire otherwise), and
+
+We strive to resolve all problems as quickly as possible, and we would like to play an active role in the ultimate publication on the problem after it is resolved.

api/app/Exceptions/Handler.php

@@ -2,20 +2,10 @@
 
 namespace App\Exceptions;
 
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Throwable;
+use Fleetbase\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array<int, class-string<Throwable>>
-     */
-    protected $dontReport = [
-        //
-    ];
-
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
@@ -26,16 +16,4 @@ class Handler extends ExceptionHandler
         'password',
         'password_confirmation',
     ];
-
-    /**
-     * Register the exception handling callbacks for the application.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->reportable(function (Throwable $e) {
-            //
-        });
-    }
 }

api/app/Http/Middleware/Authenticate.php

@@ -14,8 +14,6 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
-            return route('login');
-        }
+        return response()->error('Unauthenticated.');
     }
 }

api/composer-install-dev.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -f composer.lock ]; then
+    rm composer.lock
+fi
+
+mv composer.json composer.prod.json && cp composer.dev.json composer.json && composer install && mv composer.prod.json composer.json

api/composer.dev.json

@@ -0,0 +1,89 @@
+{
+    "name": "laravel/laravel",
+    "type": "project",
+    "description": "The Laravel Framework.",
+    "keywords": ["framework", "laravel"],
+    "license": "MIT",
+    "require": {
+        "php": "^7.3|^8.0",
+        "fleetbase/core-api": "^1.2.7",
+        "fleetbase/fleetops-api": "^1.1.5",
+        "fleetbase/storefront-api": "^1.1.2",
+        "fleetbase/pallet-api": "^0.0.1",
+        "fruitcake/laravel-cors": "^2.0",
+        "guzzlehttp/guzzle": "^7.0.1",
+        "laravel/framework": "^8.75",
+        "laravel/sanctum": "^2.11",
+        "laravel/tinker": "^2.5",
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "maatwebsite/excel": "^3.1",
+        "phpoffice/phpspreadsheet": "^1.28",
+        "predis/predis": "^2.1",
+        "psr/http-factory-implementation": "*"
+    },
+    "require-dev": {
+        "facade/ignition": "^2.5",
+        "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"
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../packages/core-api"
+        },
+        {
+            "type": "path",
+            "url": "../packages/fleetops-api"
+        },
+        {
+            "type": "path",
+            "url": "../packages/storefront-api"
+        },
+        {
+            "type": "path",
+            "url": "../packages/pallet-api"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "post-autoload-dump": ["Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi"],
+        "post-update-cmd": ["@php artisan vendor:publish --tag=laravel-assets --ansi --force"],
+        "post-root-package-install": ["@php -r \"file_exists('.env') || copy('.env.example', '.env');\""],
+        "post-create-project-cmd": ["@php artisan key:generate --ansi"],
+        "clear-logs": ["rm -rf storage/logs/*.log", "composer dump-autoload", "chmod -R 777 storage", "chmod -R 777 bootstrap/cache", "chmod -R 777 resources"],
+        "clean-logs": ["composer run-script clear-logs"],
+        "dock": ["docker exec -it fleetbase_os_application_1 /usr/bin/tmux -u new"],
+        "dock-server": ["docker exec -it fleetbase_os_httpd_1 /bin/sh"],
+        "tunnel": ["ngrok http --region=ap --hostname=fleetbase.ap.ngrok.io 8000"]
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

api/composer.json

@@ -2,13 +2,16 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+    "keywords": [
+        "framework",
+        "laravel"
+    ],
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.0.8-alpha",
-        "fleetbase/fleetops-api": "^1.0.2-alpha",
-        "fleetbase/storefront-api": "^1.0.2-alpha",
+        "fleetbase/core-api": "^1.2.7",
+        "fleetbase/fleetops-api": "^1.1.5",
+        "fleetbase/storefront-api": "^1.1.2",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^8.75",
@@ -18,8 +21,7 @@
         "maatwebsite/excel": "^3.1",
         "phpoffice/phpspreadsheet": "^1.28",
         "predis/predis": "^2.1",
-        "psr/http-factory-implementation": "*",
-        "textalk/websocket": "^1.6"
+        "psr/http-factory-implementation": "*"
     },
     "require-dev": {
         "facade/ignition": "^2.5",

api/config/app.php

@@ -165,7 +165,7 @@ return [
         /*
          * Package Service Providers...
          */
-
+        
         /*
          * Application Service Providers...
          */

api/config/broadcasting.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('BROADCAST_DRIVER', 'null'),
+    'default' => env('BROADCAST_DRIVER', 'socketcluster'),
 
     /*
     |--------------------------------------------------------------------------

api/config/cache.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

api/config/cors.php

@@ -19,7 +19,7 @@ return [
 
     'allowed_methods' => ['*'],
 
-    'allowed_origins' => ['http://localhost:4200'],
+    'allowed_origins' => ['http://localhost:4200', env('CONSOLE_HOST')],
 
     'allowed_origins_patterns' => [],
 

api/config/filesystems.php

@@ -39,14 +39,6 @@ return [
             'driver' => 'local',
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
-        ],
-
-        'uploads' => [
-            'driver' => 'local',
-            'root' => storage_path('app/uploads'),
-            'url' => env('APP_URL').'/uploads',
-            'visibility' => 'public',
         ],
 
         's3' => [
@@ -56,7 +48,6 @@ return [
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
-            'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
         ],
 

api/config/logging.php

@@ -1,5 +1,6 @@
 <?php
 
+use Monolog\Formatter\JsonFormatter;
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
@@ -89,12 +90,21 @@ return [
             'driver' => 'monolog',
             'level' => env('LOG_LEVEL', 'debug'),
             'handler' => StreamHandler::class,
-            'formatter' => env('LOG_STDERR_FORMATTER'),
+            'formatter' => JsonFormatter::class,
             'with' => [
                 'stream' => 'php://stderr',
             ],
         ],
 
+        'stdout' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'formatter' => JsonFormatter::class,
+            'with' => [
+                'stream' => 'php://stdout',
+            ],
+        ],
+
         'syslog' => [
             'driver' => 'syslog',
             'level' => env('LOG_LEVEL', 'debug'),

api/config/mail.php

@@ -50,7 +50,6 @@ return [
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
-            'version' => '2010-12-01'
         ],
 
         'mailgun' => [
@@ -96,8 +95,8 @@ return [
     */
 
     'from' => [
-        'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-        'name' => env('MAIL_FROM_NAME', 'Example'),
+        'address' => env('MAIL_FROM_ADDRESS', 'hello@fleetbase.io'),
+        'name' => env('MAIL_FROM_NAME', 'Fleetbase'),
     ],
 
     /*

api/config/queue.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

api/deploy.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Exit the script as soon as a command fails
+set -e
+
+# Create mysql databases if none exists
+php artisan mysql:createdb
+
+# Run migrations
+php artisan migrate --force
+
+# Run migrations for sandbox too
+php artisan sandbox:migrate --force
+
+# Seed database
+php artisan fleetbase:seed

cicd/README.md

@@ -0,0 +1,3 @@
+## CI/CD config files
+
+This folder contains examples of configuration files for different CI/CD systems other than Github Actions.

cicd/gitlab-ci.yml

@@ -0,0 +1,59 @@
+image: docker:stable-git
+variables:
+# will need the following env vars set in the CI/CD settings
+# PROJECT - needs to match the project name in the infrastructure
+# GITHUB_AUTH_TOKEN - if you have it
+# the AWS specific variables:
+# AWS_REGION - the project region
+# AWS_ACCESS_KEY_ID - since OIDC support in Gitlab greatly varies between versions have to revert to plain old user creds
+# AWS_SECRET_ACCESS_KEY
+
+build_image:
+  stage: build
+  tags:
+    - docker
+  script:
+    - mkdir -p /usr/local/lib/docker/cli-plugins && wget -O /usr/local/lib/docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64 && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
+    - |-
+        if [[ -n "${GITHUB_AUTH_TOKEN}" ]]; then
+          echo '{"github-oauth": {"github.com": "'${GITHUB_AUTH_TOKEN}'"}}' > composer-auth.json
+        else
+          echo '{}' > composer-auth.json
+        fi
+    - |-
+        set -eu
+
+        docker buildx create --driver docker-container --driver-opt image=moby/buildkit:v0.11.5 --use
+
+        docker buildx bake -f docker-bake.hcl --print # just print for now
+
+
+deploy:
+  stage: deploy
+  only:
+    - /^deploy\/.*$/
+  tags:
+    - docker
+  script:
+    - mkdir -p /usr/local/lib/docker/cli-plugins && wget -O /usr/local/lib/docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64 && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
+    - docker buildx create --driver docker-container --driver-opt image=moby/buildkit:v0.11.5 --use
+    - 'export VERSION="$(git describe --always --tags)"'
+    - 'export STACK="$(basename $CI_COMMIT_REF_NAME)"'
+    - |-
+        if [[ -n "${GITHUB_AUTH_TOKEN}" ]]; then
+          echo '{"github-oauth": {"github.com": "'${GITHUB_AUTH_TOKEN}'"}}' > composer-auth.json
+        else
+          echo '{}' > composer-auth.json
+        fi
+    - |-
+        set -eu
+
+        wget https://github.com/springload/ecs-tool/releases/download/1.9.6/ecs-tool_1.9.6_linux_amd64.tar.gz -O /tmp/ecs-tool.tar.gz && tar -C /usr/bin -xvf /tmp/ecs-tool.tar.gz ecs-tool
+        export REGISTRY=$(ecs-tool ecr-endpoint)/${PROJECT}-${STACK}
+        eval $(ecs-tool ecr-login)
+
+        docker buildx bake -f docker-bake.hcl --push
+
+        # run deploy.sh script before deployments
+        env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ecs-tool run --image_tag '{container_name}-${VERSION}' --cluster ${PROJECT}-${STACK} --task_definition ${PROJECT}-${STACK}-app --container_name app ./deploy.sh
+        ecs-tool deploy --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} -s app -s scheduler -s events

create-erd.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Exit the script as soon as a command fails
+set -e
+
+# Run schemacrawler
+# To use schemacrawler see https://www.schemacrawler.com/downloads.html
+schemacrawler.sh --server mysql --host localhost --database fleetbase --user root --info-level standard --command script --script-language python --script mermaid.py --output-file database.mmd
+schemacrawler.sh --server mysql --host localhost --database fleetbase --user root --info-level standard --command=schema --grep-tables="^(?!fleetbase_sandbox\.).*" --output-format=svg --output-file=erd.svg
+
+# Generate a SVG ERD diagram using `dark` theme
+# To use mmdc see https://github.com/mermaid-js/mermaid-cli
+mmdc -i database.mmd -o erd-dark.svg -t dark -b transparent --configFile="mmdc.json"

docker-bake.hcl

@@ -0,0 +1,49 @@
+// docker-bake.hcl
+variable "REGISTRY" { default = "" }
+variable "VERSION" { default = "latest" }
+variable "CACHE" { default = "" }
+
+group "default" {
+  targets = ["app", "app-httpd"]
+}
+
+target "app" {
+  name = "app-${tgt}"
+
+  // use matrix strategy to build several targets at once
+  matrix = {
+    tgt = ["app", "scheduler", "events"]
+  }
+  context = "./"
+  // set the target from matrix
+  target     = tgt
+  dockerfile = "docker/Dockerfile"
+  platforms = [
+    "linux/amd64",
+  ]
+
+  tags = notequal("", REGISTRY) ? formatlist(
+    "${REGISTRY}:${tgt}-%s",
+    compact(["latest", VERSION])
+  ) : []
+
+  secret = [
+    "type=file,id=composer_auth,src=./composer-auth.json"
+  ]
+
+  cache-from = notequal("", CACHE) ? ["${CACHE}"] : []
+  cache-to   = notequal("", CACHE) ? ["${CACHE},mode=max,ignore-error=true"] : []
+}
+
+target "app-httpd" {
+  context    = "./"
+  dockerfile = "docker/httpd/Dockerfile"
+  platforms = [
+    "linux/amd64",
+  ]
+
+  tags = notequal("", REGISTRY) ? formatlist(
+    "${REGISTRY}:app-httpd-%s",
+    compact(["latest", VERSION])
+  ) : []
+}

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.8"
 
 services:
   cache:
@@ -10,16 +10,13 @@ services:
       - "3306:3306"
     volumes:
       - "./docker/database/:/docker-entrypoint-initdb.d/"
+      - "./docker/database/mysql:/var/lib/mysql"
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
       MYSQL_DATABASE: "fleetbase"
 
   socket:
-    build:
-      context: .
-      dockerfile: socket/Dockerfile
-      args:
-          ENVIRONMENT: dev
+    image: socketcluster/socketcluster:v17.4.0
     ports:
       - "38000:8000"
     environment:
@@ -44,8 +41,6 @@ services:
       target: app-dev
       args:
         ENVIRONMENT: development
-    ports:
-      - "8000:80"
     environment:
       DATABASE_URL: "mysql://root@database/fleetbase"
       CACHE_DRIVER: redis
@@ -58,4 +53,15 @@ services:
       LOG_CHANNEL: daily
     depends_on:
       - database
-      - cache
+      - cache
+
+  httpd:
+    volumes:
+      - ./api/storage:/var/www/html/api/storage
+    build:
+      context: .
+      dockerfile:  docker/httpd/Dockerfile
+    ports:
+      - "8000:80"
+    depends_on:
+      - application

docker/Dockerfile

@@ -1,3 +1,4 @@
+# syntax = docker/dockerfile:1.2
 # Base stage
 FROM php:7.4-fpm-bullseye as base
 
@@ -10,7 +11,7 @@ RUN mkdir -p /usr/src/php/ext \
 RUN apt-get update \
     && apt-get install -y nano git unzip libzip-dev libgd-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
     imagemagick libmagickwand-dev --no-install-recommends libmemcached-dev libgeos-dev libgmp-dev \
-    default-mysql-client libicu-dev tmux nginx dnsutils \
+    default-mysql-client libicu-dev tmux nginx dnsutils mycli redis-tools \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-configure gd --with-external-gd \
@@ -28,39 +29,58 @@ RUN sed -e 's/^expose_php.*/expose_php = Off/' "$PHP_INI_DIR/php.ini-production"
     -e 's/^memory_limit.*/memory_limit = 600M/' "$PHP_INI_DIR/php.ini"
 
 # Install ssm-parent
-RUN curl -L https://github.com/springload/ssm-parent/releases/download/v1.4.3/ssm-parent_1.4.3_linux_amd64.tar.gz > /tmp/ssm-parent.tar.gz \
-    && tar -C /sbin -xvf /tmp/ssm-parent.tar.gz ssm-parent \
-    && rm /tmp/ssm-parent.tar.gz
+COPY --from=ghcr.io/springload/ssm-parent:1.8 /usr/bin/ssm-parent /sbin/ssm-parent
 
 # Install Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
+# Set some build ENV variables
+ENV LOG_CHANNEL=stdout
+ENV CACHE_DRIVER=null
+
+# For development only
+WORKDIR /var/www/html
+COPY --chown=www-data:nogroup ./packages ./packages
+
 # Setup application
 WORKDIR /var/www/html/api
-COPY --chown=www-data:nogroup api ./
+COPY --chown=www-data:nogroup ./api ./
 RUN chown -R www-data:www-data /var/www/html/api
-RUN mkdir -p ./storage/logs/ && ln -sf /dev/stdout ./storage/logs/laravel-$(date +'%Y-%m-%d').log
-USER www-data
-RUN composer install
-RUN composer dumpautoload
+
+# Setup composer root directory
+RUN mkdir -p /root/.composer
+RUN mkdir -p /var/www/.composer && chown www-data:www-data /var/www/.composer
+
+# Setup logging
+RUN mkdir -p ./storage/logs/ && touch ./storage/logs/laravel-$(date +'%Y-%m-%d').log
+RUN chown -R www-data:www-data ./storage
+RUN chmod -R 755 ./storage
+
+# Load the secret into the auth.json file if exists, and install dependencies
+COPY composer-auth.jso[n] /root/.composer/auth.json
+RUN --mount=type=secret,id=composer_auth,target=/root/.composer/auth.json \
+    if [ -f "/root/.composer/auth.json" ]; then \
+        mkdir -p /var/www/.composer/ && \
+        cp /root/.composer/auth.json /var/www/.composer/auth.json && \
+        chown www-data:www-data /var/www/.composer/auth.json && \
+        su www-data -s /bin/sh -c "composer install && composer dumpautoload"; \
+    fi; \
+    su www-data -s /bin/sh -c "composer install && composer dumpautoload"
 
 # Continue
 USER root
 WORKDIR /
 
-# Copy nginx config
-COPY nginx.conf /etc/nginx/sites-enabled/default
-
-# Copy the startup script into the Docker image
-COPY startup.sh /startup.sh
-
-# Make sure the script is executable
-RUN chmod +x /startup.sh
+# Create unique instance ID
+RUN echo $(cat /proc/sys/kernel/random/uuid) > /.fleetbase
 
 # Set environment
 ARG ENVIRONMENT=production
 ENV APP_ENV=$ENVIRONMENT
 
+# Set workdir to application
+WORKDIR /var/www/html/api
+
 # Scheduler base stage
 FROM base as scheduler-base
 
@@ -82,21 +102,14 @@ CMD ["go-crond", "--verbose", "--no-auto", "root:./crontab"]
 # Application dev stage
 FROM base as app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
-EXPOSE 80
-CMD ["/startup.sh"]
+CMD ["php-fpm"]
 
 # Events stage
 FROM base as events
 ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
-CMD ["php", "artisan", "queue:work", "events"]2
-
-# Jobs stage
-FROM base as jobs
-ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
 CMD ["php", "artisan", "queue:work", "sqs"]
 
 # Application stage
 FROM base as app
 ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
-EXPOSE 80
-CMD ["/startup.sh"]
+CMD ["php-fpm"]

docker/httpd/Dockerfile

@@ -1,5 +1,7 @@
 # alpine is more secure
 FROM nginx:stable-alpine
 
-COPY docker/httpd/vhost.conf /etc/nginx/conf.d/default.conf
-COPY api/public/ /var/www/html/api/public/
+ENV NGINX_APPLICATION_HOSTNAME application
+
+COPY docker/httpd/vhost.conf /etc/nginx/templates/default.conf.template
+COPY api/public/ /var/www/html/api/public/

docker/httpd/vhost.conf

@@ -4,7 +4,12 @@ server {
   root /var/www/html/api/public;
   # hide nginx version for security purposes
   server_tokens off;
-
+  access_log  /var/log/nginx/access.log;
+  error_log  /var/log/nginx/error_log;
+  proxy_connect_timeout       600;
+  proxy_send_timeout          600;
+  proxy_read_timeout          600;
+  send_timeout                600;
   index index.php;
 
   location / {
@@ -34,7 +39,7 @@ server {
     fastcgi_param PATH_INFO       $fastcgi_path_info;
     fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
 
-    fastcgi_pass   application:9000;
+    fastcgi_pass   ${NGINX_APPLICATION_HOSTNAME}:9000;
     fastcgi_index  index.php;
   }
-}
+}

mermaid.py

@@ -0,0 +1,43 @@
+from __future__ import print_function
+import re
+
+def cleanname(name):
+    return re.sub(r'[^\d\w_]', '', name)
+
+def format_table_name(full_name):
+    parts = full_name.split('.')
+    if len(parts) == 2 and not parts[0].endswith('_sandbox'):
+        return cleanname(parts[0] + '_' + parts[1])
+    else:
+        return None
+
+print('erDiagram')
+print('')
+for table in catalog.tables:
+    formatted_name = format_table_name(table.fullName)
+    if formatted_name:
+        print('  ' + formatted_name + ' {')
+        for column in table.columns:
+            print('    ' + cleanname(column.columnDataType.name) + ' ' + cleanname(column.name),
+                  end='')
+            if column.isPartOfPrimaryKey():
+                print(' PK', end='')
+            elif column.isPartOfForeignKey():
+                print(' FK', end='')
+            elif column.isPartOfUniqueIndex():
+                print(' UK', end='')
+            if column.hasRemarks():
+                print(' "' + ' '.join(column.remarks.splitlines()) + '"',
+                      end='')
+            print()
+        print('  }')
+        print('')
+
+for table in catalog.tables:
+    formatted_name = format_table_name(table.fullName)
+    if formatted_name:
+        for childTable in table.referencingTables:
+            child_formatted_name = format_table_name(childTable.fullName)
+            if child_formatted_name:
+                print('  ' + formatted_name + ' ||--o{ ' +
+                      child_formatted_name + ' : "foreign key"')

mmdc.json

@@ -0,0 +1,3 @@
+{
+	"maxTextSize": 99999999
+}

nginx.conf

@@ -1,46 +0,0 @@
-server {
-  listen 80;
-  server_name localhost;
-  root /var/www/html/api/public;
-  # hide nginx version for security purposes
-  server_tokens off;
-  access_log  /var/log/nginx/access.log;
-  error_log  /var/log/nginx/error_log;
-  proxy_connect_timeout       600;
-  proxy_send_timeout          600;
-  proxy_read_timeout          600;
-  send_timeout                600;
-
-  index index.php;
-
-  location / {
-    try_files $uri $uri/ /index.php?$args;
-  }
-
-  location /uploads {
-    alias /var/www/html/api/storage/app/uploads;
-    autoindex on;
-    try_files $uri $uri/ /index.php?$query_string;
-  }  
-  
-  location /storage {
-    alias /var/www/html/api/storage/app/public;
-    autoindex on;
-    try_files $uri $uri/ /index.php?$query_string;
-  }
-
-  location ~ [^/]\.php(/|$) {
-    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    if (!-f $document_root$fastcgi_script_name) {
-      return 404;
-    }
-
-    include fastcgi_params;
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    fastcgi_param PATH_INFO       $fastcgi_path_info;
-    fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
-
-    fastcgi_pass   application:9000;
-    fastcgi_index  index.php;
-  }
-}

startup.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Start PHP-FPM in the background
-php-fpm -D
-status=$?
-if [ $status -ne 0 ]; then
-  echo "Failed to start php-fpm: $status"
-  exit $status
-fi
-
-# Start Nginx in the foreground
-nginx -g "daemon off;"
-status=$?
-if [ $status -ne 0 ]; then
-  echo "Failed to start nginx: $status"
-  exit $status
-fi
-
-# Naive check runs checks once a minute to see if either of the processes exited.
-while sleep 60; do
-  ps aux | grep php-fpm | grep -q -v grep
-  PROCESS_1_STATUS=$?
-  ps aux |grep nginx |grep -q -v grep
-  PROCESS_2_STATUS=$?
-  
-  if [ $PROCESS_1_STATUS -ne 0 ]; then
-    echo "PHP-FPM process has already exited."
-    exit 1
-  fi
-  
-  if [ $PROCESS_2_STATUS -ne 0 ]; then
-    echo "Nginx process has already exited."
-    exit 1
-  fi
-done

update.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Exit the script as soon as a command fails
+set -e
+
+echo "Switching to the main branch..."
+git checkout main
+
+echo "Updating submodules..."
+git submodule update --init --recursive
+
+echo "Updating console..."
+cd console
+git checkout main
+git pull
+cd ..
+
+echo "Building Docker images..."
+docker-compose build console
+docker-compose build application
+
+echo "Update completed. Run \`docker-compose up -d\` to launch!"