Fullstack docker image

v0.6.8 ~ View Proof of Delivery in FleetOps + API to get POD

.github/workflows/cd.yml

@@ -109,13 +109,13 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8
+          version: 9.5.0
           run_install: false
 
       - name: Get pnpm Store Directory
@@ -132,11 +132,31 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+      - name: Create and Setup .npmrc
         run: |
           if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
             echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
           fi
+          if [[ -n "${{ secrets.FLEETBASE_REGISTRY_TOKEN }}" ]]; then
+            echo "//registry.fleetbase.io/:_authToken=${{ secrets.FLEETBASE_REGISTRY_TOKEN }}" >> .npmrc
+            echo "@fleetbase:registry=https://registry.fleetbase.io" >> .npmrc
+          fi
+        working-directory: ./console
+
+      - name: Set Env Variables for QA
+        if: startsWith(github.ref, 'refs/heads/deploy/qa')
+        run: |
+          echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./environments/.env.production
+          echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
+        working-directory: ./console
+
+      - name: Set Env Variables for Production
+        if: startsWith(github.ref, 'refs/heads/deploy/production')
+        run: |
+          echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production
+          echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
         working-directory: ./console
 
       - name: Install dependencies

.gitignore

@@ -15,6 +15,7 @@ api/vendor
 api/composer.dev.json
 api/composer-install-dev.sh
 api/auth.json
