diff --git a/api/app/Http/Kernel.php b/api/app/Http/Kernel.php
index 4f18062a..13591a65 100644
--- a/api/app/Http/Kernel.php
+++ b/api/app/Http/Kernel.php
@@ -40,7 +40,6 @@ class Kernel extends HttpKernel
],
'api' => [
- // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
'throttle:api',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
diff --git a/api/app/Providers/RouteServiceProvider.php b/api/app/Providers/RouteServiceProvider.php
index df99802d..71e6923d 100644
--- a/api/app/Providers/RouteServiceProvider.php
+++ b/api/app/Providers/RouteServiceProvider.php
@@ -2,10 +2,8 @@
namespace App\Providers;
-use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Http\Request;
-use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
@@ -17,17 +15,15 @@ class RouteServiceProvider extends ServiceProvider
*/
public function boot()
{
- $this->configureRateLimiting();
-
$this->routes(
function () {
Route::get(
- '/status',
- function () {
+ '/health',
+ function (Request $request) {
return response()->json(
[
'status' => 'ok',
- 'time' => microtime(true) - LARAVEL_START
+ 'time' => microtime(true) - $request->attributes->get('request_start_time')
]
);
}
@@ -35,19 +31,4 @@ class RouteServiceProvider extends ServiceProvider
}
);
}
-
- /**
- * Configure the rate limiters for the application.
- *
- * @return void
- */
- protected function configureRateLimiting()
- {
- RateLimiter::for(
- 'api',
- function (Request $request) {
- return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
- }
- );
- }
}
diff --git a/console/app/models/user.js b/console/app/models/user.js
index 89914341..0e965338 100644
--- a/console/app/models/user.js
+++ b/console/app/models/user.js
@@ -23,6 +23,7 @@ export default class UserModel extends Model {
@attr('string') timezone;
@attr('string') country;
@attr('string') ip_address;
+ @attr('string') aws_customer_id;
@attr('string') slug;
@attr('string') role_name;
@attr('string') type;
diff --git a/console/app/templates/onboard/index.hbs b/console/app/templates/onboard/index.hbs
index fc0bb292..a1c78dbf 100644
--- a/console/app/templates/onboard/index.hbs
+++ b/console/app/templates/onboard/index.hbs
@@ -35,4 +35,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/console/ember-cli-build.js b/console/ember-cli-build.js
index 4e4bef6e..9c23a1fa 100644
--- a/console/ember-cli-build.js
+++ b/console/ember-cli-build.js
@@ -53,7 +53,7 @@ module.exports = function (defaults) {
},
filter: {
enabled: true,
- plugins: [postcssAtRulesVariables, postcssMixins, postcssEach, postcssConditionals, tailwind('./tailwind.js')],
+ plugins: [postcssAtRulesVariables, postcssMixins, postcssEach, postcssConditionals, tailwind('./tailwind.config.js')],
},
},
diff --git a/console/tailwind.config.js b/console/tailwind.config.js
index 03a5c279..814a6339 100644
--- a/console/tailwind.config.js
+++ b/console/tailwind.config.js
@@ -1,19 +1,21 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: ['class', '[data-theme="dark"]'],
- content: [
- './app/**/*.{hbs,js}',
- './node_modules/@fleetbase/ember-ui/addon/**/*.{hbs,js}',
- './node_modules/@fleetbase/ember-ui/addon/templates/*.{hbs,js}',
- './node_modules/@fleetbase/ember-ui/addon/templates/**/*.{hbs,js}',
- './node_modules/@fleetbase/ember-ui/addon/components/*.{hbs,js}',
- './node_modules/@fleetbase/ember-ui/addon/components/**/*.{hbs,js}',
- './node_modules/@fleetbase/ember-core/addon/**/*.{hbs,js}',
- './node_modules/@fleetbase/fleetops-engine/addon/**/*.{hbs,js}',
- './node_modules/@fleetbase/storefront-engine/addon/**/*.{hbs,js}',
- './node_modules/@fleetbase/*-engine/addon/**/*.{hbs,js}',
- './node_modules/**/*-engine/addon/**/*.{hbs,js}',
- '../packages/*-engine/addon/**/*.{hbs,js}',
+ content: {
+ relative: true,
+ files: [
+ './app/**/*.{hbs,js}',
+ './node_modules/.pnpm/@fleetbase+*/**/addon/**/*.{hbs,js}',
+ './node_modules/@fleetbase+*/addon/**/*.{hbs,js}',
+ './node_modules/@fleetbase/ember-ui/addon/templates/**/*.{hbs,js}',
+ './node_modules/@fleetbase/ember-ui/addon/components/**/*.{hbs,js}',
+ './node_modules/**/*-engine/addon/**/*.{hbs,js}'
+ ],
+ },
+ safelist: [
+ {
+ pattern: /(py|px|mx|my|gap)-[1-9][0-9]?/,
+ },
],
theme: {
extend: {
@@ -94,7 +96,22 @@ module.exports = {
86: '30rem',
},
spacing: {
- 70: '18rem',
+ 6: '1.5rem',
+ 8: '2rem',
+ 10: '2.5rem',
+ 12: '3rem',
+ 16: '4rem',
+ 20: '5rem',
+ 24: '6rem',
+ 32: '8rem',
+ 40: '10rem',
+ 44: '11rem',
+ 48: '12rem',
+ 52: '13rem',
+ 56: '14rem',
+ 60: '15rem',
+ 64: '16rem',
+ 72: '18rem',
74: '22rem',
78: '26rem',
82: '28rem',
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 226d7aa9..7ac1c26e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -75,7 +75,7 @@ ENV QUEUE_CONNECTION=redis
ENV CADDYFILE_PATH=/fleetbase/Caddyfile
ENV CONSOLE_PATH=/fleetbase/console
ENV OCTANE_SERVER=frankenphp
-ENV FLEETBASE_VERSION=0.7.6
+ENV FLEETBASE_VERSION=0.7.7
# Set environment
ARG ENVIRONMENT=production
diff --git a/packages/core-api b/packages/core-api
index 91d2c564..0f9c4e78 160000
--- a/packages/core-api
+++ b/packages/core-api
@@ -1 +1 @@
-Subproject commit 91d2c56400ffe952d698ed35ef0695a849b4437d
+Subproject commit 0f9c4e7813d5cc2bcfda5ad71d68774ed95ec57a
diff --git a/packages/ember-ui b/packages/ember-ui
index db72d9ee..c7c9cd53 160000
--- a/packages/ember-ui
+++ b/packages/ember-ui
@@ -1 +1 @@
-Subproject commit db72d9ee2965c8a97b246f2f68b394aeaf1a50f2
+Subproject commit c7c9cd5300032cece3cc625078a9a5bd3271808f
diff --git a/packages/fleetops b/packages/fleetops
index 48e58045..32cbdf98 160000
--- a/packages/fleetops
+++ b/packages/fleetops
@@ -1 +1 @@
-Subproject commit 48e580454ddedbaf82adcea8a8a52a9a6109b347
+Subproject commit 32cbdf987b8f1767540a2ba8fe9ee0dd7c01bead