Compare commits

..

7 Commits

Author SHA1 Message Date
Ronald A. Richardson
f1cec329bc add back environment files 2023-10-27 10:15:40 +08:00
Ronald A. Richardson
34dc365dd2 Preparing release with latest dependencies 2023-10-27 10:11:33 +08:00
Ronald A. Richardson
0db3634ab3 checkin environments directory and update API_SECURE to be casted to boolean 2023-10-18 16:34:09 +08:00
Ronald A. Richardson
1c0d324ba9 Fix reset of branding settings 2023-10-14 13:48:21 +08:00
Ron
096cc1097a Merge pull request #139 from fleetbase/dev-v0.2.5
preparing for new release
2023-10-13 18:11:07 +08:00
Ronald A. Richardson
eca881156a add required lockfile back to console 2023-10-13 17:50:07 +08:00
Ronald A. Richardson
40b499bcb2 preparing for new release 2023-10-13 17:40:02 +08:00
18 changed files with 16353 additions and 145 deletions

View File

@@ -10,8 +10,8 @@
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.3.1",
"fleetbase/fleetops-api": "^0.2.8",
"fleetbase/storefront-api": "^0.2.0",
"fleetbase/fleetops-api": "^0.3.0",
"fleetbase/storefront-api": "^0.2.2",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75",

245
api/composer.lock generated
View File

