mirror of
https://github.com/fleetbase/fleetbase.git
synced 2026-01-07 15:01:45 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
00b037a385 | ||
|
|
151fea2505 | ||
|
|
08f901d865 |
@@ -9,9 +9,9 @@
|
||||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^8.0",
|
||||
"fleetbase/core-api": "^1.4.11",
|
||||
"fleetbase/fleetops-api": "^0.4.17",
|
||||
"fleetbase/storefront-api": "^0.3.4",
|
||||
"fleetbase/core-api": "^1.4.12",
|
||||
"fleetbase/fleetops-api": "^0.4.18",
|
||||
"fleetbase/storefront-api": "^0.3.5",
|
||||
"guzzlehttp/guzzle": "^7.0.1",
|
||||
"laravel/framework": "^10.0",
|
||||
"laravel/octane": "^2.3",
|
||||
|
||||
242
api/composer.lock
generated
242
api/composer.lock
generated
@@ -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": "9f7390376ef891984f81ca92c6e77863",
|
||||
"content-hash": "f3a1061cf8d83095fed61c086818d32f",
|
||||
"packages": [
|
||||
{
|
||||
"name": "aloha/twilio",
|
||||
@@ -136,16 +136,16 @@
|
||||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php",
|
||||
"version": "3.300.14",
|
||||
"version": "3.300.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||
"reference": "f1e0c37d8403d7097c2c808c184137e6517d54be"
|
||||
"reference": "0cd194438b84588615121a93d0bc46bf55ca678b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f1e0c37d8403d7097c2c808c184137e6517d54be",
|
||||
"reference": "f1e0c37d8403d7097c2c808c184137e6517d54be",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0cd194438b84588615121a93d0bc46bf55ca678b",
|
||||
"reference": "0cd194438b84588615121a93d0bc46bf55ca678b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -225,9 +225,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.300.14"
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.300.15"
|
||||
},
|
||||
"time": "2024-03-08T19:05:39+00:00"
|
||||
"time": "2024-03-11T18:33:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php-laravel",
|
||||
@@ -2286,16 +2286,16 @@
|
||||
},
|
||||
{
|
||||
"name": "fleetbase/core-api",
|
||||
"version": "1.4.11",
|
||||
"version": "1.4.12",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fleetbase/core-api.git",
|
||||
"reference": "99109dca41ccbe599737003add4716db7ac0011a"
|
||||
"reference": "bfad44eeb7c5febfc3dc5cf1e6c5e49cc77cff45"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/99109dca41ccbe599737003add4716db7ac0011a",
|
||||
"reference": "99109dca41ccbe599737003add4716db7ac0011a",
|
||||
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/bfad44eeb7c5febfc3dc5cf1e6c5e49cc77cff45",
|
||||
"reference": "bfad44eeb7c5febfc3dc5cf1e6c5e49cc77cff45",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2325,6 +2325,7 @@
|
||||
"pragmarx/countries": "^0.8.2",
|
||||
"sentry/sentry-laravel": "*",
|
||||
"spatie/laravel-activitylog": "^4.7",
|
||||
"spatie/laravel-google-cloud-storage": "^2.2",
|
||||
"spatie/laravel-permission": "^6.3",
|
||||
"spatie/laravel-responsecache": "^7.4",
|
||||
"spatie/laravel-sluggable": "^3.5",
|
||||
@@ -2375,29 +2376,29 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/fleetbase/core-api/issues",
|
||||
"source": "https://github.com/fleetbase/core-api/tree/v1.4.11"
|
||||
"source": "https://github.com/fleetbase/core-api/tree/v1.4.12"
|
||||
},
|
||||
"time": "2024-03-11T12:34:56+00:00"
|
||||
"time": "2024-03-12T09:46:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fleetbase/fleetops-api",
|
||||
"version": "0.4.17",
|
||||
"version": "0.4.18",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fleetbase/fleetops.git",
|
||||
"reference": "bd8fc66dbe6f357bb770df2b14c31e3cabe60282"
|
||||
"reference": "b0d5547e60e30e4cc3bb19772f1a7e224c779da7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/bd8fc66dbe6f357bb770df2b14c31e3cabe60282",
|
||||
"reference": "bd8fc66dbe6f357bb770df2b14c31e3cabe60282",
|
||||
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/b0d5547e60e30e4cc3bb19772f1a7e224c779da7",
|
||||
"reference": "b0d5547e60e30e4cc3bb19772f1a7e224c779da7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"barryvdh/laravel-dompdf": "^2.0",
|
||||
"brick/geo": "0.7.2",
|
||||
"cknow/laravel-money": "^7.1",
|
||||
"fleetbase/core-api": "^1.4.11",
|
||||
"fleetbase/core-api": "^1.4.12",
|
||||
"geocoder-php/google-maps-places-provider": "^1.4",
|
||||
"giggsey/libphonenumber-for-php": "^8.13",
|
||||
"league/geotools": "^1.1.0",
|
||||
@@ -2437,7 +2438,7 @@
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Fleetbase\\FleetOps\\": "server/src/",
|
||||
"Fleetbase\\FleetOps\\Seeders\\": "seeders/"
|
||||
"Fleetbase\\FleetOps\\Seeders\\": "server/seeders/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@@ -2464,9 +2465,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/fleetbase/fleetops/issues",
|
||||
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.17"
|
||||
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.18"
|
||||
},
|
||||
"time": "2024-03-11T12:48:47+00:00"
|
||||
"time": "2024-03-12T09:52:49+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fleetbase/laravel-mysql-spatial",
|
||||
@@ -2536,21 +2537,21 @@
|
||||
},
|
||||
{
|
||||
"name": "fleetbase/storefront-api",
|
||||
"version": "0.3.4",
|
||||
"version": "0.3.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fleetbase/storefront.git",
|
||||
"reference": "da534cea36d639b3fd418f0497c7a1b9dc3d5c49"
|
||||
"reference": "2fec007089dada7e7054623920e30bd1580f5853"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fleetbase/storefront/zipball/da534cea36d639b3fd418f0497c7a1b9dc3d5c49",
|
||||
"reference": "da534cea36d639b3fd418f0497c7a1b9dc3d5c49",
|
||||
"url": "https://api.github.com/repos/fleetbase/storefront/zipball/2fec007089dada7e7054623920e30bd1580f5853",
|
||||
"reference": "2fec007089dada7e7054623920e30bd1580f5853",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"fleetbase/core-api": "^1.4.11",
|
||||
"fleetbase/fleetops-api": "^0.4.17",
|
||||
"fleetbase/core-api": "^1.4.12",
|
||||
"fleetbase/fleetops-api": "^0.4.18",
|
||||
"geocoder-php/google-maps-places-provider": "^1.4",
|
||||
"laravel-notification-channels/apn": "^5.0",
|
||||
"laravel-notification-channels/fcm": "^4.1",
|
||||
@@ -2586,7 +2587,7 @@
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Fleetbase\\Storefront\\": "server/src/",
|
||||
"Fleetbase\\Storefront\\Seeders\\": "seeders/"
|
||||
"Fleetbase\\Storefront\\Seeders\\": "server/seeders/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@@ -2613,9 +2614,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/fleetbase/storefront/issues",
|
||||
"source": "https://github.com/fleetbase/storefront/tree/v0.3.4"
|
||||
"source": "https://github.com/fleetbase/storefront/tree/v0.3.5"
|
||||
},
|
||||
"time": "2024-03-11T12:56:26+00:00"
|
||||
"time": "2024-03-12T10:03:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fruitcake/php-cors",
|
||||
@@ -3085,16 +3086,16 @@
|
||||
},
|
||||
{
|
||||
"name": "giggsey/libphonenumber-for-php",
|
||||
"version": "8.13.31",
|
||||
"version": "8.13.32",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
|
||||
"reference": "a4934bddda4672d12f21728e08bd575913bdc310"
|
||||
"reference": "11aa286e82f2bb567815a89da1e63e2848b81e66"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/a4934bddda4672d12f21728e08bd575913bdc310",
|
||||
"reference": "a4934bddda4672d12f21728e08bd575913bdc310",
|
||||
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/11aa286e82f2bb567815a89da1e63e2848b81e66",
|
||||
"reference": "11aa286e82f2bb567815a89da1e63e2848b81e66",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3153,7 +3154,7 @@
|
||||
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
|
||||
"source": "https://github.com/giggsey/libphonenumber-for-php"
|
||||
},
|
||||
"time": "2024-02-26T08:31:45+00:00"
|
||||
"time": "2024-03-12T08:08:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "giggsey/locale",
|
||||
@@ -6074,6 +6075,65 @@
|
||||
],
|
||||
"time": "2024-01-26T18:43:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/flysystem-google-cloud-storage",
|
||||
"version": "3.23.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/flysystem-google-cloud-storage.git",
|
||||
"reference": "d13af3a410dce938f0b03f93d9e0e943e535f0c5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/flysystem-google-cloud-storage/zipball/d13af3a410dce938f0b03f93d9e0e943e535f0c5",
|
||||
"reference": "d13af3a410dce938f0b03f93d9e0e943e535f0c5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"google/cloud-storage": "^1.23",
|
||||
"league/flysystem": "^3.10.0",
|
||||
"league/mime-type-detection": "^1.0.0",
|
||||
"php": "^8.0.2"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"League\\Flysystem\\GoogleCloudStorage\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Frank de Jonge",
|
||||
"email": "info@frankdejonge.nl"
|
||||
}
|
||||
],
|
||||
"description": "Google Cloud Storage adapter for Flysystem.",
|
||||
"keywords": [
|
||||
"Flysystem",
|
||||
"filesystem",
|
||||
"gcs",
|
||||
"google cloud storage"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/thephpleague/flysystem-google-cloud-storage/issues",
|
||||
"source": "https://github.com/thephpleague/flysystem-google-cloud-storage/tree/3.23.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://ecologi.com/frankdejonge",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/frankdejonge",
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-26T18:25:23+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/flysystem-local",
|
||||
"version": "3.23.1",
|
||||
@@ -10411,6 +10471,81 @@
|
||||
],
|
||||
"time": "2024-03-08T22:28:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "spatie/laravel-google-cloud-storage",
|
||||
"version": "2.2.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/spatie/laravel-google-cloud-storage.git",
|
||||
"reference": "c26ab07582714e7d26ee00124cf9ccd43df270d8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/spatie/laravel-google-cloud-storage/zipball/c26ab07582714e7d26ee00124cf9ccd43df270d8",
|
||||
"reference": "c26ab07582714e7d26ee00124cf9ccd43df270d8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/contracts": "^9.0|^10.0",
|
||||
"illuminate/filesystem": "^9.0|^10.0",
|
||||
"illuminate/support": "^9.0|^10.0",
|
||||
"league/flysystem-google-cloud-storage": "^3.0.15",
|
||||
"php": "^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"brianium/paratest": "^6.4",
|
||||
"nunomaduro/collision": "^6.1|^7.0",
|
||||
"orchestra/testbench": "^7.0|^8.0",
|
||||
"phpunit/phpunit": "^9.6|^10.0",
|
||||
"spatie/laravel-ray": "^1.29",
|
||||
"vimeo/psalm": "^4.18|^5.9"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Spatie\\GoogleCloudStorage\\GoogleCloudStorageServiceProvider"
|
||||
],
|
||||
"aliases": {
|
||||
"GoogleCloudStorage": "Spatie\\GoogleCloudStorage\\GoogleCloudStorageFacade"
|
||||
}
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Spatie\\GoogleCloudStorage\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Alex Vanderbist",
|
||||
"email": "alex@spatie.be",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "Google Cloud Storage filesystem driver for Laravel",
|
||||
"homepage": "https://github.com/spatie/laravel-google-cloud-storage",
|
||||
"keywords": [
|
||||
"laravel",
|
||||
"laravel-google-cloud-storage",
|
||||
"spatie"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/spatie/laravel-google-cloud-storage/issues",
|
||||
"source": "https://github.com/spatie/laravel-google-cloud-storage/tree/2.2.6"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/spatie",
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2023-11-25T17:34:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "spatie/laravel-package-tools",
|
||||
"version": "1.16.3",
|
||||
@@ -10555,34 +10690,33 @@
|
||||
},
|
||||
{
|
||||
"name": "spatie/laravel-responsecache",
|
||||
"version": "7.4.10",
|
||||
"version": "7.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/spatie/laravel-responsecache.git",
|
||||
"reference": "cf0305f73fcc49dacfadd0f2228887a92fa736ac"
|
||||
"reference": "c6880344402b53fbf32d4f8dd5df8bff9f725c36"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/cf0305f73fcc49dacfadd0f2228887a92fa736ac",
|
||||
"reference": "cf0305f73fcc49dacfadd0f2228887a92fa736ac",
|
||||
"url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/c6880344402b53fbf32d4f8dd5df8bff9f725c36",
|
||||
"reference": "c6880344402b53fbf32d4f8dd5df8bff9f725c36",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/cache": "^8.71|^9.0|^10.0",
|
||||
"illuminate/console": "^8.71|^9.0|^10.0",
|
||||
"illuminate/container": "^8.71|^9.0|^10.0",
|
||||
"illuminate/http": "^8.71|^9.0|^10.0",
|
||||
"illuminate/support": "^8.71|^9.0|^10.0",
|
||||
"illuminate/cache": "^10.0|^11.0",
|
||||
"illuminate/console": "^10.0|^11.0",
|
||||
"illuminate/container": "^10.0|^11.0",
|
||||
"illuminate/http": "^10.0|^11.0",
|
||||
"illuminate/support": "^10.0|^11.0",
|
||||
"nesbot/carbon": "^2.63",
|
||||
"php": "^8.0",
|
||||
"php": "^8.2",
|
||||
"spatie/laravel-package-tools": "^1.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"laravel/framework": "^9.0|^10.0",
|
||||
"laravel/framework": "^10.0|^11.0",
|
||||
"mockery/mockery": "^1.4",
|
||||
"orchestra/testbench": "^6.23|^7.0|^8.0",
|
||||
"pestphp/pest": "^1.22",
|
||||
"phpunit/phpunit": "^9.4"
|
||||
"orchestra/testbench": "^8.0|^9.0",
|
||||
"pestphp/pest": "^2.22"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -10623,7 +10757,7 @@
|
||||
"spatie"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/spatie/laravel-responsecache/tree/7.4.10"
|
||||
"source": "https://github.com/spatie/laravel-responsecache/tree/7.5.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -10635,7 +10769,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2023-10-28T18:47:12+00:00"
|
||||
"time": "2024-03-11T23:35:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "spatie/laravel-sluggable",
|
||||
@@ -14119,7 +14253,7 @@
|
||||
"version": "6.44.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@github.com:twilio/twilio-php.git",
|
||||
"url": "https://github.com/twilio/twilio-php.git",
|
||||
"reference": "08aad5f377e2245b9cd7508e7762d95e7392fa4d"
|
||||
},
|
||||
"dist": {
|
||||
@@ -14161,6 +14295,10 @@
|
||||
"sms",
|
||||
"twilio"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/twilio/twilio-php/issues",
|
||||
"source": "https://github.com/twilio/twilio-php/tree/6.44.4"
|
||||
},
|
||||
"time": "2023-02-22T19:59:53+00:00"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -7,6 +7,31 @@
|
||||
<InputGroup @name="S3 URL" @value={{this.s3Url}} disabled={{this.isLoading}} />
|
||||
<InputGroup @name="S3 Endpoint" @value={{this.s3Endpoint}} disabled={{this.isLoading}} />
|
||||
{{/if}}
|
||||
{{#if (eq this.driver "gcs")}}
|
||||
{{#if this.isGoogleCloudStorageEnvConfigued}}
|
||||
<div class="border border-yellow-900 shadow-sm rounded-lg bg-yellow-200 mb-4">
|
||||
<div class="px-3 py-2 text-sm text-yellow-900 flex items-center">
|
||||
<FaIcon @icon="triangle-exclamation" @size="md" class="mr-1.5" />
|
||||
Warning! GCS is already configured in the server environment. Changing values below may break this.
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
<InputGroup @name="GCS Bucket" @value={{this.gcsBucket}} disabled={{this.isLoading}} />
|
||||
<InputGroup @name="GCS Service Account Key File" @wrapperClass="">
|
||||
<div class="flex flex-row items-center mb-0i">
|
||||
<UploadButton @name="firebase-service-account" @accept="text/plain,text/javascript,application/json" @onFileAdded={{this.uploadGcsCredentialsFile}} @buttonText="Upload Service Account JSON" @icon="upload" class="w-auto m-0i mt-0i" />
|
||||
{{#if this.gcsCredentialsFile}}
|
||||
<div class="ml-2.5 text-sm dark:text-white text-black flex flex-row items-center border border-blue-500 rounded-lg px-2 py-0.5 -mt-1">
|
||||
<FaIcon @icon="file-text" @size="sm" class="mr-2 dark:text-white text-black" />
|
||||
<span>{{this.gcsCredentialsFile.original_filename}}</span>
|
||||
<a href="javascript:;" class="text-red-500 ml-2" {{on "click" this.removeGcsCredentialsFile}}>
|
||||
<FaIcon @icon="times" class="text-red-500" />
|
||||
</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
</InputGroup>
|
||||
{{/if}}
|
||||
{{#if this.testResponse}}
|
||||
<div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
|
||||
<FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
|
||||
|
||||
@@ -6,6 +6,7 @@ import { action } from '@ember/object';
|
||||
export default class ConfigureFilesystemComponent extends Component {
|
||||
@service fetch;
|
||||
@service notifications;
|
||||
@service currentUser;
|
||||
@tracked isLoading = false;
|
||||
@tracked testResponse;
|
||||
@tracked disks = [];
|
||||
@@ -13,6 +14,10 @@ export default class ConfigureFilesystemComponent extends Component {
|
||||
@tracked s3Bucket = null;
|
||||
@tracked s3Url = null;
|
||||
@tracked s3Endpoint = null;
|
||||
@tracked gcsBucket = null;
|
||||
@tracked gcsCredentialsFileId = null;
|
||||
@tracked gcsCredentialsFile = null;
|
||||
@tracked isGoogleCloudStorageEnvConfigued = false;
|
||||
|
||||
/**
|
||||
* Creates an instance of ConfigureFilesystemComponent.
|
||||
@@ -59,6 +64,8 @@ export default class ConfigureFilesystemComponent extends Component {
|
||||
url: this.s3Url,
|
||||
endpoint: this.s3Endpoint,
|
||||
},
|
||||
gcsCredentialsFileId: this.gcsCredentialsFileId,
|
||||
gcsBucket: this.gcsBucket,
|
||||
})
|
||||
.then(() => {
|
||||
this.notifications.success('Filesystem configuration saved.');
|
||||
@@ -82,4 +89,31 @@ export default class ConfigureFilesystemComponent extends Component {
|
||||
this.isLoading = false;
|
||||
});
|
||||
}
|
||||
|
||||
@action removeGcsCredentialsFile() {
|
||||
this.gcsCredentialsFileId = undefined;
|
||||
this.gcsCredentialsFile = undefined;
|
||||
}
|
||||
|
||||
@action uploadGcsCredentialsFile(file) {
|
||||
try {
|
||||
this.fetch.uploadFile.perform(
|
||||
file,
|
||||
{
|
||||
path: 'gcs',
|
||||
subject_uuid: this.currentUser.companyId,
|
||||
subject_type: 'company',
|
||||
type: 'gcs_credentials',
|
||||
},
|
||||
(uploadedFile) => {
|
||||
console.log('uploadedFile', uploadedFile);
|
||||
this.gcsCredentialsFileId = uploadedFile.id;
|
||||
this.gcsCredentialsFile = uploadedFile;
|
||||
console.log('this.gcsCredentialsFile', this.gcsCredentialsFile);
|
||||
}
|
||||
);
|
||||
} catch (error) {
|
||||
this.notifications.serverError(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@fleetbase/console",
|
||||
"version": "0.4.10",
|
||||
"version": "0.4.11",
|
||||
"private": true,
|
||||
"description": "Fleetbase Console",
|
||||
"repository": "https://github.com/fleetbase/fleetbase",
|
||||
@@ -29,11 +29,11 @@
|
||||
"test:ember": "ember test"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fleetbase/ember-core": "^0.2.5",
|
||||
"@fleetbase/ember-core": "^0.2.6",
|
||||
"@fleetbase/ember-ui": "^0.2.11",
|
||||
"@fleetbase/fleetops-engine": "^0.4.17",
|
||||
"@fleetbase/fleetops-data": "^0.1.12",
|
||||
"@fleetbase/storefront-engine": "^0.3.4",
|
||||
"@fleetbase/fleetops-engine": "^0.4.18",
|
||||
"@fleetbase/fleetops-data": "^0.1.13",
|
||||
"@fleetbase/storefront-engine": "^0.3.5",
|
||||
"@fleetbase/dev-engine": "^0.2.1",
|
||||
"@fleetbase/iam-engine": "^0.0.9",
|
||||
"@fleetbase/leaflet-routing-machine": "^3.2.16",
|
||||
@@ -142,9 +142,9 @@
|
||||
},
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"@fleetbase/ember-core": "^0.2.5",
|
||||
"@fleetbase/ember-core": "^0.2.6",
|
||||
"@fleetbase/ember-ui": "^0.2.11",
|
||||
"@fleetbase/fleetops-data": "^0.1.12"
|
||||
"@fleetbase/fleetops-data": "^0.1.13"
|
||||
}
|
||||
},
|
||||
"prettier": {
|
||||
|
||||
48
console/pnpm-lock.yaml
generated
48
console/pnpm-lock.yaml
generated
@@ -1,9 +1,9 @@
|
||||
lockfileVersion: '6.0'
|
||||
|
||||
overrides:
|
||||
'@fleetbase/ember-core': ^0.2.5
|
||||
'@fleetbase/ember-core': ^0.2.6
|
||||
'@fleetbase/ember-ui': ^0.2.11
|
||||
'@fleetbase/fleetops-data': ^0.1.12
|
||||
'@fleetbase/fleetops-data': ^0.1.13
|
||||
|
||||
dependencies:
|
||||
'@ember/legacy-built-in-components':
|
||||
@@ -13,17 +13,17 @@ dependencies:
|
||||
specifier: ^0.2.1
|
||||
version: 0.2.1(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-core':
|
||||
specifier: ^0.2.5
|
||||
version: 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
specifier: ^0.2.6
|
||||
version: 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-ui':
|
||||
specifier: ^0.2.11
|
||||
version: 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fleetbase/fleetops-data':
|
||||
specifier: ^0.1.12
|
||||
version: 0.1.12
|
||||
specifier: ^0.1.13
|
||||
version: 0.1.13
|
||||
'@fleetbase/fleetops-engine':
|
||||
specifier: ^0.4.17
|
||||
version: 0.4.17(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
specifier: ^0.4.18
|
||||
version: 0.4.18(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fleetbase/iam-engine':
|
||||
specifier: ^0.0.9
|
||||
version: 0.0.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
@@ -31,8 +31,8 @@ dependencies:
|
||||
specifier: ^3.2.16
|
||||
version: 3.2.16
|
||||
'@fleetbase/storefront-engine':
|
||||
specifier: ^0.3.4
|
||||
version: 0.3.4(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
specifier: ^0.3.5
|
||||
version: 0.3.5(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fortawesome/ember-fontawesome':
|
||||
specifier: ^0.4.1
|
||||
version: 0.4.1(rollup@4.12.0)
|
||||
@@ -2653,7 +2653,7 @@ packages:
|
||||
ember-engines: ^0.9.0
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
'@fleetbase/ember-core': 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
|
||||
'@fortawesome/fontawesome-svg-core': 6.4.0
|
||||
@@ -2701,8 +2701,8 @@ packages:
|
||||
- supports-color
|
||||
dev: false
|
||||
|
||||
/@fleetbase/ember-core@0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-nLfNW5iiRdPcFzeLstKeEaPFkXuAPJbI04i19xz5a/D+zqstfD4bYQpv+vxbQpzRKwNFtFLYaJt+qg8xMWdB2A==}
|
||||
/@fleetbase/ember-core@0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-EHO47NM6XH/1bC6TL7cEbJQ//RCrdFb1+TsCIHvhPtP7KSGyam2gexiiNlwTm4fgVizxyvDCbCpGDMEs8ltZnA==}
|
||||
engines: {node: '>= 18'}
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
@@ -2817,8 +2817,8 @@ packages:
|
||||
- webpack-command
|
||||
dev: false
|
||||
|
||||
/@fleetbase/fleetops-data@0.1.12:
|
||||
resolution: {integrity: sha512-t3tuflZkZCeYPGuW81l9cYsI4ezg5JKBVplwaelhyIb5a9ZzIFwm0grRNN1jMJRbwCZkIVKyMMDnqIHw4mrWAg==}
|
||||
/@fleetbase/fleetops-data@0.1.13:
|
||||
resolution: {integrity: sha512-+JgP0p15TxMOxfJCSPJt/2nTA8ZugukGuaFYQTLzD0TFFKXjZE9bmYKPf+Z5w9L4oJ4b1oLsvRv6BL5dFt11lw==}
|
||||
engines: {node: '>= 18'}
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
@@ -2829,16 +2829,16 @@ packages:
|
||||
- supports-color
|
||||
dev: false
|
||||
|
||||
/@fleetbase/fleetops-engine@0.4.17(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-2o2cb7UTCMzOCzZshWrjiAFYV+6kXi1KFo014PkeKC/dOdKhcFAlB+DWg2JMz2rCbeM+f1lS2JqyuraVSWwtyQ==}
|
||||
/@fleetbase/fleetops-engine@0.4.18(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-/hT5JCb5u+HFn0zUdifDPXavncb25v+2Um+dN73tF7wok4y87HYYCUpEp251g96FX3jCB7SScwEkv0tOs9ggzg==}
|
||||
engines: {node: '>= 18'}
|
||||
peerDependencies:
|
||||
ember-engines: ^0.9.0
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
'@fleetbase/ember-core': 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fleetbase/fleetops-data': 0.1.12
|
||||
'@fleetbase/fleetops-data': 0.1.13
|
||||
'@fleetbase/leaflet-routing-machine': 3.2.16
|
||||
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
|
||||
'@fortawesome/fontawesome-svg-core': 6.4.0
|
||||
@@ -2895,7 +2895,7 @@ packages:
|
||||
ember-engines: ^0.9.0
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
'@fleetbase/ember-core': 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
|
||||
'@fortawesome/fontawesome-svg-core': 6.4.0
|
||||
@@ -2947,16 +2947,16 @@ packages:
|
||||
osrm-text-instructions: 0.13.4
|
||||
dev: false
|
||||
|
||||
/@fleetbase/storefront-engine@0.3.4(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-HZ76VyJA/feRHKE2U5EXq1u6Wc+5utFYVO4qHy8+ZnOeqVvWE9wJ3xPXwYVA7AsxakD0cvo8RZutLD/9jt2n3w==}
|
||||
/@fleetbase/storefront-engine@0.3.5(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
|
||||
resolution: {integrity: sha512-odsjebb7n1KC6B3lw1Y9zuiv4oJvu9G7wRSehH/KjXXqereYf/s5cPKeJG+tgh2qGrJzd3z2qKnUnyvA2Deo3w==}
|
||||
engines: {node: '>= 18'}
|
||||
peerDependencies:
|
||||
ember-engines: ^0.9.0
|
||||
dependencies:
|
||||
'@babel/core': 7.23.2
|
||||
'@fleetbase/ember-core': 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
|
||||
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
|
||||
'@fleetbase/fleetops-data': 0.1.12
|
||||
'@fleetbase/fleetops-data': 0.1.13
|
||||
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
|
||||
'@fortawesome/fontawesome-svg-core': 6.4.0
|
||||
'@fortawesome/free-solid-svg-icons': 6.4.0
|
||||
|
||||
Submodule packages/core-api updated: c614dfd01c...bfad44eeb7
Submodule packages/ember-core updated: d0c575778c...ec10c85f4b
Submodule packages/fleetops updated: bd8fc66dbe...b0d5547e60
Submodule packages/fleetops-data updated: b5ba2a311c...0a5eb0cfae
Submodule packages/storefront updated: da534cea36...2fec007089
Reference in New Issue
Block a user