From c50fb68b21215363ca3389d7712191ad0b0b76df Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 7 Aug 2019 13:07:06 +1000 Subject: [PATCH] Working on dropzone uploads - generic --- .../ClientPortal/StoreDocumentRequest.php | 6 ++++++ composer.json | 1 + config/app.php | 1 + config/database.php | 15 +++++++++++++ package.json | 1 + public/mix-manifest.json | 4 +++- resources/views/generic/dropzone.blade.php | 21 +++++++++++++++++++ webpack.mix.js | 2 ++ 8 files changed, 50 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php index d415e1dad65b..9bb87692ccf5 100644 --- a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php +++ b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php @@ -12,6 +12,7 @@ namespace App\Http\Requests\ClientPortal; use App\Http\Requests\Request; +use Zend\Diactoros\Response\JsonResponse; class StoreDocumentRequest extends Request { @@ -39,5 +40,10 @@ class StoreDocumentRequest extends Request ]; } + public function response(array $errors) + { + return new JsonResponse(['error' => $errors], 400); + } + } diff --git a/composer.json b/composer.json index d8928a24869c..1efee9cb8316 100644 --- a/composer.json +++ b/composer.json @@ -50,6 +50,7 @@ "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", "laravel/dusk": "^5.0", + "laravel/telescope": "^2.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", "phpunit/phpunit": "^7.0" diff --git a/config/app.php b/config/app.php index e77cb438b142..b0d8b7f8fbe6 100644 --- a/config/app.php +++ b/config/app.php @@ -175,6 +175,7 @@ return [ App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, + App\Providers\TelescopeServiceProvider::class, App\Providers\RouteServiceProvider::class, App\Providers\ComposerServiceProvider::class, diff --git a/config/database.php b/config/database.php index 45ed9c5a37fa..62465f38115e 100644 --- a/config/database.php +++ b/config/database.php @@ -33,6 +33,21 @@ return [ 'connections' => [ + // single database setup + 'mysql' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST1', 'localhost'), + 'database' => env('DB_DATABASE1', 'forge'), + 'username' => env('DB_USERNAME1', 'forge'), + 'password' => env('DB_PASSWORD1', ''), + 'port' => env('DB_PORT1', '3306'), + 'charset' => 'utf8', + 'collation' => 'utf8_unicode_ci', + 'prefix' => '', + 'strict' => env('DB_STRICT', false), + 'engine' => 'InnoDB', + ], + 'sqlite' => [ 'driver' => 'sqlite', 'database' => env('DB_DATABASE', database_path('database.sqlite')), diff --git a/package.json b/package.json index eb9b592660af..c5a3a91d564a 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@coreui/coreui": "^2.1.12", "@coreui/icons": "^0.3.0", "bootstrap": "^4.3.1", + "bootstrap-sweetalert": "^1.0.1", "cross-env": "^5.2.0", "dropzone": "^5.5.1", "font-awesome": "^4.7.0", diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 188b2073f3e6..72edfb9396f0 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -11,5 +11,7 @@ "/vendors/js/select2.min.js": "/vendors/js/select2.min.js?id=0a96cf2d3a193019a91b", "/vendors/css/dropzone.min.css": "/vendors/css/dropzone.min.css?id=2f735dbf472afcd77604", "/vendors/css/dropzone-basic.min.css": "/vendors/css/dropzone-basic.min.css?id=960bcd6d5cb8351ac0d0", - "/vendors/js/dropzone.min.js": "/vendors/js/dropzone.min.js?id=33148c7d5e055ea74714" + "/vendors/js/dropzone.min.js": "/vendors/js/dropzone.min.js?id=33148c7d5e055ea74714", + "/vendors/css/sweetalert.css": "/vendors/css/sweetalert.css?id=0862d17907b9cc4e4374", + "/vendors/js/sweetalert.min.js": "/vendors/js/sweetalert.min.js?id=0e2613ca4d17a624d7e9" } diff --git a/resources/views/generic/dropzone.blade.php b/resources/views/generic/dropzone.blade.php index 593161b19bcd..2bf1af3ebf79 100644 --- a/resources/views/generic/dropzone.blade.php +++ b/resources/views/generic/dropzone.blade.php @@ -2,6 +2,7 @@ @parent +