@@ -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": "d7dd425fca477197e2f47d776d3cf76f",
"content-hash": "4ef8ff8c33248b3cdd85ba738aacfcd3",
"packages": [
{
"name": "aloha/twilio",
@@ -138,16 +138,16 @@
},
{
"name": "aws/aws-crt-php",
"version": "v1.2.2",
"version": "v1.2.3",
"source": {
"type": "git",
"url": "https://github.com/awslabs/aws-crt-php.git",
"reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9"
"reference": "5545a4fa310aec39f54279fdacebcce33b3ff382"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9",
"reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9",
"url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382",
"reference": "5545a4fa310aec39f54279fdacebcce33b3ff382",
"shasum": ""
},
"require": {
@@ -186,26 +186,26 @@
],
"support": {
"issues": "https://github.com/awslabs/aws-crt-php/issues",
"source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.2"
"source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3"
},
"time": "2023-07-20T16:49:55+00:00"
"time": "2023-10-16T20:10:06+00:00"
},
{
"name": "aws/aws-sdk-php",
"version": "3.283.2",
"version": "3.283.13",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "6616677d76e39af28138512740199d38a461859f"
"reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6616677d76e39af28138512740199d38a461859f",
"reference": "6616677d76e39af28138512740199d38a461859f",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/853eecfb21e8d623fa1b32e597b0a75912e8a404",
"reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404",
"shasum": ""
},
"require": {
"aws/aws-crt-php": "^1.0.4",
"aws/aws-crt-php": "^1.2.3",
"ext-json": "*",
"ext-pcre": "*",
"ext-simplexml": "*",
@@ -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.283.2"
"source": "https://github.com/aws/aws-sdk-php/tree/3.283.13"
},
"time": "2023-10-06T18:09:54+00:00"
"time": "2023-10-26T18:14:40+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -2092,16 +2092,16 @@
},
{
"name": "fleetbase/fleetops-api",
"version": "0.2.8",
"version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "8d9e775238158f9f595d54c030cdbf4a763e90ea"
"reference": "73909ae2589c1be3c8a000c5dda4a0586b047a77"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/8d9e775238158f9f595d54c030cdbf4a763e90ea",
"reference": "8d9e775238158f9f595d54c030cdbf4a763e90ea",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/73909ae2589c1be3c8a000c5dda4a0586b047a77",
"reference": "73909ae2589c1be3c8a000c5dda4a0586b047a77",
"shasum": ""
},
"require": {
@@ -2133,6 +2133,16 @@
"Fleetbase\\FleetOps\\Providers\\FleetOpsServiceProvider",
"Fleetbase\\FleetOps\\Providers\\EventServiceProvider"
]
},
"fleetbase/fleetops-api": {
"excludes": [
"addon",
"app",
"assets",
"config",
"tests",
"vendor"
]
}
},
"autoload": {
@@ -2164,27 +2174,27 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.2.8"
"source": "https://github.com/fleetbase/fleetops/tree/v0.3.0"
},
"time": "2023-10-10T12:52:40+00:00"
"time": "2023-10-27T00:58:58+00:00"
},
{
"name": "fleetbase/storefront-api",
"version": "0.2.0",
"version": "0.2.2",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/storefront.git",
"reference": "cbc8c467f4a1934bbf61b02125e00eb999308659"
"reference": "affa19ebee088001aae3c77fbf013e5027f4cc09"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/storefront/zipball/cbc8c467f4a1934bbf61b02125e00eb999308659",
"reference": "cbc8c467f4a1934bbf61b02125e00eb999308659",
"url": "https://api.github.com/repos/fleetbase/storefront/zipball/affa19ebee088001aae3c77fbf013e5027f4cc09",
"reference": "affa19ebee088001aae3c77fbf013e5027f4cc09",
"shasum": ""
},
"require": {
"fleetbase/core-api": "^1.3.1",
"fleetbase/fleetops-api": "^0.2.8",
"fleetbase/fleetops-api": "^0.3.0",
"geocoder-php/google-maps-places-provider": "^1.4",
"laravel-notification-channels/apn": "^3.8",
"laravel-notification-channels/fcm": "^2.7",
@@ -2245,9 +2255,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/storefront/issues",
"source": "https://github.com/fleetbase/storefront/tree/v0.2.0"
"source": "https://github.com/fleetbase/storefront/tree/v0.2.2"
},
"time": "2023-10-10T13:07:00+00:00"
"time": "2023-10-27T01:59:15+00:00"
},
{
"name": "fruitcake/laravel-cors",
@@ -2729,16 +2739,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.13.22",
"version": "8.13.23",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "fc69cbcaff14c1af1f935b79033bdc5c0fa4a846"
"reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/fc69cbcaff14c1af1f935b79033bdc5c0fa4a846",
"reference": "fc69cbcaff14c1af1f935b79033bdc5c0fa4a846",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b2dff83693cb46eb4478b193e9d94e2ff6258480",
"reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480",
"shasum": ""
},
"require": {
@@ -2797,7 +2807,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
"time": "2023-09-29T14:53:55+00:00"
"time": "2023-10-11T07:12:56+00:00"
},
{
"name": "giggsey/locale",
@@ -2855,16 +2865,16 @@
},
{
"name": "google/auth",
"version": "v1.31.0",
"version": "v1.32.1",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-auth-library-php.git",
"reference": "22209fddd0c06f3f8e3cb4aade0b352aa00f9888"
"reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/22209fddd0c06f3f8e3cb4aade0b352aa00f9888",
"reference": "22209fddd0c06f3f8e3cb4aade0b352aa00f9888",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/999e9ce8b9d17914f04e1718271a0a46da4de2f3",
"reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3",
"shasum": ""
},
"require": {
@@ -2907,22 +2917,22 @@
"support": {
"docs": "https://googleapis.github.io/google-auth-library-php/main/",
"issues": "https://github.com/googleapis/google-auth-library-php/issues",
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.31.0"
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.32.1"
},
"time": "2023-10-05T20:39:00+00:00"
"time": "2023-10-17T21:13:22+00:00"
},
{
"name": "google/cloud-core",
"version": "v1.52.6",
"version": "v1.52.7",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-core.git",
"reference": "71f092f4dab880515917da64423656ed3d6aefc2"
"reference": "f79480d1e2b31a695ae98b42ca10b67b41da9fb1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/71f092f4dab880515917da64423656ed3d6aefc2",
"reference": "71f092f4dab880515917da64423656ed3d6aefc2",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/f79480d1e2b31a695ae98b42ca10b67b41da9fb1",
"reference": "f79480d1e2b31a695ae98b42ca10b67b41da9fb1",
"shasum": ""
},
"require": {
@@ -2938,7 +2948,7 @@
"require-dev": {
"erusev/parsedown": "^1.6",
"google/cloud-common-protos": "^0.4",
"google/gax": "^1.19.1",
"google/gax": "^1.24.0",
"opis/closure": "^3",
"phpdocumentor/reflection": "^5.0",
"phpspec/prophecy-phpunit": "^2.0",
@@ -2972,26 +2982,26 @@
],
"description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
"support": {
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.6"
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.7"
},
"time": "2023-10-06T21:49:26+00:00"
"time": "2023-10-16T22:54:31+00:00"
},
{
"name": "google/cloud-storage",
"version": "v1.33.3",
"version": "v1.33.4",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-storage.git",
"reference": "e22877e96c3f5c4f53b0fb2077834fb6d64d0fca"
"reference": "02f53c6cbbc18c4ee8f5d12cbd7887ceec575724"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/e22877e96c3f5c4f53b0fb2077834fb6d64d0fca",
"reference": "e22877e96c3f5c4f53b0fb2077834fb6d64d0fca",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/02f53c6cbbc18c4ee8f5d12cbd7887ceec575724",
"reference": "02f53c6cbbc18c4ee8f5d12cbd7887ceec575724",
"shasum": ""
},
"require": {
"google/cloud-core": "^1.51.3",
"google/cloud-core": "^1.52.7",
"php": ">=7.4",
"ramsey/uuid": "^4.2.3"
},
@@ -3028,9 +3038,9 @@
],
"description": "Cloud Storage Client for PHP",
"support": {
"source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.3"
"source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.4"
},
"time": "2023-09-30T16:50:41+00:00"
"time": "2023-10-16T22:54:31+00:00"
},
{
"name": "graham-campbell/manager",
@@ -4594,16 +4604,16 @@
},
{
"name": "laravel/serializable-closure",
"version": "v1.3.1",
"version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
"reference": "e5a3057a5591e1cfe8183034b0203921abe2c902"
"reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902",
"reference": "e5a3057a5591e1cfe8183034b0203921abe2c902",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/076fe2cf128bd54b4341cdc6d49b95b34e101e4c",
"reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c",
"shasum": ""
},
"require": {
@@ -4650,7 +4660,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
"time": "2023-07-14T13:56:28+00:00"
"time": "2023-10-17T13:38:16+00:00"
},
{
"name": "laravel/tinker",
@@ -5284,16 +5294,16 @@
},
{
"name": "league/mime-type-detection",
"version": "1.13.0",
"version": "1.14.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
"reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96"
"reference": "b6a5854368533df0295c5761a0253656a2e52d9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96",
"reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e",
"reference": "b6a5854368533df0295c5761a0253656a2e52d9e",
"shasum": ""
},
"require": {
@@ -5324,7 +5334,7 @@
"description": "Mime-type detection for Flysystem",
"support": {
"issues": "https://github.com/thephpleague/mime-type-detection/issues",
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0"
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0"
},
"funding": [
{
@@ -5336,20 +5346,20 @@
"type": "tidelift"
}
],
"time": "2023-08-05T12:09:49+00:00"
"time": "2023-10-17T14:13:20+00:00"
},
{
"name": "maatwebsite/excel",
"version": "3.1.48",
"version": "3.1.49",
"source": {
"type": "git",
"url": "https://github.com/SpartnerNL/Laravel-Excel.git",
"reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9"
"reference": "769209f49ebe3419017114f98bd61e2a7d9af259"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d0fe2a1d195960c7af7bf0de760582da02a34b9",
"reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9",
"url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/769209f49ebe3419017114f98bd61e2a7d9af259",
"reference": "769209f49ebe3419017114f98bd61e2a7d9af259",
"shasum": ""
},
"require": {
@@ -5404,7 +5414,7 @@
],
"support": {
"issues": "https://github.com/SpartnerNL/Laravel-Excel/issues",
"source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.48"
"source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.49"
},
"funding": [
{
@@ -5416,7 +5426,7 @@
"type": "github"
}
],
"time": "2023-02-22T21:01:38+00:00"
"time": "2023-10-26T09:01:33+00:00"
},
{
"name": "maennchen/zipstream-php",
@@ -7194,31 +7204,26 @@
},
{
"name": "php-http/promise",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/promise.git",
"reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88"
"reference": "ef4905bfb492ff389eb7f12e26925a0f20073050"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
"reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
"url": "https://api.github.com/repos/php-http/promise/zipball/ef4905bfb492ff389eb7f12e26925a0f20073050",
"reference": "ef4905bfb492ff389eb7f12e26925a0f20073050",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
"friends-of-phpspec/phpspec-code-coverage": "^4.3.2",
"phpspec/phpspec": "^5.1.2 || ^6.2"
"friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3",
"phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Promise\\": "src/"
@@ -7245,9 +7250,9 @@
],
"support": {
"issues": "https://github.com/php-http/promise/issues",
"source": "https://github.com/php-http/promise/tree/1.1.0"
"source": "https://github.com/php-http/promise/tree/1.2.0"
},
"time": "2020-07-07T09:29:14+00:00"
"time": "2023-10-24T09:20:26+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
@@ -7431,16 +7436,16 @@
},
{
"name": "phrity/net-stream",
"version": "1.2.0",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/sirn-se/phrity-net-stream.git",
"reference": "83435f3103016dfd45ded39040190a7f505ea264"
"reference": "9105931b65ad90c75f4885a40b268b0f65802e3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sirn-se/phrity-net-stream/zipball/83435f3103016dfd45ded39040190a7f505ea264",
"reference": "83435f3103016dfd45ded39040190a7f505ea264",
"url": "https://api.github.com/repos/sirn-se/phrity-net-stream/zipball/9105931b65ad90c75f4885a40b268b0f65802e3e",
"reference": "9105931b65ad90c75f4885a40b268b0f65802e3e",
"shasum": ""
},
"require": {
@@ -7485,9 +7490,9 @@
],
"support": {
"issues": "https://github.com/sirn-se/phrity-net-stream/issues",
"source": "https://github.com/sirn-se/phrity-net-stream/tree/1.2.0"
"source": "https://github.com/sirn-se/phrity-net-stream/tree/1.3.0"
},
"time": "2023-07-05T13:31:05+00:00"
"time": "2023-10-22T10:47:03+00:00"
},
{
"name": "phrity/net-uri",
@@ -8525,16 +8530,16 @@
},
{
"name": "psy/psysh",
"version": "v0.11.21",
"version": "v0.11.22",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "bcb22101107f3bf770523b65630c9d547f60c540"
"reference": "128fa1b608be651999ed9789c95e6e2a31b5802b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540",
"reference": "bcb22101107f3bf770523b65630c9d547f60c540",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b",
"reference": "128fa1b608be651999ed9789c95e6e2a31b5802b",
"shasum": ""
},
"require": {
@@ -8563,7 +8568,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "0.11.x-dev"
"dev-0.11": "0.11.x-dev"
},
"bamarni-bin": {
"bin-links": false,
@@ -8599,9 +8604,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.21"
"source": "https://github.com/bobthecow/psysh/tree/v0.11.22"
},
"time": "2023-09-17T21:15:54+00:00"
"time": "2023-10-14T21:56:36+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -9209,16 +9214,16 @@
},
{
"name": "sentry/sentry",
"version": "3.21.0",
"version": "3.22.0",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
"reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f"
"reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/624aafc22b84b089ffa43b71fb01e0096505ec4f",
"reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/c0e3df5a5c1d133cd9461e7672568ff07042c19d",
"reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d",
"shasum": ""
},
"require": {
@@ -9236,7 +9241,7 @@
"psr/http-factory": "^1.0",
"psr/http-factory-implementation": "^1.0",
"psr/log": "^1.0|^2.0|^3.0",
"symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0",
"symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0|^7.0",
"symfony/polyfill-php80": "^1.17"
},
"conflict": {
@@ -9293,7 +9298,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
"source": "https://github.com/getsentry/sentry-php/tree/3.21.0"
"source": "https://github.com/getsentry/sentry-php/tree/3.22.0"
},
"funding": [
{
@@ -9305,20 +9310,20 @@
"type": "custom"
}
],
"time": "2023-07-31T15:31:24+00:00"
"time": "2023-10-23T20:34:53+00:00"
},
{
"name": "sentry/sentry-laravel",
"version": "3.8.1",
"version": "3.8.2",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-laravel.git",
"reference": "b6142a80fa9360a10b786d2da032339602d0e362"
"reference": "1293e5732f8405e12f000cdf5dee78c927a18de0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/b6142a80fa9360a10b786d2da032339602d0e362",
"reference": "b6142a80fa9360a10b786d2da032339602d0e362",
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/1293e5732f8405e12f000cdf5dee78c927a18de0",
"reference": "1293e5732f8405e12f000cdf5dee78c927a18de0",
"shasum": ""
},
"require": {
@@ -9385,7 +9390,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-laravel/issues",
"source": "https://github.com/getsentry/sentry-laravel/tree/3.8.1"
"source": "https://github.com/getsentry/sentry-laravel/tree/3.8.2"
},
"funding": [
{
@@ -9397,7 +9402,7 @@
"type": "custom"
}
],
"time": "2023-10-04T10:21:16+00:00"
"time": "2023-10-12T14:38:46+00:00"
},
{
"name": "spatie/enum",
@@ -9626,16 +9631,16 @@
},
{
"name": "spatie/laravel-permission",
"version": "5.11.0",
"version": "5.11.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-permission.git",
"reference": "0a35e99da4cb6f85b07b3b58b718ff659c39a009"
"reference": "7090824cca57e693b880ce3aaf7ef78362e28bbd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-permission/zipball/0a35e99da4cb6f85b07b3b58b718ff659c39a009",
"reference": "0a35e99da4cb6f85b07b3b58b718ff659c39a009",
"url": "https://api.github.com/repos/spatie/laravel-permission/zipball/7090824cca57e693b880ce3aaf7ef78362e28bbd",
"reference": "7090824cca57e693b880ce3aaf7ef78362e28bbd",
"shasum": ""
},
"require": {
@@ -9696,7 +9701,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-permission/issues",
"source": "https://github.com/spatie/laravel-permission/tree/5.11.0"
"source": "https://github.com/spatie/laravel-permission/tree/5.11.1"
},
"funding": [
{
@@ -9704,7 +9709,7 @@
"type": "github"
}
],
"time": "2023-08-30T23:41:24+00:00"
"time": "2023-10-25T05:12:01+00:00"
},
{
"name": "spatie/laravel-responsecache",
@@ -14814,16 +14819,16 @@
},
{
"name": "kitloong/laravel-migrations-generator",
"version": "v6.10.0",
"version": "v6.11.0",
"source": {
"type": "git",
"url": "https://github.com/kitloong/laravel-migrations-generator.git",
"reference": "116f50fab918b7f1363a40ebd954ce250f6aedcd"
"reference": "220b5f17fcb16610a3e9757d68c197319c0f7444"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kitloong/laravel-migrations-generator/zipball/116f50fab918b7f1363a40ebd954ce250f6aedcd",
"reference": "116f50fab918b7f1363a40ebd954ce250f6aedcd",
"url": "https://api.github.com/repos/kitloong/laravel-migrations-generator/zipball/220b5f17fcb16610a3e9757d68c197319c0f7444",
"reference": "220b5f17fcb16610a3e9757d68c197319c0f7444",
"shasum": ""
},
"require": {
@@ -14877,7 +14882,7 @@
],
"support": {
"issues": "https://github.com/kitloong/laravel-migrations-generator/issues",
"source": "https://github.com/kitloong/laravel-migrations-generator/tree/v6.10.0"
"source": "https://github.com/kitloong/laravel-migrations-generator/tree/v6.11.0"
},
"funding": [
{
@@ -14885,7 +14890,7 @@
"type": "custom"
}
],
"time": "2023-03-26T07:37:00+00:00"
"time": "2023-10-10T13:55:26+00:00"
},
{
"name": "laravel/sail",

1
console/.gitignore vendored
View File

@@ -21,7 +21,6 @@
/testem.log
/yarn-error.log
/.npmrc
/pnpm-lock.yaml
# ember-try
/.node_modules.ember-try/

View File

@@ -2,6 +2,7 @@ import Controller from '@ember/controller';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { isArray } from '@ember/array';
export default class ConsoleAdminBrandingController extends Controller {
/**
@@ -51,13 +52,43 @@ export default class ConsoleAdminBrandingController extends Controller {
}
/**
* Unset a branding settings
* Unsets the value of a given key or array of keys on the model.
*
* @param {String} key
* @action
* @param {string | string[]} key - The key or keys to unset on the model.
* @param {*} [newValue=null] - The new value to set for the given key or keys. Defaults to null.
* @memberof ConsoleAdminBrandingController
*/
@action unset(key, newValue = null) {
this.model[key] = newValue;
if (isArray(key)) {
return key.forEach((k) => this.unset(k, undefined));
}
this.model.set(key, newValue);
}
/**
* Unsets the icon properties on the model.
*
* @action
* @returns {void} - No return value.
* @memberof ConsoleAdminBrandingController
*/
@action unsetIcon() {
this.unset(['icon_uuid', 'icon_url']);
this.model.set('icon_url', '/images/icon.png');
}
/**
* Unsets the logo properties on the model.
*
* @action
* @returns {void} - No return value.
* @memberof ConsoleAdminBrandingController
*/
@action unsetLogo() {
this.unset(['logo_uuid', 'logo_url']);
this.model.set('logo_url', '/images/fleetbase-logo-svg.svg');
}
/**

View File

@@ -28,7 +28,7 @@
</a>
</FileUpload>
</div>
<a href="javascript:;" class="text-danger text-xs mt-1" {{on "click" (fn this.unset "icon_url" "/images/icon.png")}}>Reset to default</a>
<a href="javascript:;" class="text-danger text-xs mt-1" {{on "click" this.unsetIcon}}>Reset to default</a>
</div>
<div class="input-group">
<label>Logo</label>
@@ -52,7 +52,7 @@
</a>
</FileUpload>
</div>
<a href="javascript:;" class="text-danger text-xs mt-1" {{on "click" (fn this.unset "logo_url" "/images/fleetbase-logo-svg.svg")}}>Reset to default</a>
<a href="javascript:;" class="text-danger text-xs mt-1" {{on "click" this.unsetLogo}}>Reset to default</a>
</div>
<InputGroup @name="Default Theme">
<Select @value={{@model.default_theme}} @onSelect={{this.setTheme}} @options={{this.themeOptions}} />

View File

@@ -21,7 +21,7 @@ module.exports = function (environment) {
},
API: {
host: fixApiHost(getenv('API_HOST'), getenv('API_SECURE')),
host: fixApiHost(getenv('API_HOST'), toBoolean(getenv('API_SECURE'))),
namespace: getenv('API_NAMESPACE', 'int/v1'),
},

View File

@@ -0,0 +1,8 @@
API_HOST=http://localhost:8000
API_NAMESPACE=int/v1
SOCKETCLUSTER_PATH=/socketcluster/
SOCKETCLUSTER_HOST=localhost
SOCKETCLUSTER_SECURE=false
SOCKETCLUSTER_PORT=38000
OSRM_HOST=https://bundle.routing.fleetbase.io
OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io

View File

@@ -0,0 +1,9 @@
API_HOST=
API_NAMESPACE=int/v1
API_SECURE=true
SOCKETCLUSTER_PATH=/socketcluster/
SOCKETCLUSTER_HOST=
SOCKETCLUSTER_SECURE=true
SOCKETCLUSTER_PORT=38000
OSRM_HOST=https://bundle.routing.fleetbase.io
OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io

View File

View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.2.5",
"version": "0.2.6",
"private": true,
"description": "Fleetbase Console",
"repository": "",
@@ -25,13 +25,13 @@
},
"dependencies": {
"@ember/legacy-built-in-components": "^0.4.1",
"@fleetbase/ember-core": "^0.1.4",
"@fleetbase/ember-ui": "^0.2.0",
"@fleetbase/dev-engine": "^0.1.8",
"@fleetbase/iam-engine": "^0.0.6",
"@fleetbase/fleetops-engine": "^0.2.8",
"@fleetbase/ember-core": "^0.1.6",
"@fleetbase/ember-ui": "^0.2.1",
"@fleetbase/dev-engine": "^0.1.9",
"@fleetbase/iam-engine": "^0.0.7",
"@fleetbase/fleetops-engine": "^0.3.0",
"@fleetbase/fleetops-data": "^0.1.1",
"@fleetbase/storefront-engine": "^0.2.0",
"@fleetbase/storefront-engine": "^0.2.2",
"@fleetbase/leaflet-routing-machine": "^3.2.16",
"@fortawesome/ember-fontawesome": "^0.4.1",
"ember-intl": "^6.0.0-beta.6",
@@ -126,8 +126,8 @@
"pnpm": {
"overrides": {
"@fleetbase/fleetops-data": "^0.1.1",
"@fleetbase/ember-core": "^0.1.4",
"@fleetbase/ember-ui": "^0.2.0"
"@fleetbase/ember-core": "^0.1.6",
"@fleetbase/ember-ui": "^0.2.1"
}
},
"prettier": {

16156
console/pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff