From e8bc17c5b9450d810ef937cbc167048e95d22491 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Tue, 13 Jun 2023 23:57:34 +0800 Subject: [PATCH] Update console with new Dashboard, Added Changelog, Added new `SocketService` for handling socket connections and listening, `fleetbase-extensions-indexer` now extracts custom `fleetbase` key from extension packages, `` is now collapsible, `` can now accept custom nav items from argument, Patched `` component to properly accept and handle customSearchEndpoint arg --- .github/FUNDING.yml | 3 + api/composer-install-dev.sh | 2 + api/composer.dev.json | 108 ++++++++++++++++++++++++++ api/composer.json | 6 +- api/composer.lock | 108 +++++++++++--------------- console | 2 +- docker/Dockerfile | 7 ++ packages/core-api | 2 +- packages/dev-engine | 2 +- packages/ember-core | 2 +- packages/ember-ui | 2 +- packages/fleetbase-extensions-indexer | 2 +- packages/fleetops-api | 2 +- packages/fleetops-engine | 2 +- packages/storefront-api | 2 +- packages/storefront-engine | 2 +- 16 files changed, 178 insertions(+), 76 deletions(-) create mode 100644 .github/FUNDING.yml create mode 100644 api/composer-install-dev.sh create mode 100644 api/composer.dev.json diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..d0e5ed6e --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: fleetbase diff --git a/api/composer-install-dev.sh b/api/composer-install-dev.sh new file mode 100644 index 00000000..7881fde2 --- /dev/null +++ b/api/composer-install-dev.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mv composer.json composer.prod.json && mv composer.dev.json composer.json && composer install && mv composer.json composer.dev.json && mv composer.prod.json composer.json \ No newline at end of file diff --git a/api/composer.dev.json b/api/composer.dev.json new file mode 100644 index 00000000..5711a5b7 --- /dev/null +++ b/api/composer.dev.json @@ -0,0 +1,108 @@ +{ + "name": "laravel/laravel", + "type": "project", + "description": "The Laravel Framework.", + "keywords": ["framework", "laravel"], + "license": "MIT", + "require": { + "php": "^7.3|^8.0", + "fleetbase/core-api": "^1.0.9-alpha", + "fleetbase/fleetops-api": "^1.0.3-alpha", + "fleetbase/storefront-api": "^1.0.3-alpha", + "fruitcake/laravel-cors": "^2.0", + "guzzlehttp/guzzle": "^7.0.1", + "laravel/framework": "^8.75", + "laravel/sanctum": "^2.11", + "laravel/tinker": "^2.5", + "league/flysystem-aws-s3-v3": "^1.0", + "maatwebsite/excel": "^3.1", + "phpoffice/phpspreadsheet": "^1.28", + "predis/predis": "^2.1", + "psr/http-factory-implementation": "*", + "textalk/websocket": "^1.6" + }, + "require-dev": { + "facade/ignition": "^2.5", + "fakerphp/faker": "^1.9.1", + "kitloong/laravel-migrations-generator": "^6.10", + "laravel/sail": "^1.0.1", + "mockery/mockery": "^1.4.4", + "nunomaduro/collision": "^5.10", + "phpunit/phpunit": "^9.5.10" + }, + "repositories": [ + { + "type": "path", + "url": "../packages/core-api" + }, + { + "type": "path", + "url": "../packages/fleetops-api" + }, + { + "type": "path", + "url": "../packages/storefront-api" + } + ], + "autoload": { + "psr-4": { + "App\\": "app/", + "Database\\Factories\\": "database/factories/", + "Database\\Seeders\\": "database/seeders/" + } + }, + "autoload-dev": { + "psr-4": { + "Tests\\": "tests/" + } + }, + "scripts": { + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi" + ], + "post-update-cmd": [ + "@php artisan vendor:publish --tag=laravel-assets --ansi --force" + ], + "post-root-package-install": [ + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + ], + "post-create-project-cmd": [ + "@php artisan key:generate --ansi" + ], + "clear-logs": [ + "rm -rf storage/logs/*.log", + "composer dump-autoload", + "chmod -R 777 storage", + "chmod -R 777 bootstrap/cache", + "chmod -R 777 resources" + ], + "clean-logs": [ + "composer run-script clear-logs" + ], + "dock": [ + "docker exec -it fleetbase_os_application_1 /usr/bin/tmux -u new" + ], + "dock-server": [ + "docker exec -it fleetbase_os_httpd_1 /bin/sh" + ], + "tunnel": [ + "ngrok http --region=ap --hostname=fleetbase.ap.ngrok.io 8000" + ] + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true, + "allow-plugins": { + "php-http/discovery": true + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/api/composer.json b/api/composer.json index 6aaec2dd..088be64b 100644 --- a/api/composer.json +++ b/api/composer.json @@ -6,9 +6,9 @@ "license": "MIT", "require": { "php": "^7.3|^8.0", - "fleetbase/core-api": "^1.0.8-alpha", - "fleetbase/fleetops-api": "^1.0.2-alpha", - "fleetbase/storefront-api": "^1.0.2-alpha", + "fleetbase/core-api": "^1.0.9-alpha", + "fleetbase/fleetops-api": "^1.0.3-alpha", + "fleetbase/storefront-api": "^1.0.3-alpha", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^8.75", diff --git a/api/composer.lock b/api/composer.lock index 22fa86c8..607eeab2 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "826dc512e204fa573464c081ccc63408", + "content-hash": "9e942b73a0335025ddaace9e4a68b836", "packages": [ { "name": "aloha/twilio", @@ -192,16 +192,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.272.1", + "version": "3.272.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "a0accaf4a16565c0b4438109c978602f27dff3a0" + "reference": "0c4cba74c79f9b44393c27721fa1fa9138c95387" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0accaf4a16565c0b4438109c978602f27dff3a0", - "reference": "a0accaf4a16565c0b4438109c978602f27dff3a0", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0c4cba74c79f9b44393c27721fa1fa9138c95387", + "reference": "0c4cba74c79f9b44393c27721fa1fa9138c95387", "shasum": "" }, "require": { @@ -281,9 +281,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.272.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.272.2" }, - "time": "2023-06-09T18:21:02+00:00" + "time": "2023-06-12T18:21:59+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -2002,16 +2002,16 @@ }, { "name": "fleetbase/core-api", - "version": "1.0.8-alpha", + "version": "1.0.9-alpha", "source": { "type": "git", "url": "https://github.com/fleetbase/core-api.git", - "reference": "04c9e13efb21fa352fa5d821ae316e1f2bfb9e45" + "reference": "c08873f3b43f969039c6b9694c313057fe1eba46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/core-api/zipball/04c9e13efb21fa352fa5d821ae316e1f2bfb9e45", - "reference": "04c9e13efb21fa352fa5d821ae316e1f2bfb9e45", + "url": "https://api.github.com/repos/fleetbase/core-api/zipball/c08873f3b43f969039c6b9694c313057fe1eba46", + "reference": "c08873f3b43f969039c6b9694c313057fe1eba46", "shasum": "" }, "require": { @@ -2085,35 +2085,29 @@ ], "support": { "issues": "https://github.com/fleetbase/core-api/issues", - "source": "https://github.com/fleetbase/core-api/tree/v1.0.8-alpha" + "source": "https://github.com/fleetbase/core-api/tree/v1.0.9-alpha" }, - "funding": [ - { - "url": "https://github.com/fleetbase", - "type": "github" - } - ], - "time": "2023-06-11T02:52:00+00:00" + "time": "2023-06-13T15:43:51+00:00" }, { "name": "fleetbase/fleetops-api", - "version": "1.0.2-alpha", + "version": "1.0.3-alpha", "source": { "type": "git", "url": "https://github.com/fleetbase/fleetops-api.git", - "reference": "a6a9eab63eb651f8833874c2ee34739c4b8f1d9b" + "reference": "92f468d6e62bac2672b7a339f2053428fe997ea6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/a6a9eab63eb651f8833874c2ee34739c4b8f1d9b", - "reference": "a6a9eab63eb651f8833874c2ee34739c4b8f1d9b", + "url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/92f468d6e62bac2672b7a339f2053428fe997ea6", + "reference": "92f468d6e62bac2672b7a339f2053428fe997ea6", "shasum": "" }, "require": { "barryvdh/laravel-dompdf": "^2.0", "brick/geo": "0.7.2", "cknow/laravel-money": "^7.1", - "fleetbase/core-api": "^1.0.0-alpha", + "fleetbase/core-api": "^1.0.9-alpha", "geocoder-php/google-maps-places-provider": "^1.4", "giggsey/libphonenumber-for-php": "^8.13", "league/geotools": "^1.1.0", @@ -2167,33 +2161,27 @@ ], "support": { "issues": "https://github.com/fleetbase/fleetops-api/issues", - "source": "https://github.com/fleetbase/fleetops-api/tree/v1.0.2-alpha" + "source": "https://github.com/fleetbase/fleetops-api/tree/v1.0.3-alpha" }, - "funding": [ - { - "url": "https://github.com/fleetbase", - "type": "github" - } - ], - "time": "2023-06-08T10:35:17+00:00" + "time": "2023-06-13T15:46:57+00:00" }, { "name": "fleetbase/storefront-api", - "version": "1.0.2-alpha", + "version": "1.0.3-alpha", "source": { "type": "git", "url": "https://github.com/fleetbase/storefront-api.git", - "reference": "44cb6d4d91ee1ba0c76476ec9d6273bf887f8883" + "reference": "249923de7168805de25012032fb0ef5120fb6fea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/storefront-api/zipball/44cb6d4d91ee1ba0c76476ec9d6273bf887f8883", - "reference": "44cb6d4d91ee1ba0c76476ec9d6273bf887f8883", + "url": "https://api.github.com/repos/fleetbase/storefront-api/zipball/249923de7168805de25012032fb0ef5120fb6fea", + "reference": "249923de7168805de25012032fb0ef5120fb6fea", "shasum": "" }, "require": { - "fleetbase/core-api": "^1.0.7-alpha", - "fleetbase/fleetops-api": "^1.0.2-alpha", + "fleetbase/core-api": "^1.0.9-alpha", + "fleetbase/fleetops-api": "^1.0.3-alpha", "geocoder-php/google-maps-places-provider": "^1.4", "laravel-notification-channels/apn": "^3.8", "laravel-notification-channels/fcm": "^2.7", @@ -2251,15 +2239,9 @@ ], "support": { "issues": "https://github.com/fleetbase/storefront-api/issues", - "source": "https://github.com/fleetbase/storefront-api/tree/v1.0.2-alpha" + "source": "https://github.com/fleetbase/storefront-api/tree/v1.0.3-alpha" }, - "funding": [ - { - "url": "https://github.com/fleetbase", - "type": "github" - } - ], - "time": "2023-06-09T08:00:56+00:00" + "time": "2023-06-13T15:50:51+00:00" }, { "name": "fruitcake/laravel-cors", @@ -2741,16 +2723,16 @@ }, { "name": "giggsey/libphonenumber-for-php", - "version": "8.13.13", + "version": "8.13.14", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php.git", - "reference": "a8996558d694b1437678d27de80e37620367b8de" + "reference": "31b94ef2aa349b76bb725f375e9cfa2e398a1620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/a8996558d694b1437678d27de80e37620367b8de", - "reference": "a8996558d694b1437678d27de80e37620367b8de", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/31b94ef2aa349b76bb725f375e9cfa2e398a1620", + "reference": "31b94ef2aa349b76bb725f375e9cfa2e398a1620", "shasum": "" }, "require": { @@ -2809,7 +2791,7 @@ "issues": "https://github.com/giggsey/libphonenumber-for-php/issues", "source": "https://github.com/giggsey/libphonenumber-for-php" }, - "time": "2023-06-05T07:39:05+00:00" + "time": "2023-06-13T08:08:40+00:00" }, { "name": "giggsey/locale", @@ -14108,16 +14090,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.22.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2" + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", "shasum": "" }, "require": { @@ -14170,9 +14152,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.22.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0" }, - "time": "2023-05-14T12:31:37+00:00" + "time": "2023-06-12T08:44:38+00:00" }, { "name": "filp/whoops", @@ -15086,16 +15068,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", "shasum": "" }, "require": { @@ -15169,7 +15151,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" }, "funding": [ { @@ -15185,7 +15167,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-06-11T06:13:56+00:00" }, { "name": "sebastian/cli-parser", diff --git a/console b/console index 1c955bb8..60f97028 160000 --- a/console +++ b/console @@ -1 +1 @@ -Subproject commit 1c955bb8a065d0bed1e861e509768717e81e9b72 +Subproject commit 60f97028c6117da55cbc76e56bc1df7f9fe77650 diff --git a/docker/Dockerfile b/docker/Dockerfile index 2cb65308..41186e78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,6 +35,10 @@ RUN curl -L https://github.com/springload/ssm-parent/releases/download/v1.4.3/ss # Install Composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer +# For development only +WORKDIR /var/www/html +COPY --chown=www-data:nogroup packages ./ + # Setup application WORKDIR /var/www/html/api COPY --chown=www-data:nogroup api ./ @@ -61,6 +65,9 @@ RUN chmod +x /startup.sh ARG ENVIRONMENT=production ENV APP_ENV=$ENVIRONMENT +# Set workdir to application +WORKDIR /var/www/html/api + # Scheduler base stage FROM base as scheduler-base diff --git a/packages/core-api b/packages/core-api index 04c9e13e..c08873f3 160000 --- a/packages/core-api +++ b/packages/core-api @@ -1 +1 @@ -Subproject commit 04c9e13efb21fa352fa5d821ae316e1f2bfb9e45 +Subproject commit c08873f3b43f969039c6b9694c313057fe1eba46 diff --git a/packages/dev-engine b/packages/dev-engine index 1ca718ff..c6c4f4e4 160000 --- a/packages/dev-engine +++ b/packages/dev-engine @@ -1 +1 @@ -Subproject commit 1ca718ff46d0ff8296ef63365e4b0c1c0d8d6904 +Subproject commit c6c4f4e4b09ab31fece4cf8c0bd68a3fbd77a597 diff --git a/packages/ember-core b/packages/ember-core index fbb68f01..0d614961 160000 --- a/packages/ember-core +++ b/packages/ember-core @@ -1 +1 @@ -Subproject commit fbb68f01d43b4c10d664284a25577e3c58427e82 +Subproject commit 0d614961889fd357c7c8f652acdfd2184fa0e6fc diff --git a/packages/ember-ui b/packages/ember-ui index 7d7c1091..fc087cfc 160000 --- a/packages/ember-ui +++ b/packages/ember-ui @@ -1 +1 @@ -Subproject commit 7d7c1091c90ea15e022434426c7eda0865343d24 +Subproject commit fc087cfc3b78d75711a685f34b2c178102644d93 diff --git a/packages/fleetbase-extensions-indexer b/packages/fleetbase-extensions-indexer index b5395d84..c534b5a6 160000 --- a/packages/fleetbase-extensions-indexer +++ b/packages/fleetbase-extensions-indexer @@ -1 +1 @@ -Subproject commit b5395d84b5b53fcdfbe9d391e8dcc6bab84ae61b +Subproject commit c534b5a60f00d84462cf25ddfc2eabb177df3802 diff --git a/packages/fleetops-api b/packages/fleetops-api index aeda07a2..92f468d6 160000 --- a/packages/fleetops-api +++ b/packages/fleetops-api @@ -1 +1 @@ -Subproject commit aeda07a28c8b7d8097c41c5c8b07d18d01c977b1 +Subproject commit 92f468d6e62bac2672b7a339f2053428fe997ea6 diff --git a/packages/fleetops-engine b/packages/fleetops-engine index a0c3190f..438ca461 160000 --- a/packages/fleetops-engine +++ b/packages/fleetops-engine @@ -1 +1 @@ -Subproject commit a0c3190fad10a7fed8e258edf0ec217d06611fe8 +Subproject commit 438ca46125455412fb5ba902401d44225ef6e6e9 diff --git a/packages/storefront-api b/packages/storefront-api index 44cb6d4d..249923de 160000 --- a/packages/storefront-api +++ b/packages/storefront-api @@ -1 +1 @@ -Subproject commit 44cb6d4d91ee1ba0c76476ec9d6273bf887f8883 +Subproject commit 249923de7168805de25012032fb0ef5120fb6fea diff --git a/packages/storefront-engine b/packages/storefront-engine index ecb70261..c462045c 160000 --- a/packages/storefront-engine +++ b/packages/storefront-engine @@ -1 +1 @@ -Subproject commit ecb70261e8582afc1a09dce2f320af1964726304 +Subproject commit c462045cd4930b0c35a248d6189385ba42dd58b1