+api/crontab
 act.sh
 composer-auth.json
 docker/database/*
@@ -29,6 +30,7 @@ packages/flespi
 packages/loconav
 packages/internals
 packages/projectargus-engine
+packages/customer-portal
 # wip
 packages/solid
 solid

.gitmodules

@@ -33,9 +33,12 @@
 	path = packages/fleetops-data
 	url = git@github.com:fleetbase/fleetops-data.git
 	branch = main
-[submodule "docs/guides"]
-	path = docs/guides
-	url = git@github.com:fleetbase/guides.git
-[submodule "docs/api-reference"]
-	path = docs/api-reference
-	url = git@github.com:fleetbase/api-reference.git
+[submodule "docs"]
+	path = docs
+	url = git@github.com:fleetbase/docs.git
+[submodule "packages/registry-bridge"]
+	path = packages/registry-bridge
+	url = git@github.com:fleetbase/registry-bridge.git
+[submodule "packages/ledger"]
+	path = packages/ledger
+	url = git@github.com:fleetbase/ledger.git

COMMERCIAL_LICENSE.md

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

CONTRIBUTING.md

@@ -13,15 +13,15 @@ We use github to host code, to track issues and feature requests, as well as acc
 ## 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`.
+1. Fork the repo and create your branch from `main`.
 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.
+## Any contributions you make will be under the AGPL v3 Software License
+In short, when you submit code changes, your submissions are understood to be under the same [AGPL v3](https://choosealicense.com/licenses/agpl-3.0/) 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!
@@ -41,7 +41,7 @@ We use GitHub issues to track public bugs. Report a bug by [opening a new issue]
 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.
+By contributing, you agree that your contributions will be licensed under its AGPL v3 Software 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)

Caddyfile

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

Caddyfile.console

@@ -0,0 +1,19 @@
+{
+	frankenphp
+	order php_server before file_server
+}
+
+http://:8000 {
+	root * /fleetbase/api/public
+	encode zstd gzip
+	php_server {
+		resolve_root_symlink
+	}
+}
+
+http://:4200 {
+	root * /fleetbase/console/dist
+	try_files {path} /
+	encode zstd gzip
+	file_server
+}

LICENSE.md

@@ -1,21 +1,651 @@
-MIT LICENSE
+GNU Affero General Public License
+=================================
 
-COPYRIGHT (C) 2023 FLEETBASE PTE LTD
+_Version 3, 19 November 2007_
+_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
 
-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:
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
 
-THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN ALL
-COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE.
+## Preamble
 
-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.
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: **(1)** assert copyright on the software, and **(2)** offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions
+
+“This License” refers to version 3 of the GNU Affero General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as “you”.  “Licensees” and
+“recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a “modified version” of the
+earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based
+on the Program.
+
+To “propagate” a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices”
+to the extent that it includes a convenient and prominently visible
+feature that **(1)** displays an appropriate copyright notice, and **(2)**
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code
+
+The “source code” for a work means the preferred form of the work
+for making modifications to it.  “Object code” means any non-source
+form of a work.
+
+A “Standard Interface” means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other
+than the work as a whole, that **(a)** is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and **(b)** serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+“Major Component”, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+### 2. Basic Permissions
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+### 4. Conveying Verbatim Copies
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+* **a)** The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+* **b)** The work must carry prominent notices stating that it is
+released under this License and any conditions added under section 7.
+This requirement modifies the requirement in section 4 to
+“keep intact all notices”.
+* **c)** You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+* **d)** If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+“aggregate” if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+* **a)** Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+* **b)** Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either **(1)** a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or **(2)** access to copy the
+Corresponding Source from a network server at no charge.
+* **c)** Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+* **d)** Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+* **e)** Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A “User Product” is either **(1)** a “consumer product”, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or **(2)** anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, “normally used” refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms
+
+“Additional permissions” are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+* **a)** Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+* **b)** Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+* **c)** Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+* **d)** Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+* **e)** Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+* **f)** Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered “further
+restrictions” within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+### 8. Termination
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated **(a)**
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and **(b)** permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents
+
+A “contributor” is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, “control” includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To “grant” such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either **(1)** cause the Corresponding Source to be so
+available, or **(2)** arrange to deprive yourself of the benefit of the
+patent license for this particular work, or **(3)** arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  “Knowingly relying” means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is “discriminatory” if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license **(a)** in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or **(b)** primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+### 13. Remote Network Interaction; Use with the GNU General Public License
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+### 14. Revised Versions of this License
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License “or any later version” applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+### 16. Limitation of Liability
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+_END OF TERMS AND CONDITIONS_
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the “copyright” line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a “Source” link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a “copyright disclaimer” for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+&lt;<http://www.gnu.org/licenses/>&gt;.

README.md

@@ -1,58 +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://docs.fleetbase.io/" 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://tally.so/r/3NBpAW" 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)
+## 📖 Table of contents
+
+  - [Features](#-features)
+  - [Install](#-install)
   - [Extensions](#-extensions)
   - [Apps](#-apps)
   - [Roadmap](#-roadmap)
@@ -63,211 +52,86 @@ 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/getting-started/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 a default OSRM server hosted by `[router.project-osrm.org](https://router.project-osrm.org)` but you’re able to use your own or any other OSRM compatible server. You can modify this in the `console/environments` directory by modifying the .env file of the environment you’re deploying and setting the `OSRM_HOST` to the OSRM server for Fleetbase to use.  
   
-  <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://router.project-osrm.org
+      IPINFO_API_KEY:
+      GOOGLE_MAPS_API_KEY:  
+      GOOGLE_MAPS_LOCALE: us
+      TWILIO_SID:  
+      TWILIO_TOKEN:
+      TWILIO_FROM:
+      CONSOLE_HOST: http://localhost:4200
+```
 
-  <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/getting-started/install).
 
-  <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>
+# 🧩 Extensions 
 
-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.
+Extensions are modular components that enhance the functionality of your Fleetbase instance. They allow you to add new features, customize existing behavior, or integrate with external systems.
 
-# 💾 Installation
+You can find extensions available from the official [Fleetbase Console](https://console.fleetbase.io), here you will also be able get your registry token to install extensions to a self-hosted Fleetbase instance. 
 
-Getting Fleetbase up and running on your system using Docker and Docker-compose is straightforward. Please follow the steps below:
+Additionally you're able to develop and publish your own extensions as well which you can read more about developing extensions via the [extension building guide](https://docs.fleetbase.io/developers/building-an-extension).
 
-### Prerequisites
+## ⌨️ Fleetbase CLI 
 
-<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>
+The Fleetbase CLI is a powerful tool designed to simplify the management of extensions for your Fleetbase instance. With the CLI, you can effortlessly handle authentication, install and uninstall extensions, and scaffold new extensions if you are developing your own.
 
-### Build and Run Fleetbase
+Get started with the CLI with npm:
 
-<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>
+```bash
+npm i -g @fleetbase/cli
+```
 
-### 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.
+Once installed, you can access a variety of commands to manage your Fleetbase extensions.
 
 # 📱 Apps
 
@@ -278,42 +142,34 @@ Fleetbase offers a few open sourced apps which are built on Fleetbase which can
   <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
+## 🛣️ Roadmap
+1.  **Inventory and Warehouse Management** ~ Pallet will be Fleetbase’s first official extension for WMS & Inventory.
+2.  **Accounting and Invoicing** ~ Ledger will be Fleetbase’s first official extension accounting and invoicing.
+3.  **Binary Builds** ~ Run Fleetbase from a single binary.
+4.  **Fleetbase for Desktop** ~ Desktop builds for OSX and Windows.
+5. **Custom Maps and Routing Engines** ~ Feature to enable easy integrations with custom maps and routing engines like Google Maps or Mapbox etc…
 
-<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>.
 
 <ul>
-  <li>Follow <a href="https://twitter.com/fleetbase_io">@fleetbase_io on Twitter</a>.</li>
+  <li>Follow <a href="https://x.com/fleetbase_io">@fleetbase_io on X</a>.</li>
   <li>Read and subscribe to <a href="https://www.fleetbase.io/blog-2">The Official Fleetbase Blog</a>.</li>
   <li>Ask and explore <a href="https://github.com/orgs/fleetbase/discussions">our GitHub Discussions</a>.</li>
 </ul>
 <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%;">          
@@ -326,4 +182,4 @@ Get updates on Fleetbase's development and chat with the project maintainers and
 
 # License & Copyright
 
-Code and documentation copyright 2018–2023 the <a href="https://github.com/fleetbase/fleetbase/graphs/contributors">Fleetbase Authors</a>. Code released under the <a href="https://github.com/fleetbase/storefront-app/blob/main/LICENSE.md">MIT License</a>.
+Fleetbase is made available under the terms of the <a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank">GNU Affero General Public License 3.0 (AGPL 3.0)</a>. For other licenses <a href="mailto:hello@fleetbase.io" target="_blank">contact us</a>.

api/composer.json

@@ -1,17 +1,19 @@
 {
-    "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",
+    "license": "AGPL-3.0-or-later",
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.16",
-        "fleetbase/fleetops-api": "^0.4.24",
-        "fleetbase/storefront-api": "^0.3.7",
+        "appstract/laravel-opcache": "^4.0",
+        "fleetbase/core-api": "^1.6.2",
+        "fleetbase/fleetops-api": "^0.6.5",
+        "fleetbase/registry-bridge": "^0.0.18",
+        "fleetbase/storefront-api": "^0.3.30",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^10.0",
         "laravel/octane": "^2.3",
@@ -21,7 +23,10 @@
         "phpoffice/phpspreadsheet": "^1.28",
         "predis/predis": "^2.1",
         "psr/http-factory-implementation": "*",
-        "s-ichikawa/laravel-sendgrid-driver": "^4.0"
+        "resend/resend-php": "^0.14.0",
+        "s-ichikawa/laravel-sendgrid-driver": "^4.0",
+        "symfony/mailgun-mailer": "^7.1",
+        "symfony/postmark-mailer": "^7.1"
     },
     "require-dev": {
         "spatie/laravel-ignition": "^2.0",
@@ -32,6 +37,12 @@
         "nunomaduro/collision": "^7.0",
         "phpunit/phpunit": "^10.0"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://registry.fleetbase.io"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "App\\": "app/",
@@ -92,6 +103,6 @@
             "php-http/discovery": true
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }

api/config/app.php

@@ -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/mail.php

@@ -64,6 +64,8 @@ return [
             'transport' => 'sendgrid',
         ],
 
+        'resend' => [],
+
         'sendmail' => [
             'transport' => 'sendmail',
             'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),

api/config/opcache.php

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

api/config/services.php

@@ -34,4 +34,13 @@ return [
         'api_key' => env('SENDGRID_API_KEY'),
     ],
 
+    'resend' => [
+        'key' => env('RESEND_KEY'),
+    ],
+
+    'stripe' => [
+        'key' => env('STRIPE_KEY', env('STRIPE_API_KEY')),
+        'secret' => env('STRIPE_SECRET', env('STRIPE_API_SECRET')),
+        'webhook_secret' => env('STRIPE_WEBHOOK_SECRET'),
+    ],
 ];

api/deploy.sh

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

console/Dockerfile.server-build

@@ -1,8 +1,8 @@
 # ---- Build Stage ----
-FROM node:18.15.0-alpine AS builder
+FROM node:18.15.0-alpine as builder
 
-# Set the working directory in the container to /app
-WORKDIR /app
+# Set the working directory in the container to /console
+WORKDIR /console
 
 # Create the pnpm directory and set the PNPM_HOME environment variable
 RUN mkdir -p ~/.pnpm
@@ -14,7 +14,7 @@ ARG ENVIRONMENT=production
 # Add the pnpm global bin to the PATH
 ENV PATH /root/.pnpm/bin:$PATH
 
-# Copy pnpm-lock.yaml (or package.json) into the directory /app in the container
+# Copy pnpm-lock.yaml (or package.json) into the directory /console in the container
 COPY console/package.json console/pnpm-lock.yaml ./
 
 # Copy over .npmrc if applicable
@@ -32,7 +32,7 @@ RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 # Install app dependencies
 RUN pnpm install
 
-# Copy the console directory contents into the container at /app
+# Copy the console directory contents into the container at /console
 COPY console .
 
 # Build the application
@@ -42,7 +42,7 @@ RUN pnpm build --environment $ENVIRONMENT
 FROM nginx:alpine
 
 # Copy the built app to our served directory
-COPY --from=builder /app/dist /usr/share/nginx/html
+COPY --from=builder /console/dist /usr/share/nginx/html
 
 # Expose the port nginx is bound to
 EXPOSE 4200

console/Dockerfile.static-build

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

console/app/components/configure/filesystem.hbs

@@ -33,7 +33,7 @@
         </InputGroup>
     {{/if}}
     {{#if this.testResponse}}
-        <div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
+        <div class="flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
             <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/configure/filesystem.js

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

console/app/components/configure/mail.hbs

@@ -3,25 +3,54 @@
         <Select @options={{this.mailers}} @value={{this.mailer}} @onSelect={{this.setMailer}} @placeholder="Select mailer" class="w-full" />
     </InputGroup>
     {{#if (eq this.mailer "smtp")}}
-        <InputGroup @name="SMTP Host" @value={{this.smtpHost}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Port" @type="number" @value={{this.smtpPort}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Encryption" @value={{this.smtpEncryption}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Username" @value={{this.smtpUsername}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Password" @type="password" @value={{this.smtpPassword}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Timeout" @value={{this.smtpTimeout}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Auth Mode" @value={{this.smtpAuth_mode}} disabled={{this.isLoading}} />
+        <InputGroup @name="SMTP Host" @value={{this.smtpHost}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Port" @type="number" @value={{this.smtpPort}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup>
+            <Toggle @isToggled={{eq this.smtpEncryption "tls"}} @onToggle={{this.enableSmtpEncryption}} @label="SMTP Encryption" @helpText="Enabled TLS Encryption" />
+        </InputGroup>
+        <InputGroup @name="SMTP Username" @value={{this.smtpUsername}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Password" @value={{this.smtpPassword}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Timeout" @value={{this.smtpTimeout}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Auth Mode" @value={{this.smtpAuth_mode}} disabled={{this.loadConfigValues.isRunning}} />
     {{/if}}
-    <InputGroup @name="From Address" @helpText="Input the email address for Fleetbase to send emails from." @value={{this.fromAddress}} @placeholder="From Address" disabled={{this.isLoading}} />
+    {{#if (eq this.mailer "mailgun")}}
+        <InputGroup @name="Mailgun Domain" @value={{this.mailgunDomain}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="Mailgun Endpoint" @value={{this.mailgunEndpoint}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="Mailgun Secret" @value={{this.mailgunSecret}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "postmark")}}
+        <InputGroup @name="Postmark Token" @value={{this.postmarkToken}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "sendgrid")}}
+        <InputGroup @name="Sendgrid API Key" @value={{this.sendgridApi_key}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "resend")}}
+        <InputGroup @name="Resend API Key" @value={{this.resendKey}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    <InputGroup
+        @name="From Address"
+        @helpText="Input the email address for Fleetbase to send emails from."
+        @value={{this.fromAddress}}
+        @placeholder="From Address"
+        disabled={{this.isLoading}}
+    />
     <InputGroup @name="From Name" @helpText="Input the name for Fleetbase to send emails from." @value={{this.fromName}} @placeholder="From Name" disabled={{this.isLoading}} />
     {{#if this.testResponse}}
-        <div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
-            <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
-            <span class="text-xs">{{this.this.testResponse.message}}</span>
+        <div
+            class="flex flex-row items-center rounded-lg border
+                {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}}
+                shadow-sm my-2 px-4 py-2"
+        >
+            <FaIcon
+                @icon={{if (eq this.testResponse.status "error") "triangle-exclamation" "circle-check"}}
+                class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}"
+            />
+            <span class="text-xs">{{this.testResponse.message}}</span>
         </div>
     {{/if}}
-    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Config" @onClick={{this.test}} @isLoading={{this.isLoading}} />
+    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Config" @onClick={{perform this.test}} @isLoading={{this.test.isRunning}} />
 </ContentPanel>
 
 <EmberWormhole @to="next-view-section-subheader-actions">
-    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{this.save}} @disabled={{this.isLoading}} @isLoading={{this.isLoading}} />
+    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{perform this.save}} @disabled={{this.save.isRunning}} @isLoading={{this.save.isRunning}} />
 </EmberWormhole>

console/app/components/configure/mail.js

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

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

@@ -16,7 +16,7 @@
         {{/if}}
     </InputGroup>
     <InputGroup @wrapperClass="mb-0i">
-        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{fn (mut this.apn.production)}} @disabled={{this.isLoading}} />
+        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{this.toggleApnProduction}} />
     </InputGroup>
 </ContentPanel>
 
@@ -35,7 +35,7 @@
 
 <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">
+        <div class="flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
             <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

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

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

console/app/components/configure/queue.hbs

@@ -12,7 +12,7 @@
         <InputGroup @name="SQS Suffix" @value={{this.sqsSuffix}} disabled={{this.isLoading}} />
     {{/if}}
     {{#if this.testResponse}}
-        <div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
+        <div class="flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
             <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/configure/services.hbs

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

console/app/components/configure/services.js

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

console/app/components/configure/socket.hbs

@@ -37,7 +37,7 @@
         </div>
     </div>
     {{#if this.testResponse}}
-        <div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
+        <div class="flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
             <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/dashboard.hbs

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

console/app/components/dashboard.js

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

console/app/components/dashboard/count.js

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

console/app/components/dashboard/create.hbs

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

console/app/components/dashboard/create.js

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

console/app/components/github-card.hbs

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

console/app/components/github-card.js

@@ -10,9 +10,12 @@ import fetch from 'fetch';
 
 export default class GithubCardComponent extends Component {
     @storageFor('local-cache') localCache;
-    @tracked data;
-    @tracked tags;
-    @tracked isLoading = false;
+    @tracked data = {
+        owner: {
+            avatar_url: 'https://avatars.githubusercontent.com/u/38091894?v=4',
+        },
+    };
+    @tracked tags = [];
 
     @computed('tags.length') get latestRelease() {
         if (isArray(this.tags) && this.tags.length) {

console/app/components/impersonator-tray.hbs

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

console/app/components/impersonator-tray.js

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

console/app/components/locale-selector.hbs

@@ -1,30 +0,0 @@
-<div class="next-user-button" ...attributes>
-    <BasicDropdown @defaultClass={{@wrapperClass}} @onOpen={{@onOpen}} @onClose={{@onClose}} @verticalPosition={{@verticalPosition}} @horizontalPosition={{@horizontalPosition}} @renderInPlace={{or @renderInPlace true}} @initiallyOpened={{@initiallyOpened}} as |dd|>
-        <dd.Trigger class={{@triggerClass}}>
-            <div class="next-org-button-trigger flex-shrink-0 {{if dd.isOpen 'is-open'}}">
-                <FaIcon @icon="globe" @size="sm" />
-            </div>
-        </dd.Trigger>
-        <dd.Content class={{@contentClass}}>
-            <div class="next-dd-menu {{@dropdownMenuClass}} {{if dd.isOpen 'is-open'}}">
-                {{#each-in this.availableLocales as |key country|}}
-                    <div class="px-1">
-                        <a href="javascript:;" class="next-dd-item" {{on "click" (fn this.changeLocale key)}}>
-                            <div class="flex flex-row items-center justify-between w-full">
-                                <div class="flex-1">
-                                    <span class="mr-1">{{country.emoji}}</span>
-                                    <span>{{country.language}}</span>
-                                </div>
-                                {{#if (eq this.currentLocale key)}}
-                                    <div>
-                                        <FaIcon @icon="check" class="text-green-400" />
-                                    </div>
-                                {{/if}}
-                            </div>
-                        </a>
-                    </div>
-                {{/each-in}}
-            </div>
-        </dd.Content>
-    </BasicDropdown>
-</div>

console/app/components/locale-selector.js

@@ -1,144 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency-decorators';
-
-export default class LocaleSelectorComponent extends Component {
-    /**
-     * Inject the intl service.
-     *
-     * @memberof LocaleSelectorComponent
-     */
-    @service intl;
-
-    /**
-     * Inject the intl service.
-     *
-     * @memberof LocaleSelectorComponent
-     */
-    @service fetch;
-
-    /**
-     * Tracks all the available locales.
-     *
-     * @memberof LocaleSelectorComponent
-     */
-    @tracked locales = [];
-
-    /**
-     * All available countries data.
-     *
-     * @memberof LocaleSelectorComponent
-     */
-    @tracked countries = [];
-
-    /**
-     * The current locale in use.
-     *
-     * @memberof LocaleSelectorComponent
-     */
-    @tracked currentLocale;
-
-    /**
-     * Creates an instance of LocaleSelectorComponent.
-     * @memberof LocaleSelectorComponent
-     */
-    constructor() {
-        super(...arguments);
-
-        this.locales = this.intl.locales;
-        this.currentLocale = this.intl.primaryLocale;
-        this.loadAvailableCountries.perform();
-
-        // Check for locale change
-        this.intl.onLocaleChanged(() => {
-            this.currentLocale = this.intl.primaryLocale;
-        });
-    }
-
-    /**
-     * Handles the change of locale.
-     * @param {string} selectedLocale - The selected locale.
-     * @returns {void}
-     * @memberof LocaleSelectorComponent
-     * @method changeLocale
-     * @instance
-     * @action
-     */
-    @action changeLocale(selectedLocale) {
-        this.currentLocale = selectedLocale;
-        this.intl.setLocale(selectedLocale);
-        // Persist to server
-        this.saveUserLocale.perform(selectedLocale);
-    }
-
-    /**
-     * Loads available countries asynchronously.
-     * @returns {void}
-     * @memberof LocaleSelectorComponent
-     * @method loadAvailableCountries
-     * @instance
-     * @task
-     * @generator
-     */
-    @task *loadAvailableCountries() {
-        this.countries = yield this.fetch.get('lookup/countries', { columns: ['name', 'cca2', 'flag', 'emoji', 'languages'] });
-        this.availableLocales = this._createAvailableLocaleMap();
-    }
-
-    /**
-     * Saves the user's selected locale to the server.
-     * @param {string} locale - The user's selected locale.
-     * @returns {void}
-     * @memberof LocaleSelectorComponent
-     * @method saveUserLocale
-     * @instance
-     * @task
-     * @generator
-     */
-    @task *saveUserLocale(locale) {
-        yield this.fetch.post('users/locale', { locale });
-    }
-
-    /**
-     * Creates a map of available locales.
-     * @private
-     * @returns {Object} - The map of available locales.
-     * @memberof LocaleSelectorComponent
-     * @method _createAvailableLocaleMap
-     * @instance
-     */
-    _createAvailableLocaleMap() {
-        const localeMap = {};
-
-        for (let i = 0; i < this.locales.length; i++) {
-            const locale = this.locales.objectAt(i);
-
-            localeMap[locale] = this._findCountryDataForLocale(locale);
-        }
-
-        return localeMap;
-    }
-
-    /**
-     * Finds country data for a given locale.
-     * @private
-     * @param {string} locale - The locale to find country data for.
-     * @returns {Object|null} - The country data or null if not found.
-     * @memberof LocaleSelectorComponent
-     * @method _findCountryDataForLocale
-     * @instance
-     */
-    _findCountryDataForLocale(locale) {
-        const localeCountry = locale.split('-')[1];
-        const country = this.countries.find((country) => country.cca2.toLowerCase() === localeCountry);
-
-        if (country) {
-            // get the language
-            country.language = Object.values(country.languages)[0];
-        }
-
-        return country;
-    }
-}

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

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

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

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

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

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

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

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

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

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

