From 8df902db09a435a50d42501237cc2b0acc5477cb Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 17 Mar 2023 16:06:34 +0800 Subject: [PATCH] latest wip --- .gitignore | 8 +++++- api/composer.lock | 51 +++++++++++++++++++++++++++++++++++--- api/config/filesystems.php | 8 ++++++ api/public/uploads | 1 + console | 2 +- packages/core-api | 2 +- packages/ember-core | 2 +- packages/fleetops-api | 2 +- packages/fleetops-engine | 2 +- scripts/dumpautoload.sh | 3 ++- 10 files changed, 71 insertions(+), 10 deletions(-) create mode 120000 api/public/uploads diff --git a/.gitignore b/.gitignore index 1ad3c636..f728a3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,10 @@ .phpunit.result.cache docker-compose.override.yml npm-debug.log -yarn-error.log \ No newline at end of file +yarn-error.log +api/public/hot +api/public/storage +api/storage/*.key +api/storage/uploads +api/storage/public +api/vendor \ No newline at end of file diff --git a/api/composer.lock b/api/composer.lock index 061f4376..c7c0d0da 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -937,7 +937,7 @@ "dist": { "type": "path", "url": "../packages/core-api", - "reference": "34fa8946a309dd561f10e9244980a6b5c9be8d9e" + "reference": "49e1c14866f71a4348c8bd96dc0cd26c96f72e62" }, "require": { "aws/aws-sdk-php-laravel": "^3.7", @@ -955,6 +955,7 @@ "laravel/sanctum": "^2.15", "php": "^7.4|^8.0", "pragmarx/countries": "^0.8.2", + "ralouphie/mimey": "^1.0", "spatie/laravel-activitylog": "^3.17", "spatie/laravel-permission": "^5.5", "spatie/laravel-responsecache": "^6.6", @@ -1028,7 +1029,7 @@ "dist": { "type": "path", "url": "../packages/fleetops-api", - "reference": "e7427c4f913de56ad7bc91c736e3c099adba6635" + "reference": "2f67fb71378d1e393c98460abade9bf1964cb1d9" }, "require": { "fleetbase/core-api": "*", @@ -5528,6 +5529,50 @@ }, "time": "2019-03-08T08:55:37+00:00" }, + { + "name": "ralouphie/mimey", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/mimey.git", + "reference": "2a0e997c733b7c2f9f8b61cafb006fd5fb9fa15a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/mimey/zipball/2a0e997c733b7c2f9f8b61cafb006fd5fb9fa15a", + "reference": "2a0e997c733b7c2f9f8b61cafb006fd5fb9fa15a", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Mimey\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "PHP package for converting file extensions to MIME types and vice versa.", + "support": { + "issues": "https://github.com/ralouphie/mimey/issues", + "source": "https://github.com/ralouphie/mimey/tree/master" + }, + "time": "2016-09-28T03:36:23+00:00" + }, { "name": "ramsey/collection", "version": "1.3.0", @@ -11414,5 +11459,5 @@ "php": "^7.3|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/api/config/filesystems.php b/api/config/filesystems.php index 760ef972..1e89d507 100644 --- a/api/config/filesystems.php +++ b/api/config/filesystems.php @@ -42,6 +42,13 @@ return [ 'visibility' => 'public', ], + 'uploads' => [ + 'driver' => 'local', + 'root' => storage_path('app/uploads'), + 'url' => env('APP_URL').'/uploads', + 'visibility' => 'public', + ], + 's3' => [ 'driver' => 's3', 'key' => env('AWS_ACCESS_KEY_ID'), @@ -68,6 +75,7 @@ return [ 'links' => [ public_path('storage') => storage_path('app/public'), + public_path('uploads') => storage_path('app/uploads'), ], ]; diff --git a/api/public/uploads b/api/public/uploads new file mode 120000 index 00000000..d8fccff3 --- /dev/null +++ b/api/public/uploads @@ -0,0 +1 @@ +/var/www/html/api/storage/app/uploads \ No newline at end of file diff --git a/console b/console index d6fe0071..739df1ee 160000 --- a/console +++ b/console @@ -1 +1 @@ -Subproject commit d6fe00713adcb95e490133106978cf93d1892387 +Subproject commit 739df1eeff77c61818c8f2e80e14282350f0b398 diff --git a/packages/core-api b/packages/core-api index 34fa8946..a8a82d14 160000 --- a/packages/core-api +++ b/packages/core-api @@ -1 +1 @@ -Subproject commit 34fa8946a309dd561f10e9244980a6b5c9be8d9e +Subproject commit a8a82d14fbf3549f3b5bdd61dc775a7b8ce502e8 diff --git a/packages/ember-core b/packages/ember-core index f59d11fa..e628b918 160000 --- a/packages/ember-core +++ b/packages/ember-core @@ -1 +1 @@ -Subproject commit f59d11fa23744b88e7b58f4a823f0fcd2063fc38 +Subproject commit e628b918b6b301055eb39fb41295bfc9547c1224 diff --git a/packages/fleetops-api b/packages/fleetops-api index 2329534f..5eeee6a1 160000 --- a/packages/fleetops-api +++ b/packages/fleetops-api @@ -1 +1 @@ -Subproject commit 2329534fd074fb4acbbf49023565666f710c0869 +Subproject commit 5eeee6a13df8b489fdf0822e0e552d71dd883af2 diff --git a/packages/fleetops-engine b/packages/fleetops-engine index b5ae9930..b2e18c32 160000 --- a/packages/fleetops-engine +++ b/packages/fleetops-engine @@ -1 +1 @@ -Subproject commit b5ae9930028fe17751eb171446a180d6ca826558 +Subproject commit b2e18c328ddf169418ebf95a753a527d8dbf88a0 diff --git a/scripts/dumpautoload.sh b/scripts/dumpautoload.sh index ec3e8240..b59474b5 100644 --- a/scripts/dumpautoload.sh +++ b/scripts/dumpautoload.sh @@ -1,3 +1,4 @@ #!/bin/bash composer dump-autoload --working-dir /var/www/html/api -composer dump-autoload --working-dir /var/www/html/fleetbase/core-api +composer dump-autoload --working-dir /var/www/html/packages/core-api +composer dump-autoload --working-dir /var/www/html/packages/fleetops-api