Working on dropzone uploads - generic

This commit is contained in:
David Bomba 2019-08-07 13:07:06 +10:00
parent f37f28a846
commit c50fb68b21
8 changed files with 50 additions and 1 deletions

View File

@ -12,6 +12,7 @@
namespace App\Http\Requests\ClientPortal; namespace App\Http\Requests\ClientPortal;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use Zend\Diactoros\Response\JsonResponse;
class StoreDocumentRequest extends Request class StoreDocumentRequest extends Request
{ {
@ -39,5 +40,10 @@ class StoreDocumentRequest extends Request
]; ];
} }
public function response(array $errors)
{
return new JsonResponse(['error' => $errors], 400);
}
} }

View File

@ -50,6 +50,7 @@
"filp/whoops": "^2.0", "filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4", "fzaninotto/faker": "^1.4",
"laravel/dusk": "^5.0", "laravel/dusk": "^5.0",
"laravel/telescope": "^2.0",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0", "nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0" "phpunit/phpunit": "^7.0"

View File

@ -175,6 +175,7 @@ return [
App\Providers\AuthServiceProvider::class, App\Providers\AuthServiceProvider::class,
// App\Providers\BroadcastServiceProvider::class, // App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\TelescopeServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
App\Providers\ComposerServiceProvider::class, App\Providers\ComposerServiceProvider::class,

View File

@ -33,6 +33,21 @@ return [
'connections' => [ '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' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')), 'database' => env('DB_DATABASE', database_path('database.sqlite')),

View File

@ -14,6 +14,7 @@
"@coreui/coreui": "^2.1.12", "@coreui/coreui": "^2.1.12",
"@coreui/icons": "^0.3.0", "@coreui/icons": "^0.3.0",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"bootstrap-sweetalert": "^1.0.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"dropzone": "^5.5.1", "dropzone": "^5.5.1",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",

View File

@ -11,5 +11,7 @@
"/vendors/js/select2.min.js": "/vendors/js/select2.min.js?id=0a96cf2d3a193019a91b", "/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.min.css": "/vendors/css/dropzone.min.css?id=2f735dbf472afcd77604",
"/vendors/css/dropzone-basic.min.css": "/vendors/css/dropzone-basic.min.css?id=960bcd6d5cb8351ac0d0", "/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"
} }

View File

@ -2,6 +2,7 @@
@parent @parent
<link href="/vendors/css/dropzone.min.css" rel="stylesheet"> <link href="/vendors/css/dropzone.min.css" rel="stylesheet">
<link href="/vendors/css/dropzone-basic.min.css" rel="stylesheet"> <link href="/vendors/css/dropzone-basic.min.css" rel="stylesheet">
<link href="/vendors/css/sweetalert.css" rel="stylesheet">
<style> <style>
.dropzone { .dropzone {
background: white; background: white;
@ -23,6 +24,7 @@
</div> </div>
@push('scripts') @push('scripts')
<script src="/vendors/js/dropzone.min.js"></script> <script src="/vendors/js/dropzone.min.js"></script>
<script src="/vendors/js/sweetalert.min.js"></script>
<script> <script>
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
window.countUploadingDocuments = 0; window.countUploadingDocuments = 0;
@ -59,5 +61,24 @@
this.on("error", function(file){if (!file.accepted) this.removeFile(file);}); this.on("error", function(file){if (!file.accepted) this.removeFile(file);});
}, },
}); });
if (dropzone instanceof Dropzone) {
//dropzone.on('addedfile', handleDocumentAdded);
//dropzone.on('removedfile', handleDocumentRemoved);
//dropzone.on('success', handleDocumentUploaded);
//dropzone.on('canceled', handleDocumentCanceled);
dropzone.on('error', handleDocumentError);
}
function handleDocumentError(file, responseText) {
dropzone.removeFile(file);
// window.countUploadingDocuments--;
swal(responseText);
}
</script> </script>
@endpush @endpush

2
webpack.mix.js vendored
View File

@ -29,6 +29,8 @@ mix.copyDirectory('node_modules/dropzone/dist/min/dropzone.min.css', 'public/ven
mix.copyDirectory('node_modules/dropzone/dist/min/basic.min.css', 'public/vendors/css/dropzone-basic.min.css'); mix.copyDirectory('node_modules/dropzone/dist/min/basic.min.css', 'public/vendors/css/dropzone-basic.min.css');
mix.copyDirectory('node_modules/dropzone/dist/min/dropzone.min.js', 'public/vendors/js/dropzone.min.js'); mix.copyDirectory('node_modules/dropzone/dist/min/dropzone.min.js', 'public/vendors/js/dropzone.min.js');
mix.copyDirectory('node_modules/bootstrap-sweetalert/dist/sweetalert.css', 'public/vendors/css/sweetalert.css');
mix.copyDirectory('node_modules/bootstrap-sweetalert/dist/sweetalert.min.js', 'public/vendors/js/sweetalert.min.js');
mix.copyDirectory('node_modules/font-awesome/fonts', 'public/vendors/fonts'); mix.copyDirectory('node_modules/font-awesome/fonts', 'public/vendors/fonts');