console/app/controllers/auth/login.js

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

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

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

console/app/controllers/auth/verification.js

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

console/app/controllers/console.js

@@ -1,69 +1,21 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { getOwner } from '@ember/application';
 import { later } from '@ember/runloop';
-import { action, computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
+import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import first from '@fleetbase/ember-core/utils/first';
 
 export default class ConsoleController extends Controller {
-    /**
-     * Inject the `currentUser` service.
-     *
-     * @var {Service}
-     */
     @service currentUser;
-
-    /**
-     * Inject the `modalsManager` service.
-     *
-     * @var {Service}
-     */
     @service modalsManager;
-
-    /**
-     * Inject the `session` service.
-     *
-     * @var {Service}
-     */
     @service session;
-
-    /**
-     * Inject the `fetch` service.
-     *
-     * @var {Service}
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service.
-     *
-     * @var {Service}
-     */
     @service notifications;
-
-    /**
-     * Inject the `router` service.
-     *
-     * @var {Service}
-     */
     @service router;
-
-    /**
-     * Inject the `intl` service.
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `universe` service.
-     *
-     * @var {Service}
-     */
     @service universe;
+    @service abilities;
 
     /**
      * Authenticated user organizations.
@@ -98,23 +50,28 @@ export default class ConsoleController extends Controller {
      *
      * @var {Array}
      */
-    @tracked hiddenSidebarRoutes = ['console.home', 'console.extensions', 'console.notifications'];
+    @tracked hiddenSidebarRoutes = ['console.home', 'console.notifications', 'console.virtual'];
 
     /**
-     * Installed extensions.
+     * Menu items to be added to the main header navigation bar.
      *
-     * @var {Array}
+     * @memberof ConsoleController
      */
-    @computed() get extensions() {
-        return getOwner(this).application.extensions;
-    }
+    @tracked menuItems = [];
 
     /**
-     * Get the currently authenticated user
+     * Menu items to be added to the user dropdown menu located in the header.
      *
-     * @var {Model}
+     * @memberof ConsoleController
      */
-    @alias('currentUser.user') user;
+    @tracked userMenuItems = [];
+
+    /**
+     * Menu items to be added to the organization dropdown menu located in the header.
+     *
+     * @memberof ConsoleController
+     */
+    @tracked organizationMenuItems = [];
 
     /**
      * Creates an instance of ConsoleController.
@@ -174,6 +131,7 @@ 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();
@@ -197,13 +155,13 @@ export default class ConsoleController extends Controller {
      *
      * @void
      */
-    @action invalidateSession(noop, event) {
+    @action async invalidateSession(noop, event) {
         event.preventDefault();
-        this.session.invalidateWithLoader();
+        await this.session.invalidateWithLoader();
     }
 
     /**
-     * Action to invalidate and log user out
+     * Action to create or join an organization.
      *
      * @void
      */
@@ -227,53 +185,51 @@ export default class ConsoleController extends Controller {
             changeAction: (action) => {
                 this.modalsManager.setOption('action', action);
             },
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
 
                 const { action, next, name, description, phone, currency, country, timezone } = modal.getOptions();
 
                 if (action === 'join') {
-                    return this.fetch
-                        .post('auth/join-organization', { next })
-                        .then(() => {
-                            this.fetch.flushRequestCache('auth/organizations');
-                            this.notifications.success(this.intl.t('console.create-or-join-organization.join-success-notification'));
-                            later(
-                                this,
-                                () => {
-                                    window.location.reload();
-                                },
-                                900
-                            );
-                        })
-                        .catch((error) => {
-                            this.notifications.serverError(error);
-                        });
-                }
-
-                return this.fetch
-                    .post('auth/create-organization', {
-                        name,
-                        description,
-                        phone,
-                        currency,
-                        country,
-                        timezone,
-                    })
-                    .then(() => {
+                    try {
+                        await this.fetch.post('auth/join-organization', { next });
                         this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
-                        later(
+                        this.notifications.success(this.intl.t('console.create-or-join-organization.join-success-notification'));
+                        return later(
                             this,
                             () => {
                                 window.location.reload();
                             },
                             900
                         );
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
+                    } catch (error) {
+                        modal.stopLoading();
+                        return this.notifications.serverError(error);
+                    }
+                }
+
+                try {
+                    await this.fetch.post('auth/create-organization', {
+                        name,
+                        description,
+                        phone,
+                        currency,
+                        country,
+                        timezone,
                     });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
+                    return later(
+                        this,
+                        () => {
+                            window.location.reload();
+                        },
+                        900
+                    );
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
             },
         });
     }
@@ -293,25 +249,24 @@ export default class ConsoleController extends Controller {
             body: this.intl.t('console.switch-organization.modal-body'),
             acceptButtonText: this.intl.t('console.switch-organization.modal-accept-button-text'),
             acceptButtonScheme: 'primary',
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
 
-                return this.fetch
-                    .post('auth/switch-organization', { next: organization.uuid })
-                    .then(() => {
-                        this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
-                        later(
-                            this,
-                            () => {
-                                window.location.reload();
-                            },
-                            900
-                        );
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
-                    });
+                try {
+                    await this.fetch.post('auth/switch-organization', { next: organization.uuid });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
+                    return later(
+                        this,
+                        () => {
+                            window.location.reload();
+                        },
+                        900
+                    );
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
             },
         });
     }

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

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

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

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

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

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

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

@@ -10,35 +10,11 @@ import { action } from '@ember/object';
  * @extends Controller
  */
 export default class ConsoleAdminOrganizationsController extends Controller {
-    /**
-     * The Ember Data service for interacting with the store.
-     *
-     * @property {Service} store
-     * @type {Object}
-     */
     @service store;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * The Ember Router service for handling transitions between routes.
-     *
-     * @property {Service} router
-     * @type {Object}
-     */
     @service router;
-
-    /**
-     * Inject the `filters` service
-     *
-     * @var {Service}
-     */
     @service filters;
+    @service crud;
 
     /**
      * The search query param value.
@@ -166,4 +142,14 @@ export default class ConsoleAdminOrganizationsController extends Controller {
     @action goToCompany(company) {
         this.router.transitionTo('console.admin.organizations.index.users', company.public_id);
     }
+
+    /**
+     * Toggles dialog to export `drivers`
+     *
+     * @void
+     */
+    @action exportOrganization() {
+        const selections = this.table.selectedRows.map((_) => _.id);
+        this.crud.export('companies', { params: { selections } });
+    }
 }

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

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

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

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

console/app/controllers/console/home.js

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

console/app/controllers/console/settings/virtual.js

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

console/app/controllers/console/virtual.js

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

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

@@ -1,39 +1,40 @@
 import AuthVerificationController from '../auth/verification';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { later } from '@ember/runloop';
+import { not } from '@ember/object/computed';
+import { task } from 'ember-concurrency';
 
 export default class OnboardVerifyEmailController extends AuthVerificationController {
-    /**
-     * Submits to verify code.
-     *
-     * @return {Promise}
-     * @memberof OnboardVerifyEmailController
-     */
-    @action verifyCode() {
-        const { hello, code } = this;
+    @service fetch;
+    @service notifications;
+    @service session;
+    @service currentUser;
+    @service router;
 
-        this.isLoading = true;
+    /** props */
+    @tracked hello;
+    @tracked code;
+    @tracked queryParams = ['hello', 'code'];
 
-        return this.fetch
-            .post('onboard/verify-email', { session: hello, code })
-            .then(({ status, token }) => {
-                if (status === 'ok') {
-                    this.notifications.success('Email successfully verified!');
+    @task *verifyCode() {
+        try {
+            const { status, token } = yield this.fetch.post('onboard/verify-email', { session: this.hello, code: this.code });
+            if (status === 'ok') {
+                this.notifications.success('Email successfully verified!');
 
-                    if (token) {
-                        this.notifications.info('Welcome to Fleetbase!');
-                        this.session.manuallyAuthenticate(token);
+                if (token) {
+                    this.notifications.info('Welcome to Fleetbase!');
+                    this.session.manuallyAuthenticate(token);
 
-                        return this.router.transitionTo('console');
-                    }
-
-                    return this.router.transitionTo('auth.login');
+                    return this.router.transitionTo('console');
                 }
-            })
-            .catch((error) => {
-                this.notifications.serverError(error);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+
+                return this.router.transitionTo('auth.login');
+            }
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 }

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

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

console/app/index.html

@@ -22,7 +22,12 @@
   </head>
   <body>
     {{content-for "body"}}
-
+    <div id="boot-loader" class="overloader">
+      <div class="loader-container">
+        <span class="fleetbase-loader" width="16" height="16"></span>
+        <div class="loading-message">Starting up...</div>
+      </div>
+    </div>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/@fleetbase/console.js"></script>
 

console/app/instance-initializers/load-extensions.js

@@ -1,17 +1,9 @@
-import loadExtensions from '@fleetbase/ember-core/utils/load-extensions';
-
-export function initialize(owner) {
-    const universe = owner.lookup('service:universe');
-
-    loadExtensions().then((extensions) => {
-        extensions.forEach((extension) => {
-            universe.loadEngine(extension.name).then((engineInstance) => {
-                if (engineInstance.base && engineInstance.base.setupExtension) {
-                    engineInstance.base.setupExtension(owner, engineInstance, universe);
-                }
-            });
-        });
-    });
+export function initialize(application) {
+    const universe = application.lookup('service:universe');
+    if (universe) {
+        universe.createRegistries(['@fleetbase/console', 'auth:login']);
+        universe.bootEngines(application);
+    }
 }
 
 export default {

console/app/instance-initializers/load-leaflet.js

@@ -0,0 +1,18 @@
+export function initialize(application) {
+    const leafletService = application.lookup('service:leaflet');
+    if (leafletService) {
+        leafletService.load({
+            onReady: function (L) {
+                // This will prevent the awkward scroll bug produced by Chrome browsers
+                // https://github.com/Leaflet/Leaflet/issues/4125#issuecomment-356289643
+                L.Control.include({
+                    _refocusOnMap: L.Util.falseFn,
+                });
+            },
+        });
+    }
+}
+
+export default {
+    initialize,
+};

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

@@ -1,21 +0,0 @@
-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/chat-attachment.js

@@ -0,0 +1,82 @@
+import Model, { attr, belongsTo } from '@ember-data/model';
+import { getOwner } from '@ember/application';
+import { computed } from '@ember/object';
+import { format as formatDate, 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';
+import config from '@fleetbase/console/config/environment';
+
+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') 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(config.api.host + '/' + config.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 as formatDate, 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 } from '@ember-data/model';
+import { computed } from '@ember/object';
+import { format as formatDate, 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 as formatDate, 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 as formatDate, 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/company.js

@@ -1,5 +1,6 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
+import { getOwner } from '@ember/application';
 import { format, formatDistanceToNow } from 'date-fns';
 import autoSerialize from '../utils/auto-serialize';
 
@@ -34,6 +35,7 @@ export default class Company extends Model {
     @attr('string') slug;
 
     /** @dates */
+    @attr('date') joined_at;
     @attr('date') deleted_at;
     @attr('date') created_at;
     @attr('date') updated_at;
@@ -71,4 +73,32 @@ export default class Company extends Model {
     toJSON() {
         return autoSerialize(this);
     }
+
+    async transferOwnership(newOwner, params = {}) {
+        const owner = getOwner(this);
+        const fetch = owner.lookup('service:fetch');
+
+        return fetch.post('companies/transfer-ownership', { company: this.id, newOwner, ...params });
+    }
+
+    async leave(user = null, params = {}) {
+        const owner = getOwner(this);
+        const fetch = owner.lookup('service:fetch');
+
+        return fetch.post('companies/leave', { company: this.id, user, ...params });
+    }
+
+    async loadUsers(params = {}) {
+        const owner = getOwner(this);
+        const fetch = owner.lookup('service:fetch');
+
+        try {
+            const users = await fetch.get(`companies/${this.id}/users`, { ...params }, { normalizeToEmberData: true, normalizeModelType: 'user' });
+            this.set('users', users);
+            return users;
+        } catch (error) {
+            this.set('users', []);
+            return [];
+        }
+    }
 }

console/app/models/dashboard.js

@@ -83,4 +83,14 @@ export default class DashboardModel extends Model {
             });
         }
     }
+
+    getRegistry() {
+        const owner = getOwner(this);
+        const universe = owner.lookup('service:universe');
+        if (universe) {
+            return universe.getDashboardRegistry(this.id);
+        }
+
+        return undefined;
+    }
 }

console/app/models/file.js

@@ -3,7 +3,7 @@ import { computed } from '@ember/object';
 import { not } from '@ember/object/computed';
 import { getOwner } from '@ember/application';
 import { format, formatDistanceToNow } from 'date-fns';
-import ENV from '@fleetbase/console/config/environment';
+import config from '@fleetbase/console/config/environment';
 import isVideoFile from '@fleetbase/ember-core/utils/is-video-file';
 import isImageFile from '@fleetbase/ember-core/utils/is-image-file';
 
@@ -64,13 +64,13 @@ export default class FileModel extends Model {
 
     /** @methods */
     downloadFromApi() {
-        window.open(ENV.api.host + '/' + ENV.api.namespace + '/files/download?file=' + this.id, '_self');
+        window.open(config.api.host + '/' + config.api.namespace + '/files/download?file=' + this.id, '_self');
     }
 
     download() {
         const owner = getOwner(this);
-        const fetch = owner.lookup(`service:store`);
+        const fetch = owner.lookup('service:fetch');
 
-        return fetch.download('files/download', { file: this.id });
+        return fetch.download('files/download', { file: this.id }, { fileName: this.original_filename, mimeType: this.content_type });
     }
 }

console/app/models/permission.js

@@ -1,5 +1,6 @@
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
+import { capitalize } from '@ember/string';
 import { pluralize } from 'ember-inflector';
 import { format, formatDistanceToNow } from 'date-fns';
 import humanize from '@fleetbase/ember-core/utils/humanize';
@@ -26,14 +27,27 @@ export const getPermissionResource = function (permissionName) {
     return parserPermissionName(permissionName, 2);
 };
 
-const lowercase = function (string) {
-    let words = string.split(' ');
-    words[0] = words[0].toLowerCase();
-    return words.join(' ');
+const titleize = function (string = '') {
+    if (typeof string !== 'string') {
+        return '';
+    }
+    return humanize(string)
+        .split(' ')
+        .map((w) => capitalize(w))
+        .join(' ');
 };
 
-const titleize = function (string) {
-    return lowercase(humanize(string));
+const smartTitleize = function (string = '') {
+    if (typeof string !== 'string') {
+        return '';
+    }
+
+    let titleized = titleize(string);
+    if (titleized === 'Iam') {
+        titleized = titleized.toUpperCase();
+    }
+
+    return titleized;
 };
 
 /**
@@ -49,6 +63,7 @@ export default class PermissionModel extends Model {
     /** @attributes */
     @attr('string') name;
     @attr('string') guard_name;
+    @attr('string') service;
 
     /** @dates */
     @attr('date') created_at;
@@ -59,6 +74,7 @@ export default class PermissionModel extends Model {
         return {
             name: this.name,
             guard_name: this.guard_name,
+            service: this.service,
             created_at: this.created_at,
             updated_at: this.updated_at,
         };
@@ -80,6 +96,10 @@ export default class PermissionModel extends Model {
             return 'do anything';
         }
 
+        if (action === 'see') {
+            return 'Visibly See';
+        }
+
         return titleize(action);
     }
 
@@ -90,9 +110,9 @@ export default class PermissionModel extends Model {
     @computed('actionName', 'name', 'resourceName', 'extensionName') get description() {
         let actionName = this.actionName;
         let actionPreposition = 'to';
-        let resourceName = pluralize(humanize(this.resourceName));
+        let resourceName = pluralize(smartTitleize(this.resourceName));
         let resourcePreposition = getPermissionAction(this.name) === '*' && resourceName ? 'with' : '';
-        let extensionName = humanize(this.extensionName);
+        let extensionName = smartTitleize(this.extensionName);
         let extensionPreposition = 'on';
         let descriptionParts = ['Permission', actionPreposition, actionName, resourcePreposition, resourceName, extensionPreposition, extensionName];
 

console/app/models/policy.js

@@ -12,6 +12,7 @@ export default class PolicyModel extends Model {
     /** @attributes */
     @attr('string') name;
     @attr('string') type;
+    @attr('string') service;
     @attr('string') guard_name;
     @attr('string') description;
     @attr('boolean') is_mutable;

console/app/models/role.js

@@ -14,6 +14,10 @@ export default class RoleModel extends Model {
     @attr('string') name;
     @attr('string') guard_name;
     @attr('string') description;
+    @attr('string') service;
+    @attr('string') type;
+    @attr('boolean') is_mutable;
+    @attr('boolean') is_deletable;
 
     /** @dates */
     @attr('date') created_at;

console/app/models/user.js

@@ -1,4 +1,5 @@
-import Model, { attr } from '@ember-data/model';
+import { set } from '@ember/object';
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { computed, get } from '@ember/object';
 import { not } from '@ember/object/computed';
 import { getOwner } from '@ember/application';
@@ -23,16 +24,28 @@ export default class UserModel extends Model {
     @attr('string') country;
     @attr('string') ip_address;
     @attr('string') slug;
+    @attr('string') role_name;
     @attr('string') type;
     @attr('string') session_status;
     @attr('string') status;
+    @attr('string') locale;
+    @attr('boolean') is_online;
     @attr('boolean') is_admin;
-    @attr('raw') types;
+    @attr('boolean') is_subscribed;
+    @attr('boolean') is_trialing;
     @attr('raw') meta;
+    @attr('raw') subscription;
+
+    /** @relationships */
+    @belongsTo('role') role;
+    @hasMany('policy') policies;
+    @hasMany('permission') permissions;
 
     /** @dates */
+    @attr('date') last_seen_at;
     @attr('date') phone_verified_at;
     @attr('date') email_verified_at;
+    @attr('date') trial_ends_at;
     @attr('date') last_login;
     @attr('date') deleted_at;
     @attr('date') created_at;
@@ -41,7 +54,7 @@ export default class UserModel extends Model {
     /** @methods */
     deactivate() {
         const owner = getOwner(this);
-        const fetch = owner.lookup(`service:fetch`);
+        const fetch = owner.lookup('service:fetch');
 
         return fetch.patch(`users/deactivate/${this.id}`).then((response) => {
             this.session_status = 'inactive';
@@ -52,7 +65,7 @@ export default class UserModel extends Model {
 
     activate() {
         const owner = getOwner(this);
-        const fetch = owner.lookup(`service:fetch`);
+        const fetch = owner.lookup('service:fetch');
 
         return fetch.patch(`users/activate/${this.id}`).then((response) => {
             this.session_status = 'active';
@@ -61,29 +74,85 @@ export default class UserModel extends Model {
         });
     }
 
+    verify() {
+        const owner = getOwner(this);
+        const fetch = owner.lookup('service:fetch');
+
+        return fetch.patch(`users/verify/${this.id}`).then((response) => {
+            set(this, 'email_verified_at', response.email_verified_at);
+
+            return response;
+        });
+    }
+
     removeFromCurrentCompany() {
         const owner = getOwner(this);
-        const fetch = owner.lookup(`service:fetch`);
+        const fetch = owner.lookup('service:fetch');
 
         return fetch.delete(`users/remove-from-company/${this.id}`);
     }
 
     resendInvite() {
         const owner = getOwner(this);
-        const fetch = owner.lookup(`service:fetch`);
+        const fetch = owner.lookup('service:fetch');
 
         return fetch.post(`users/resend-invite`, { user: this.id });
     }
 
+    getPermissions() {
+        const permissions = [];
+
+        // get direct applied permissions
+        if (this.get('permissions')) {
+            permissions.pushObjects(this.get('permissions').toArray());
+        }
+
+        // get role permissions and role policies permissions
+        if (this.get('role')) {
+            if (this.get('role.permissions')) {
+                permissions.pushObjects(this.get('role.permissions').toArray());
+            }
+
+            if (this.get('role.policies')) {
+                for (let i = 0; i < this.get('role.policies').length; i++) {
+                    const policy = this.get('role.policies').objectAt(i);
+                    if (policy.get('permissions')) {
+                        permissions.pushObjects(policy.get('permissions').toArray());
+                    }
+                }
+            }
+        }
+
+        // get direct applied policy permissions
+        if (this.get('policies')) {
+            for (let i = 0; i < this.get('policies').length; i++) {
+                const policy = this.get('policies').objectAt(i);
+                if (policy.get('permissions')) {
+                    permissions.pushObjects(policy.get('permissions').toArray());
+                }
+            }
+        }
+
+        return permissions;
+    }
+
     /** @computed */
     @not('isEmailVerified') emailIsNotVerified;
     @not('isPhoneVerified') phoneIsNotVerified;
 
     /** @computed */
+    get allPermissions() {
+        return this.getPermissions();
+    }
+
     @computed('meta.two_factor_enabled') get isTwoFactorEnabled() {
         return this.meta && this.meta.two_factor_enabled;
     }
 
+    @computed('is_admin') get isAdmin() {
+        return this.is_admin === true;
+    }
+
     @computed('types') get typesList() {
         const types = Array.from(this.types);
         return types.join(', ');
@@ -98,34 +167,52 @@ export default class UserModel extends Model {
     }
 
     @computed('last_login') get lastLogin() {
-        if (!this.last_login || !isValid(new Date(this.last_login))) {
+        if (!this.last_login || !isValid(this.last_login)) {
             return 'Never';
         }
 
-        return format(new Date(this.last_login), 'PP');
+        return format(this.last_login, 'PP p');
     }
 
     @computed('updated_at') get updatedAgo() {
+        if (!isValid(this.updated_at)) {
+            return '-';
+        }
         return formatDistanceToNow(this.updated_at);
     }
 
     @computed('updated_at') get updatedAt() {
+        if (!isValid(this.updated_at)) {
+            return '-';
+        }
         return format(this.updated_at, 'PPP p');
     }
 
     @computed('updated_at') get updatedAtShort() {
+        if (!isValid(this.updated_at)) {
+            return '-';
+        }
         return format(this.updated_at, 'PP');
     }
 
     @computed('created_at') get createdAgo() {
+        if (!isValid(this.created_at)) {
+            return '-';
+        }
         return formatDistanceToNow(this.created_at);
     }
 
     @computed('created_at') get createdAt() {
+        if (!isValid(this.created_at)) {
+            return '-';
+        }
         return format(this.created_at, 'PPP p');
     }
 
     @computed('created_at') get createdAtShort() {
+        if (!isValid(this.created_at)) {
+            return '-';
+        }
         return format(this.created_at, 'PP');
     }
 }

console/app/router.js

@@ -7,15 +7,18 @@ export default class Router extends EmberRouter {
 }
 
 Router.map(function () {
+    this.route('virtual', { path: '/:slug' });
+    this.route('install');
+    this.route('onboard', function () {
+        this.route('verify-email');
+    });
     this.route('auth', function () {
         this.route('login', { path: '/' });
         this.route('forgot-password');
         this.route('reset-password', { path: '/reset-password/:id' });
         this.route('two-fa');
         this.route('verification');
-    });
-    this.route('onboard', function () {
-        this.route('verify-email');
+        this.route('portal-login', { path: '/portal' });
     });
     this.route('invite', { path: 'join' }, function () {
         this.route('for-driver', { path: '/fleet/:public_id' });
@@ -23,24 +26,23 @@ Router.map(function () {
     });
     this.route('console', { path: '/' }, function () {
         this.route('home', { path: '/' });
-        this.route('extensions');
         this.route('notifications');
         this.route('account', function () {
-            this.route('virtual', { path: '/:slug/:view' });
+            this.route('virtual', { path: '/:slug' });
             this.route('auth');
         });
         this.route('settings', function () {
-            this.route('virtual', { path: '/:slug/:view' });
+            this.route('virtual', { path: '/:slug' });
             this.route('two-fa');
         });
-        this.route('virtual', { path: '/:slug/:view' });
+        this.route('virtual', { path: '/:slug' });
         this.route('admin', function () {
             this.route('config', function () {
                 this.route('database');
                 this.route('cache');
                 this.route('filesystem');
                 this.route('mail');
-                this.route('notification-channels');
+                this.route('notification-channels', { path: '/push-notifications' });
                 this.route('queue');
                 this.route('services');
                 this.route('socket');
@@ -48,12 +50,16 @@ Router.map(function () {
             this.route('branding');
             this.route('notifications');
             this.route('two-fa-settings');
-            this.route('virtual', { path: '/:slug/:view' });
+            this.route('virtual', { path: '/:slug' });
             this.route('organizations', function () {
-                this.route('index', { path: '/' });
-                this.route('users', { path: '/:company_id' });
+                this.route('index', { path: '/' }, function () {
+                    this.route('users', { path: '/:public_id/users' });
+                });
+            });
+            this.route('schedule-monitor', function () {
+                this.route('logs', { path: '/:id/logs' });
             });
         });
     });
-    this.route('install');
+    this.route('catch', { path: '/*' });
 });

console/app/routes/application.js

@@ -1,8 +1,10 @@
 import Route from '@ember/routing/route';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 import isElectron from '@fleetbase/ember-core/utils/is-electron';
 import pathToRoute from '@fleetbase/ember-core/utils/path-to-route';
+import removeBootLoader from '../utils/remove-boot-loader';
 
 export default class ApplicationRoute extends Route {
     @service session;
@@ -11,9 +13,41 @@ export default class ApplicationRoute extends Route {
     @service urlSearchParams;
     @service modalsManager;
     @service intl;
+    @service currentUser;
     @service router;
+    @service universe;
     @tracked defaultTheme;
 
+    /**
+     * Handle the transition into the application.
+     *
+     * @memberof ApplicationRoute
+     */
+    @action willTransition(transition) {
+        this.universe.callHooks('application:will-transition', this.session, this.router, transition);
+    }
+
+    /**
+     * On application route activation
+     *
+     * @memberof ApplicationRoute
+     * @void
+     */
+    @action activate() {
+        this.initializeTheme();
+        this.initializeLocale();
+    }
+
+    /**
+     * The application loading event.
+     * Here will just run extension hooks.
+     *
+     * @memberof ApplicationRoute
+     */
+    @action loading(transition) {
+        this.universe.callHooks('application:loading', this.session, this.router, transition);
+    }
+
     /**
      * Check the installation status of Fleetbase and transition user accordingly.
      *
@@ -43,24 +77,38 @@ export default class ApplicationRoute extends Route {
      * @return {Transition}
      * @memberof ApplicationRoute
      */
-    async beforeModel() {
+    async beforeModel(transition) {
         await this.session.setup();
+        await this.universe.booting();
+
+        this.universe.callHooks('application:before-model', this.session, this.router, transition);
 
-        const { isAuthenticated } = this.session;
         const shift = this.urlSearchParams.get('shift');
-
-        if (isAuthenticated && shift) {
+        if (this.session.isAuthenticated && shift) {
             return this.router.transitionTo(pathToRoute(shift));
         }
     }
 
     /**
-     * On application route activation
+     * Remove boot loader if not authenticated.
      *
      * @memberof ApplicationRoute
-     * @void
      */
-    activate() {
+    afterModel() {
+        if (!this.session.isAuthenticated) {
+            removeBootLoader();
+        }
+    }
+
+    /**
+     * Initializes the application's theme settings, applying necessary class names and default theme configurations.
+     *
+     * This method prepares the theme by setting up an array of class names that should be applied to the
+     * application's body element. If the application is running inside an Electron environment, it adds the
+     * `'is-electron'` class to the array. It then calls the `initialize` method of the `theme` service,
+     * passing in the `bodyClassNames` array and the `defaultTheme` configuration.
+     */
+    initializeTheme() {
         const bodyClassNames = [];
 
         if (isElectron()) {
@@ -68,7 +116,18 @@ export default class ApplicationRoute extends Route {
         }
 
         this.theme.initialize({ bodyClassNames, theme: this.defaultTheme });
-        this.intl.setLocale(['en-us']);
+    }
+
+    /**
+     * Initializes the application's locale settings based on the current user's preferences.
+     *
+     * This method retrieves the user's preferred locale using the `getOption` method from the `currentUser` service.
+     * If no locale is set by the user, it defaults to `'en-us'`. It then sets the application's locale by calling
+     * the `setLocale` method of the `intl` service with the retrieved locale.
+     */
+    initializeLocale() {
+        const locale = this.currentUser.getOption('locale', 'en-us');
+        this.intl.setLocale([locale]);
     }
 
     /**

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

@@ -1,10 +1,9 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
 export default class AuthForgotPasswordRoute extends Route {
-    @service store;
-
-    model() {
-        return this.store.findRecord('brand', 1);
-    }
+    queryParams = {
+        email: {
+            refreshModel: false,
+        },
+    };
 }

console/app/routes/auth/login.js

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 
 export default class AuthLoginRoute extends Route {
     @service session;
+    @service universe;
 
     /**
      * If user is authentication redirect to console.
@@ -10,7 +11,8 @@ export default class AuthLoginRoute extends Route {
      * @memberof AuthLoginRoute
      * @void
      */
-    beforeModel() {
+    beforeModel(transition) {
         this.session.prohibitAuthentication('console');
+        return this.universe.virtualRouteRedirect(transition, 'auth:login', 'virtual', { restoreQueryParams: true });
     }
 }

console/app/routes/auth/verification.js

@@ -11,6 +11,12 @@ export default class AuthVerificationRoute extends Route {
             refreshModel: false,
             replace: true,
         },
+        code: {
+            refreshModel: false,
+        },
+        hello: {
+            refreshModel: false,
+        },
     };
 
     beforeModel(transition) {

console/app/routes/catch.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class CatchRoute extends Route {
+    @service router;
+
+    beforeModel() {
+        return this.router.transitionTo('auth.login');
+    }
+}

console/app/routes/console.js

@@ -1,43 +1,16 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import removeBootLoader from '../utils/remove-boot-loader';
 import '@fleetbase/leaflet-routing-machine';
 
 export default class ConsoleRoute extends Route {
-    /**
-     * Inject the `store` service
-     *
-     * @var {Service}
-     */
     @service store;
-
-    /**
-     * Inject the `fetch` service
-     *
-     * @var {Service}
-     */
-    @service fetch;
-
-    /**
-     * Inject the `session` service
-     *
-     * @var {Service}
-     */
     @service session;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
-    @service intl;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @var {Service}
-     */
+    @service universe;
+    @service router;
     @service currentUser;
+    @service intl;
 
     /**
      * Require authentication to access all `console` routes.
@@ -46,10 +19,35 @@ export default class ConsoleRoute extends Route {
      * @return {Promise}
      * @memberof ConsoleRoute
      */
-    @action async beforeModel(transition) {
-        this.session.requireAuthentication(transition, 'auth.login');
+    async beforeModel(transition) {
+        await this.session.requireAuthentication(transition, 'auth.login');
 
-        return this.session.promiseCurrentUser(transition);
+        this.universe.callHooks('console:before-model', this.session, this.router, transition);
+
+        if (this.session.isAuthenticated) {
+            return this.session.promiseCurrentUser(transition);
+        }
+    }
+
+    /**
+     * Register after model hook.
+     *
+     * @param {DS.Model} model
+     * @param {Transition} transition
+     * @memberof ConsoleRoute
+     */
+    async afterModel(model, transition) {
+        this.universe.callHooks('console:after-model', this.session, this.router, model, transition);
+        removeBootLoader();
+    }
+
+    /**
+     * Route did complete transition.
+     *
+     * @memberof ConsoleRoute
+     */
+    @action didTransition() {
+        this.universe.callHooks('console:did-transition', this.session, this.router);
     }
 
     /**
@@ -61,54 +59,4 @@ export default class ConsoleRoute extends Route {
     model() {
         return this.store.findRecord('brand', 1);
     }
-
-    /**
-     * We will use this hook to preload engines
-     *
-     * @void
-     */
-    @action afterModel() {
-        this.fetchSessionInfo();
-    }
-
-    /**
-     * We will use this hook to setup controller and more
-     *
-     * @void
-     */
-    @action setupController(controller, model) {
-        super.setupController(controller, model);
-
-        // Get and set user locale
-        this.fetch.get('users/locale').then(({ locale }) => {
-            this.intl.setLocale(locale);
-        });
-
-        // Get user organizations
-        this.fetch.get('auth/organizations').then((organizations) => {
-            this.currentUser.setOption('organizations', organizations);
-            controller.organizations = organizations;
-        });
-    }
-
-    /**
-     * Use this hook to fetch user related queries
-     *
-     * @void
-     */
-    @action fetchSessionInfo() {
-        this.fetch.shouldResetCache();
-        this.fetch
-            .cachedGet(
-                'lookup/whois',
-                {},
-                {
-                    expirationInterval: 60,
-                    expirationIntervalUnit: 'minutes',
-                }
-            )
-            .then((whois) => {
-                this.currentUser.setOption('whois', whois);
-            });
-    }
 }

console/app/routes/console/account/organizations.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ConsoleAccountOrganizationsRoute extends Route {
+    @service currentUser;
+
+    model() {
+        return this.currentUser.loadOrganizations();
+    }
+}

console/app/routes/console/account/virtual.js

@@ -4,7 +4,14 @@ import { inject as service } from '@ember/service';
 export default class ConsoleAccountVirtualRoute extends Route {
     @service universe;
 
-    model({ slug, view }) {
-        return this.universe.lookupMenuItemFromRegistry('account', slug, view);
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
+        return this.universe.lookupMenuItemFromRegistry('console:account', slug, view);
     }
 }

console/app/routes/console/admin.js

@@ -7,8 +7,7 @@ export default class ConsoleAdminRoute extends Route {
     @service router;
 
     beforeModel() {
-        // USER MUST BE ADMIN
-        if (!this.currentUser.user.is_admin) {
+        if (!this.currentUser.isAdmin) {
             return this.router.transitionTo('console').then(() => {
                 this.notifications.error('You do not have authorization to access admin!');
             });

console/app/routes/console/admin/virtual.js

@@ -4,7 +4,14 @@ import { inject as service } from '@ember/service';
 export default class ConsoleAdminVirtualRoute extends Route {
     @service universe;
 
-    model({ slug, view }) {
-        return this.universe.lookupMenuItemFromRegistry('admin', slug, view);
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
+        return this.universe.lookupMenuItemFromRegistry('console:admin', slug, view);
     }
 }

console/app/routes/console/extensions.js

@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ConsoleExtensionsRoute extends Route {}

console/app/routes/console/settings/virtual.js

@@ -4,7 +4,14 @@ import { inject as service } from '@ember/service';
 export default class ConsoleSettingsVirtualRoute extends Route {
     @service universe;
 
-    model({ slug, view }) {
-        return this.universe.lookupMenuItemFromRegistry('settings', slug, view);
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
+        return this.universe.lookupMenuItemFromRegistry('console:settings', slug, view);
     }
 }

console/app/routes/console/virtual.js

@@ -4,7 +4,14 @@ import { inject as service } from '@ember/service';
 export default class ConsoleVirtualRoute extends Route {
     @service universe;
 
-    model({ slug, view }) {
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
         return this.universe.lookupMenuItemFromRegistry('console', slug, view);
     }
 }

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

@@ -1,3 +1,12 @@
 import Route from '@ember/routing/route';
 
-export default class OnboardVerifyEmailRoute extends Route {}
+export default class OnboardVerifyEmailRoute extends Route {
+    queryParams = {
+        code: {
+            refreshModel: false,
+        },
+        hello: {
+            refreshModel: false,
+        },
+    };
+}

console/app/routes/virtual.js

@@ -0,0 +1,17 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class VirtualRoute extends Route {
+    @service universe;
+
+    queryParams = {
+        view: {
+            refreshModel: true,
+        },
+    };
+
+    model({ slug }, transition) {
+        const view = this.universe.getViewFromTransition(transition);
+        return this.universe.lookupMenuItemFromRegistry('auth:login', slug, view);
+    }
+}

console/app/serializers/chat-channel.js

@@ -0,0 +1,59 @@
+import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+import { getOwner } from '@ember/application';
+import { isArray } from '@ember/array';
+
+export default class ChatChannelSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            participants: { embedded: 'always' },
+            last_message: { embedded: 'always' },
+        };
+    }
+
+    serialize(snapshot) {
+        let json = {
+            name: snapshot.attr('name'),
+            meta: snapshot.attr('meta'),
+        };
+
+        return json;
+    }
+
+    normalize(typeClass, hash) {
+        if (isArray(hash.feed)) {
+            hash.feed = this.serializeFeed(hash.feed);
+        }
+
+        return super.normalize(...arguments);
+    }
+
+    serializeFeed(feed = []) {
+        return feed.map((item) => this.serializeItem(item)).sortBy('created_at');
+    }
+
+    serializeItem(item) {
+        switch (item.type) {
+            case 'message':
+                return { ...item, record: this.serializeItemType('chat-message', item.data) };
+            case 'log':
+                return { ...item, record: this.serializeItemType('chat-log', item.data) };
+            case 'attachment':
+                return { ...item, record: this.serializeItemType('chat-attachment', item.data) };
+            default:
+                return null;
+        }
+    }
+
+    serializeItemType(modelType, data) {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+        const normalized = store.normalize(modelType, data);
+        return store.push(normalized);
+    }
+}

console/app/serializers/chat-message.js

@@ -0,0 +1,17 @@
+import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+
+export default class ChatMessageSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            sender: { embedded: 'always' },
+            attachments: { embedded: 'always' },
+            receipts: { embedded: 'always' },
+        };
+    }
+}

console/app/serializers/chat-participant.js

@@ -0,0 +1,3 @@
+import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+
+export default class ChatParticipantSerializer extends ApplicationSerializer {}

console/app/serializers/user.js

@@ -1,6 +1,20 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+
+export default class UserSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            role: { serialize: 'ids', deserialize: 'records' },
+            policies: { serialize: 'ids', deserialize: 'records' },
+            permissions: { serialize: 'ids', deserialize: 'records' },
+        };
+    }
 
-export default class UserSerializer extends ApplicationSerializer {
     /**
      * Customize serializer so that the password is never sent to the server via Ember Data
      *
@@ -13,6 +27,14 @@ export default class UserSerializer extends ApplicationSerializer {
 
         // delete the password always
         delete json.password;
+        // delete verification attributes
+        delete json.email_verified_at;
+        delete json.phone_verified_at;
+
+        // delete server managed dates
+        delete json.deleted_at;
+        delete json.created_at;
+        delete json.updated_at;
 
         return json;
     }

console/app/services/dashboard.js

@@ -1,255 +0,0 @@
-import Service from '@ember/service';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency-decorators';
-import { action } from '@ember/object';
-import { isArray } from '@ember/array';
-
-/**
- * Service for managing dashboards, including loading, creating, and deleting dashboards, as well as managing the current dashboard and widget states.
- * Utilizes Ember services such as `store`, `fetch`, `notifications`, and `universe` for data management and user interaction.
- *
- * @extends Service
- */
-export default class DashboardService extends Service {
-    /**
-     * Ember Data store service for managing model data.
-     * @type {Service}
-     */
-    @service store;
-
-    /**
-     * Fetch service for making network requests.
-     * @type {Service}
-     */
-    @service fetch;
-
-    /**
-     * Notifications service for displaying user notifications.
-     * @type {Service}
-     */
-    @service notifications;
-
-    /**
-     * Universe service for accessing global application state or utility methods.
-     * @type {Service}
-     */
-    @service universe;
-
-    /**
-     * Internationalization service.
-     * @type {Service}
-     */
-    @service intl;
-
-    /**
-     * Tracked array of available dashboards.
-     * @type {Array}
-     */
-    @tracked dashboards = [];
-
-    /**
-     * Tracked property representing the currently selected dashboard.
-     * @type {Object}
-     */
-    @tracked currentDashboard;
-
-    /**
-     * Tracked boolean indicating if the dashboard is in editing mode.
-     * @type {boolean}
-     */
-    @tracked isEditingDashboard = false;
-
-    /**
-     * Tracked boolean indicating if a widget is being added.
-     * @type {boolean}
-     */
-    @tracked isAddingWidget = false;
-
-    /**
-     * Task for loading dashboards from the store. It sets the current dashboard and checks if adding widget is necessary.
-     */
-    @task *loadDashboards() {
-        const dashboards = yield this.store.findAll('dashboard');
-
-        if (isArray(dashboards)) {
-            this.dashboards = dashboards.toArray();
-
-            // insert default dashboard if it's not loaded
-            const defaultDashboard = this._createDefaultDashboard();
-            if (this._isDefaultDashboardNotLoaded()) {
-                this.dashboards.unshiftObject(defaultDashboard);
-            }
-
-            // Set the current dashboard
-            this.currentDashboard = this._getNextDashboard();
-            if (this.currentDashboard && this.currentDashboard.widgets.length === 0) {
-                this.onAddingWidget(true);
-            }
-        }
-    }
-
-    /**
-     * Task for selecting a dashboard. Handles dashboard switching and updates the current dashboard.
-     * @param {Object} dashboard - The dashboard object to select.
-     */
-    @task *selectDashboard(dashboard) {
-        if (dashboard.user_uuid === 'system') {
-            this.currentDashboard = dashboard;
-            yield this.fetch.post('dashboards/reset-default');
-            return;
-        }
-
-        const currentDashboard = yield this.fetch.post('dashboards/switch', { dashboard_uuid: dashboard.id }, { normalizeToEmberData: true }).catch((error) => {
-            this.notifications.serverError(error);
-        });
-
-        if (currentDashboard) {
-            this.currentDashboard = currentDashboard;
-        }
-    }
-
-    /**
-     * Task for creating a new dashboard. It handles dashboard creation, success notification, and dashboard selection.
-     * @param {string} name - Name of the new dashboard.
-     */
-    @task *createDashboard(name) {
-        const dashboardRecord = this.store.createRecord('dashboard', { name, is_default: true });
-        const dashboard = yield dashboardRecord.save().catch((error) => {
-            this.notifications.serverError(error);
-        });
-
-        if (dashboard) {
-            this.notifications.success(this.intl.t('services.dashboard-service.create-dashboard-success-notification', { dashboardName: dashboard.name }));
-            this.selectDashboard.perform(dashboard);
-            this.dashboards.pushObject(dashboard);
-        }
-    }
-
-    /**
-     * Task for deleting a dashboard. Handles dashboard deletion and success notification.
-     * @param {Object} dashboard - The dashboard object to delete.
-     * @param {Object} [options={}] - Optional configuration options.
-     */
-    @task *deleteDashboard(dashboard, options = {}) {
-        yield dashboard.destroyRecord().catch((error) => {
-            this.notification.serverError(error);
-
-            if (typeof options.onError === 'function') {
-                options.onError(error, dashboard);
-            }
-        });
-
-        this.notifications.success(this.intl.t('services.dashboard-service.delete-dashboard-success-notification', { dashboardName: dashboard.name }));
-        yield this.loadDashboards.perform();
-        yield this.selectDashboard.perform(this._getNextDashboard());
-
-        if (typeof options.callback === 'function') {
-            options.callback(this.currentDashboard);
-        }
-    }
-
-    /**
-     * Task for setting the current dashboard.
-     * @param {Object} dashboard - The dashboard object to set as current.
-     */
-    @task *setCurrentDashboard(dashboard) {
-        const currentDashboard = yield this.fetch.post('dashboards/switch', { dashboard_uuid: dashboard.id }, { normalizeToEmberData: true }).catch((error) => {
-            this.notifications.serverError(error);
-        });
-
-        if (currentDashboard) {
-            this.currentDashboard = currentDashboard;
-        }
-    }
-
-    /**
-     * Action to toggle dashboard editing state.
-     * @param {boolean} [state=true] - State to set for editing.
-     */
-    @action onChangeEdit(state = true) {
-        this.isEditingDashboard = state;
-    }
-
-    /**
-     * Action to toggle the state of adding a widget.
-     * @param {boolean} [state=true] - State to set for adding a widget.
-     */
-    @action onAddingWidget(state = true) {
-        this.isAddingWidget = state;
-    }
-
-    /**
-     * Creates a default dashboard with predefined widgets.
-     * @private
-     * @returns {Object} The default dashboard object.
-     */
-    _createDefaultDashboard() {
-        let defaultDashboard;
-
-        // check store for default dashboard
-        const loadedDashboars = this.store.peekAll('dashboard');
-
-        // check for default dashboard loaded in store
-        defaultDashboard = loadedDashboars.find((dashboard) => dashboard.id === 'system');
-        if (defaultDashboard) {
-            return defaultDashboard;
-        }
-
-        // create new default dashboard
-        defaultDashboard = this.store.createRecord('dashboard', {
-            id: 'system',
-            uuid: 'system',
-            name: 'Default Dashboard',
-            is_default: false,
-            user_uuid: 'system',
-            widgets: this._createDefaultDashboardWidgets(),
-        });
-
-        return defaultDashboard;
-    }
-
-    /**
-     * Creates default widgets for the default dashboard.
-     * @private
-     * @returns {Array} An array of default dashboard widgets.
-     */
-    _createDefaultDashboardWidgets() {
-        const widgets = this.universe.getDefaultDashboardWidgets().map((defaultWidget) => {
-            return this.store.createRecord('dashboard-widget', defaultWidget);
-        });
-
-        return widgets;
-    }
-
-    /**
-     * Checks if default dashboard is already loaded.
-     * @private
-     * @return {Boolean}
-     * @memberof DashboardService
-     */
-    _isDefaultDashboardLoaded() {
-        const defaultDashboard = this._createDefaultDashboard();
-        return this.dashboards.some((dashboard) => dashboard.id === defaultDashboard.id);
-    }
-
-    /**
-     * Checks if default dashboard is not already loaded.
-     * @private
-     * @return {Boolean}
-     * @memberof DashboardService
-     */
-    _isDefaultDashboardNotLoaded() {
-        return !this._isDefaultDashboardLoaded();
-    }
-
-    /**
-     * Gets the current dasbhoard or next available dashboard.
-     *
-     * @return {DashboardModel}
-     * @memberof DashboardService
-     */
-    _getNextDashboard() {
-        return this.dashboards.find((dashboard) => dashboard.is_default) || this.dashboards[0];
-    }
-}

console/app/styles/console.css

@@ -13,16 +13,6 @@ body[data-theme='dark'] .two-fa-enforcement-alert button#two-fa-setup-button.btn
     cursor: default;
 }
 
-.app-version-in-nav {
-    display: flex;
-    align-items: center;
-    font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
-    font-size: 0.8rem;
-    line-height: 1rem;
-    padding-left: 1rem;
-    padding-top: 0.2rem;
-}
-
 .fleetbase-pagination-meta-info-wrapper.within-layout-section-header {
     display: flex;
     flex-direction: row;
@@ -48,3 +38,32 @@ body[data-theme='dark'] .two-fa-enforcement-alert button#two-fa-setup-button.btn
 body.console-admin-organizations-index-index .next-table-wrapper > table {
     table-layout: auto;
 }
+
+#boot-loader {
+    position: absolute;
+    z-index: 9999999999;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+}
+
+#boot-loader > .loader-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+}
+
+#boot-loader > .loader-container > .loading-message {
+    margin-left: 0.5rem;
+    font-weight: 600;
+    font-size: 0.875rem;
+}
+
+body[data-theme='dark'] #boot-loader > .loader-container > .loading-message {
+    color: #fff;
+}

console/app/templates/application.hbs

@@ -1,4 +1,5 @@
 {{page-title (t "app.name")}}
 <ModalsContainer />
 <NotificationContainer @position="top" @zindex="99999" />
+<div id="application-root-wormhole"></div>
 {{outlet}}

console/app/templates/auth/forgot-password.hbs

@@ -1,42 +1,56 @@
 <div class="bg-white dark:bg-gray-800 py-8 px-4 shadow rounded-lg">
     <div class="mb-4">
-        <Image src={{@model.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} width="160" height="56" class="w-40 h-14 mx-auto" />
+        <LinkTo @route="console" class="flex items-center justify-center">
+            <LogoIcon @size="12" class="rounded-md" />
+        </LinkTo>
         <h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
             {{if this.isSent (t "auth.forgot-password.is-sent.title") (t "auth.forgot-password.not-sent.title")}}
         </h2>
     </div>
 
     {{#if this.isSent}}
-        <div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-green-200">
-            <div>
-                <FaIcon @icon="check-circle" @size="lg" class="text-green-900 mr-4" />
-            </div>
-            <p class="flex-1 text-sm text-green-900 dark:text-green-900">
+        <InfoBlock @type="success" @icon="info-circle" @iconSize="lg" @iconClass="mt-1" class="my-6">
+            <p>
                 {{t "auth.forgot-password.is-sent.message" htmlSafe=true}}
             </p>
+        </InfoBlock>
+        <div class="flex flex-row">
+            <Button @icon="check" @type="primary" @text={{t "common.continue"}} @onClick={{transition-to "auth.login"}} />
         </div>
     {{else}}
-        <div class="flex px-3 py-2 mb-6 rounded-md shadow-sm bg-blue-200">
-            <div>
-                <FaIcon @icon="info-circle" @size="lg" class="text-blue-900 mr-4" />
-            </div>
-            <p class="flex-1 text-sm text-blue-900 dark:text-blue-900">
+        <InfoBlock @icon="info-circle" @iconSize="lg" @iconClass="mt-1" class="my-6">
+            <p>
                 {{t "auth.forgot-password.not-sent.message" htmlSafe=true appName=(t "app.name")}}
             </p>
-        </div>
+        </InfoBlock>
 
-        <form class="space-y-6" {{on "submit" this.sendSecureLink}}>
+        <form class="space-y-6" {{on "submit" (perform this.sendSecureLink)}}>
             <div>
                 <label for="email" class="block text-sm font-medium text-gray-700 dark:text-gray-50">
                     {{t "auth.forgot-password.form.email-label"}}
                 </label>
                 <div class="mt-2">
-                    <Input @value={{this.email}} @type="email" id="email" name="email" required class="form-input form-input-lg w-full" placeholder={{t "auth.forgot-password.form.email-label"}} />
+                    <Input
+                        @value={{this.email}}
+                        @type="email"
+                        id="email"
+                        name="email"
+                        required
+                        class="form-input form-input-lg w-full"
+                        placeholder={{t "auth.forgot-password.form.email-label"}}
+                    />
                 </div>
             </div>
 
             <div class="flex flex-row space-x-2">
-                <Button @icon="magic" @type="primary" @buttonType="submit" @text={{t "auth.forgot-password.form.submit-button"}} @onClick={{this.sendSecureLink}} @isLoading={{this.isLoading}} />
+                <Button
+                    @icon="magic"
+                    @type="primary"
+                    @buttonType="submit"
+                    @text={{t "auth.forgot-password.form.submit-button"}}
+                    @onClick={{perform this.sendSecureLink}}
+                    @isLoading={{this.sendSecureLink.isRunning}}
+                />
                 <Button @buttonType="button" @text={{t "auth.forgot-password.form.nevermind-button"}} @onClick={{fn (transition-to "auth.login")}} @disabled={{this.isLoading}} />
             </div>
         </form>