diff --git a/Laravel_CSSD.rar b/Laravel_CSSD.rar deleted file mode 100644 index 6e42d220..00000000 Binary files a/Laravel_CSSD.rar and /dev/null differ diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php new file mode 100644 index 00000000..a4ecd513 --- /dev/null +++ b/app/Http/Controllers/ItemController.php @@ -0,0 +1,63 @@ +paginate(10); + return \MessageResponse::data($Items); + } + + public function create() + { + + } + public function show(Item $Item) + { + return \MessageResponse::data($Item); + } + public function store(StoreItemRequest $request) + { + + // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); + $ItemData = [ + 'name' => $request->name, + 'result' => $request->result, + 'description' => $request->description, + 'user_id' => auth('api')->user()->id, + ]; + $ItemObj = Item::create($ItemData); + + return \MessageResponse::success(trans('messages.success')); + } + public function edit(Item $Item) + { + return \MessageResponse::data($Item); + } + public function update(StoreItemRequest $request, Item $Item) + { + // dd($request->all()); + $Item->update($request->all()); + return \MessageResponse::success(trans('messages.success')); + } + public function destroy(Item $Item) + { + if (!auth('api')->user()->can('delete', $Item)) { + return \MessageResponse::error(trans('messages.access_denied')); + } + $Item->delete(); + return \MessageResponse::success(trans('messages.success')); + } + + public function getItems(){ + $Items = Item::with('user')->get(); + return \MessageResponse::data($Items); + } + +} diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 3baf4a84..cd7aa08c 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -28,6 +28,7 @@ class PackageController extends Controller } public function show(Package $Package) { + $Package->load('user', 'items'); return \MessageResponse::data($Package); } public function store(StorePackageRequest $request) @@ -41,16 +42,19 @@ class PackageController extends Controller 'user_id' => auth('api')->user()->id, 'verified' => 'NotVerified', ]; - Package::create($PackageData); + $PackageObj = Package::create($PackageData); + $PackageObj->items()->attach($request->items); return \MessageResponse::success(trans('messages.success')); } public function edit(Package $Package) { + $Package->load('user', 'items'); return \MessageResponse::data($Package); } public function update(StorePackageRequest $request, Package $Package) { - $Package->update($request->all()); + $Package->update($request->except(['items'])); + $Package->items()->sync($request->items); return \MessageResponse::success(trans('messages.success')); } public function destroy(Package $Package) diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 20b82f4d..02211d50 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -79,7 +79,7 @@ class TestResultController extends Controller public function store(StoreTestResultRequest $request) { - + // dd($request->result); try { $return_value = \DB::transaction(function () use ($request) { @@ -88,7 +88,7 @@ class TestResultController extends Controller // 'autoclave_id' => $request->autoclave_id, 'cycle_number' => $request->cycle_number, 'device_id' => $request->device_id, - 'device_label' => $request->device_label, + // 'device_label' => $request->device_label, 'test_type_id' => $request->test_type_id, 'result' => $request->result, 'verified' => 'NotVerified', @@ -102,15 +102,15 @@ class TestResultController extends Controller foreach ($Inputs as $Input) { if ($Input['type'] != 'Form') { $Value = $TestResultInfo[$Input->name.'_'.$Input->id]; - if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') { - // foreach ($Value as $Option) { - // $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option]); - // } foreach ($Input->options as $Option) {//--2 - if(in_array($Option->id,$Value)){ - $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); - } + if(is_array($Value) && in_array($Option->id,$Value)){ + $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); + } + if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { + $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); + } } } else { @@ -120,14 +120,15 @@ class TestResultController extends Controller foreach ($Input->children as $InputChild) { $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id]; - if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { - // foreach ($Value as $Option) { - // $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option]); - // } + if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') { + foreach ($InputChild->options as $Option) {//--2 - if(in_array($Option->id,$Value)){ + if(is_array($Value) && in_array($Option->id,$Value)){ $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); } + if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { + $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); + } } } else { @@ -139,32 +140,16 @@ class TestResultController extends Controller } } ///////////////////////////////////////////////////////////////////////////Inputs - ///////////////////////////////////////////////////////////////////////////Image - - // if ($request->img != null) { - // - // $Image = $request->img; - // $InterventionImage = Image::make($Image); - // $Mime = explode('/', $InterventionImage->mime()); - // - // $ImageName = time().'.'.$Mime[1]; - // $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName; - // - // Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id); - // $InterventionImage->save(public_path($Path)); - // - // $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]); - // $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']); - // } - //-------------------------------------------------imgs + ///////////////////////////////////////////////////////////////////////////Images if ($request->imgs != null) { - foreach ($request->imgs as $img) { + foreach ($request->imgs as $key => $img) { + // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); $Image = $img; $InterventionImage = Image::make($Image); $Mime = explode('/', $InterventionImage->mime()); - $ImageName = time().'.'.$Mime[1]; + $ImageName = time().$key.'.'.$Mime[1]; $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName; Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id); @@ -174,7 +159,7 @@ class TestResultController extends Controller $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']); } } - ///////////////////////////////////////////////////////////////////////////Image + ///////////////////////////////////////////////////////////////////////////Images }); } catch (\Exception $e) { @@ -193,7 +178,7 @@ class TestResultController extends Controller if ($input->parent_id != null && $input->parent['type'] == 'Form') { //----------------------------------------------------------------------FormType - if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get(); $options = []; foreach ($input_options as $input_option) { @@ -213,7 +198,7 @@ class TestResultController extends Controller } else { //-----------------------------------------------------------------------Anothertype - if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get(); $options = []; foreach ($input_options as $input_option) { @@ -231,8 +216,12 @@ class TestResultController extends Controller } } + $ImagesPath = []; if (count($TestResult->TitleImage)) { - $TestResult['imagePath'] = $TestResult->TitleImage[0]->path; + foreach ($TestResult->TitleImage as $Key => $TitleImage) { + $ImagesPath[] = $TitleImage->path; + } + $TestResult['imagesPath'] = $ImagesPath; } return \MessageResponse::data($TestResult); } @@ -241,16 +230,25 @@ class TestResultController extends Controller { foreach ($TestResult->input_values as $key => $value) { $input = $value->input; - if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') { $input_options = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get()->pluck('option_id')->toArray(); - $TestResult[$input->name.'_'.$input->id] = $input_options; + if ($input['type'] == 'Radiobutton') { + $TestResult[$input->name.'_'.$input->id] = $input_options[0]; + } + else { + $TestResult[$input->name.'_'.$input->id] = $input_options; + } } else { $TestResult[$input->name.'_'.$input->id] = $value->value; } } + $ImagesPath = []; if (count($TestResult->TitleImage)) { - $TestResult['imagePath'] = $TestResult->TitleImage[0]->path; + foreach ($TestResult->TitleImage as $Key => $TitleImage) { + $ImagesPath[] = $TitleImage->path; + } + $TestResult['imagesPath'] = $ImagesPath; } return \MessageResponse::data($TestResult); } @@ -269,7 +267,7 @@ class TestResultController extends Controller // 'autoclave_id' => $request->autoclave_id, 'cycle_number' => $request->cycle_number, 'device_id' => $request->device_id, - 'device_label' => $request->device_label, + // 'device_label' => $request->device_label, 'test_type_id' => $request->test_type_id, 'result' => $request->result, 'verified' => 'NotVerified', @@ -282,19 +280,17 @@ class TestResultController extends Controller foreach ($Inputs as $Input) { if ($Input['type'] != 'Form') { $Value = $TestResultInfo[$Input->name.'_'.$Input->id]; - - if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') { $InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $Input->id)->get()->each->delete(); - // $option_array = $Input->options->pluck('id')->toArray(); - // foreach ($Value as $Option) {//--1 - // $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option]); - // } foreach ($Input->options as $Option) {//--2 - if(in_array($Option->id,$Value)){ + if(is_array($Value) && in_array($Option->id,$Value)){ $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); } + if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { + $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]); + } } } else { @@ -306,16 +302,16 @@ class TestResultController extends Controller $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id]; - if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') { + if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') { $InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $InputChild->id)->get()->each->delete(); - // foreach ($Value as $Option) { - // $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option]); - // } foreach ($InputChild->options as $Option) {//--2 - if(in_array($Option->id,$Value)){ + if(is_array($Value) && in_array($Option->id,$Value)){ $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); } + if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) { + $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]); + } } } else { @@ -324,42 +320,38 @@ class TestResultController extends Controller } } } - /////////////////////////////////////////////////////////////////////Image - $image = ''; - if (count($TestResult->TitleImage)) - $image = $TestResult->TitleImage[0]; - - if ($request->img != null) { - - $Image = $request->img; - $InterventionImage = Image::make($Image); - $Mime = explode('/', $InterventionImage->mime()); - - $ImageName = time().'.'.$Mime[1]; - $Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName; - - Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id); - $InterventionImage->save(public_path($Path)); - - - if ($image !== ''){ + /////////////////////////////////////////////////////////////////////Images + $images = ''; + if (count($TestResult->TitleImage)) + { + $images = $TestResult->TitleImage; + foreach ($images as $key => $image) { Storage::disk('public')->delete(static::storage_path($image->path)); Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete(); - - //-------------------------------------------------------- - $GalleryObj = Gallery::where('id', $image->id)->update(['path' => $Path]); - $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => get_class($TestResult), 'gallery_id' => $image->id, 'image_role' => 'TitleImage']); - //-------------------------------------------------------- - - } - else { - //-------------------------------------------------------- - $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]); - $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']); - //-------------------------------------------------------- + Gallery::where('id', $image->id)->delete(); } } - //////////////////////////////////////////////////////////////////Image + + if ($request->imgs != null) { + foreach ($request->imgs as $key => $img) {// + + $Image = $img; + $InterventionImage = Image::make($Image); + $Mime = explode('/', $InterventionImage->mime()); + + $ImageName = time().$key.'.'.$Mime[1]; + $Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName; + + Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id); + $InterventionImage->save(public_path($Path)); + + //-------------------------------------------------------- + $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]); + $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']); + //-------------------------------------------------------- + + }// + } return \MessageResponse::success(null,trans('messages.update')); } @@ -369,6 +361,16 @@ class TestResultController extends Controller if (!auth('api')->user()->can('delete', $TestResult)) { return \MessageResponse::error(trans('messages.access_denied')); } + if (count($TestResult->input_values)) { + InputValue::where('test_result_id', $TestResult->id)->get()->each->delete(); + } + if (count($TestResult->TitleImage)){ + foreach ($TestResult->TitleImage as $image) { + Storage::disk('public')->delete(static::storage_path($image->path)); + Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete(); + Gallery::where('id', $image->id)->delete(); + } + } $TestResult->delete(); return \MessageResponse::success(null, trans('messages.success')); } diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php index 84fc693c..83c08ef9 100644 --- a/app/Http/Controllers/TestTypeController.php +++ b/app/Http/Controllers/TestTypeController.php @@ -104,6 +104,7 @@ class TestTypeController extends Controller $TestType = [ 'name' => $request['name'], 'unique_code' => $request['unique_code'], + 'device_label' => $request['device_label'], 'user_id' => auth('api')->user()->id ]; @@ -320,6 +321,7 @@ class TestTypeController extends Controller $TestTypeData = [ 'name' => $request['name'], 'unique_code' => $request['unique_code'], + 'device_label' => $request['device_label'], ]; $TestType->update($TestTypeData); $TestTypeInfo = $request['info']; diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php new file mode 100644 index 00000000..ce2e8fdc --- /dev/null +++ b/app/Http/Requests/StoreItemRequest.php @@ -0,0 +1,51 @@ +method() == 'POST') { + return auth('api')->check() && auth('api')->user()->can('store', Item::class); + } else { + $Item = $this->route('Item'); + return auth('api')->check() && $Item && auth('api')->user()->can('update', $Item); + } + } + + public function rules() + { + switch ($this->method()) { + case 'POST': { + return [ + 'name' => 'required|max:100|unique:Items', + 'result' => 'required', + // 'description' => 'required', + ]; + break; + } + case 'PUT': + case 'PATCH': { + $Item = $this->route('Item'); + return [ + 'name' => 'required|max:100|unique:Items,id,'.$Item->id, + 'result' => 'required', + // 'description' => 'required', + ]; + break; + + } + default: + break; + } + + } + +} diff --git a/app/Http/Requests/StoreTestResultRequest.php b/app/Http/Requests/StoreTestResultRequest.php index fd51871f..33dd3f55 100644 --- a/app/Http/Requests/StoreTestResultRequest.php +++ b/app/Http/Requests/StoreTestResultRequest.php @@ -25,10 +25,7 @@ class StoreTestResultRequest extends FormRequest switch ($this->method()) { case 'POST': { return [ - // 'user_id' => 'required', - // 'autoclave_id' => 'required', - 'device_id' => 'required', - 'device_label' => 'required', + // 'device_id' => 'requisred', 'cycle_number' => 'required', 'test_type_id' => 'required|numeric|exists:test_types,id', 'result' => 'required', @@ -39,10 +36,7 @@ class StoreTestResultRequest extends FormRequest case 'PATCH': { // $TestResult = $this->route('TestResult'); return [ - // 'user_id' => 'required', - // 'autoclave_id' => 'required', - 'device_id' => 'required', - 'device_label' => 'required', + // 'device_id' => 'required', 'cycle_number' => 'required', 'test_type_id' => 'required|numeric|exists:test_types,id', 'result' => 'required', diff --git a/app/Http/Requests/StoreTestTypeRequest.php b/app/Http/Requests/StoreTestTypeRequest.php index 077be206..e81cef3c 100644 --- a/app/Http/Requests/StoreTestTypeRequest.php +++ b/app/Http/Requests/StoreTestTypeRequest.php @@ -27,6 +27,7 @@ class StoreTestTypeRequest extends FormRequest return [ 'name' => 'required|max:100|unique:test_types', 'unique_code' => 'required|max:100|unique:test_types', + 'device_label' => 'required', 'info.*.name'=>'required', 'info.*.type'=>'required', 'info.*.size'=>'nullable', @@ -40,6 +41,7 @@ class StoreTestTypeRequest extends FormRequest return [ 'name' => 'required|max:100|unique:test_types,id,'.$TestType->id, 'unique_code' => 'required|max:100|unique:test_types,id,'.$TestType->id, + 'device_label' => 'required', 'info.*.name'=>'required', 'info.*.type'=>'required', 'info.*.size'=>'nullable', diff --git a/app/Item.php b/app/Item.php index 9a100a5c..6c453c37 100644 --- a/app/Item.php +++ b/app/Item.php @@ -6,24 +6,9 @@ use Illuminate\Database\Eloquent\Model; class Item extends Model { - public $fillable = []; + public $fillable = ['name', 'result', 'description', 'user_id']; public function packages() { return $this->belongsToMany('App\Package', 'item_package'); } } -// Schema::create('role_user', function (Blueprint $table) { -// -// $table->integer('user_id')->unsigned(); -// -// $table->integer('role_id')->unsigned(); -// -// $table->foreign('user_id')->references('id')->on('users') -// -// ->onDelete('cascade'); -// -// $table->foreign('role_id')->references('id')->on('roles') -// -// ->onDelete('cascade'); -// -// }); diff --git a/app/Policies/ItemPolicy.php b/app/Policies/ItemPolicy.php new file mode 100644 index 00000000..c1aabce1 --- /dev/null +++ b/app/Policies/ItemPolicy.php @@ -0,0 +1,29 @@ +hasRole('Admin') && $Item->users->count() == 0) + return true; + } + + public function update(User $User, Item $Item) + { + // if($User->hasRole('Admin')) + return true; + } + + public function store(User $User) + { + // if($User->hasRole('Admin')) + return true; + } + +} diff --git a/app/TestResult.php b/app/TestResult.php index 95ffd385..d4c89e81 100644 --- a/app/TestResult.php +++ b/app/TestResult.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; class TestResult extends Model { - public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'device_label', 'cycle_number']; + public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'cycle_number']; public function test_type() { return $this->belongsTo('App\TestType'); diff --git a/app/TestType.php b/app/TestType.php index 56b24645..daa50ad8 100644 --- a/app/TestType.php +++ b/app/TestType.php @@ -9,7 +9,7 @@ class TestType extends Model { use SoftDeletes; - public $fillable = ['name','unique_code','user_id','bar_code']; + public $fillable = ['name', 'unique_code', 'user_id', 'bar_code', 'device_label']; // protected $softDelete = true; public function user() diff --git a/composer.json b/composer.json index 4c301076..847dad0c 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,7 @@ "require": { "php": "^7.1.3", "fideloper/proxy": "^4.0", + "intervention/image": "^2.5", "laravel/framework": "5.8.*", "laravel/passport": "^7.2", "laravel/tinker": "^1.0", diff --git a/composer.lock b/composer.lock index c23199af..d5225575 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "282319c473e3a4fae1950c36e3c9832a", + "content-hash": "c8fc2e38aa1756fdf6c2038c630a5b1b", "packages": [ { "name": "defuse/php-encryption", @@ -663,6 +663,76 @@ ], "time": "2018-12-04T20:46:45+00:00" }, + { + "name": "intervention/image", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/Intervention/image.git", + "reference": "39eaef720d082ecc54c64bf54541c55f10db546d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/image/zipball/39eaef720d082ecc54c64bf54541c55f10db546d", + "reference": "39eaef720d082ecc54c64bf54541c55f10db546d", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.2", + "phpunit/phpunit": "^4.8 || ^5.7" + }, + "suggest": { + "ext-gd": "to use GD library based image processing.", + "ext-imagick": "to use Imagick based image processing.", + "intervention/imagecache": "Caching extension for the Intervention Image library" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + }, + "laravel": { + "providers": [ + "Intervention\\Image\\ImageServiceProvider" + ], + "aliases": { + "Image": "Intervention\\Image\\Facades\\Image" + } + } + }, + "autoload": { + "psr-4": { + "Intervention\\Image\\": "src/Intervention/Image" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Vogel", + "email": "oliver@olivervogel.com", + "homepage": "http://olivervogel.com/" + } + ], + "description": "Image handling and manipulation library with support for Laravel integration", + "homepage": "http://image.intervention.io/", + "keywords": [ + "gd", + "image", + "imagick", + "laravel", + "thumbnail", + "watermark" + ], + "time": "2019-06-24T14:06:31+00:00" + }, { "name": "jakub-onderka/php-console-color", "version": "v0.2", diff --git a/config/app.php b/config/app.php index 35607f9e..5be8e3dd 100644 --- a/config/app.php +++ b/config/app.php @@ -161,6 +161,7 @@ return [ Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, + Intervention\Image\ImageServiceProvider::class, /* * Package Service Providers... @@ -229,6 +230,7 @@ return [ 'MessageResponse' => Packages\Messaging\src\Facades\MessageResponse::class, 'DNS1D' => Milon\Barcode\Facades\DNS1DFacade::class, 'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class, + 'Image' => Intervention\Image\Facades\Image::class ], ]; diff --git a/database/migrations/2019_04_11_104917_create_test_types_table.php b/database/migrations/2019_04_11_104917_create_test_types_table.php index ddee309a..e2161cb0 100644 --- a/database/migrations/2019_04_11_104917_create_test_types_table.php +++ b/database/migrations/2019_04_11_104917_create_test_types_table.php @@ -17,6 +17,7 @@ class CreateTestTypesTable extends Migration $table->bigIncrements('id'); $table->string('name')->unique(); $table->string('unique_code')->unique(); + $table->string('device_label'); $table->string('bar_code'); $table->unsignedBigInteger('user_id'); $table->foreign('user_id')->references('id')->on('users'); diff --git a/database/migrations/2019_04_11_105013_create_test_results_table.php b/database/migrations/2019_04_11_105013_create_test_results_table.php index afc05338..7f6c3def 100644 --- a/database/migrations/2019_04_11_105013_create_test_results_table.php +++ b/database/migrations/2019_04_11_105013_create_test_results_table.php @@ -21,7 +21,6 @@ class CreateTestResultsTable extends Migration $table->text('description'); $table->smallInteger('verified'); $table->string('device_id'); - $table->string('device_label'); $table->integer('autoclave_id'); $table->unsignedBigInteger('user_id'); $table->foreign('user_id')->references('id')->on('users'); diff --git a/database/migrations/2019_07_16_095633_create_packages_table.php b/database/migrations/2019_07_16_095633_create_packages_table.php new file mode 100644 index 00000000..8bbd0cba --- /dev/null +++ b/database/migrations/2019_07_16_095633_create_packages_table.php @@ -0,0 +1,38 @@ +bigIncrements('id'); + $table->string('name'); + $table->string('unique_id'); + $table->enum('result',array('Pass', 'Fail')); + $table->text('description'); + $table->enum('verified',array('Verified', 'NotVerified')); + $table->unsignedBigInteger('user_id'); + $table->foreign('user_id')->references('id')->on('users'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('packages'); + } +} diff --git a/database/migrations/2019_07_16_100154_create_items_table.php b/database/migrations/2019_07_16_100154_create_items_table.php new file mode 100644 index 00000000..9cea0f5c --- /dev/null +++ b/database/migrations/2019_07_16_100154_create_items_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->string('name'); + $table->enum('result', array('Pass', 'Fail')); + $table->text('description'); + $table->unsignedBigInteger('user_id'); + $table->foreign('user_id')->references('id')->on('users'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('items'); + } +} diff --git a/database/migrations/2019_07_16_100249_create_item_package_table.php b/database/migrations/2019_07_16_100249_create_item_package_table.php new file mode 100644 index 00000000..222f9b4f --- /dev/null +++ b/database/migrations/2019_07_16_100249_create_item_package_table.php @@ -0,0 +1,35 @@ +bigIncrements('id'); + $table->integer('item_id')->unsigned(); + $table->integer('package_id')->unsigned(); + $table->foreign('item_id')->references('id')->on('items'); + $table->foreign('package_id')->references('id')->on('packages'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('item_package'); + } +} diff --git a/node_modules/.cache/babel-loader/0f8142edbaa50d41051db8f3f010f615.json.gz b/node_modules/.cache/babel-loader/0f8142edbaa50d41051db8f3f010f615.json.gz new file mode 100644 index 00000000..2f0d62da Binary files /dev/null and b/node_modules/.cache/babel-loader/0f8142edbaa50d41051db8f3f010f615.json.gz differ diff --git a/node_modules/.cache/babel-loader/1036579d0a18c4f4ec08deb4b3f14039.json.gz b/node_modules/.cache/babel-loader/1036579d0a18c4f4ec08deb4b3f14039.json.gz new file mode 100644 index 00000000..886315a8 Binary files /dev/null and b/node_modules/.cache/babel-loader/1036579d0a18c4f4ec08deb4b3f14039.json.gz differ diff --git a/node_modules/.cache/babel-loader/1cdc0770ceebd3b58c2bec57fea5c79b.json.gz b/node_modules/.cache/babel-loader/1cdc0770ceebd3b58c2bec57fea5c79b.json.gz new file mode 100644 index 00000000..a4ee2803 Binary files /dev/null and b/node_modules/.cache/babel-loader/1cdc0770ceebd3b58c2bec57fea5c79b.json.gz differ diff --git a/node_modules/.cache/babel-loader/204fc0d3fd10a7bcc21b71b82c7c27f7.json.gz b/node_modules/.cache/babel-loader/204fc0d3fd10a7bcc21b71b82c7c27f7.json.gz new file mode 100644 index 00000000..0fe86cdf Binary files /dev/null and b/node_modules/.cache/babel-loader/204fc0d3fd10a7bcc21b71b82c7c27f7.json.gz differ diff --git a/node_modules/.cache/babel-loader/217043394eb6696b9d32e90350127c2c.json.gz b/node_modules/.cache/babel-loader/217043394eb6696b9d32e90350127c2c.json.gz new file mode 100644 index 00000000..c9539789 Binary files /dev/null and b/node_modules/.cache/babel-loader/217043394eb6696b9d32e90350127c2c.json.gz differ diff --git a/node_modules/.cache/babel-loader/2ac294fed77897f29781cb91aeec5b37.json.gz b/node_modules/.cache/babel-loader/2ac294fed77897f29781cb91aeec5b37.json.gz new file mode 100644 index 00000000..88506264 Binary files /dev/null and b/node_modules/.cache/babel-loader/2ac294fed77897f29781cb91aeec5b37.json.gz differ diff --git a/node_modules/.cache/babel-loader/2b04d2d4dd7424199f0ad287dc91bd52.json.gz b/node_modules/.cache/babel-loader/2b04d2d4dd7424199f0ad287dc91bd52.json.gz new file mode 100644 index 00000000..9c823c42 Binary files /dev/null and b/node_modules/.cache/babel-loader/2b04d2d4dd7424199f0ad287dc91bd52.json.gz differ diff --git a/node_modules/.cache/babel-loader/2c1968cb74be1a265be1297360a6bf52.json.gz b/node_modules/.cache/babel-loader/2c1968cb74be1a265be1297360a6bf52.json.gz new file mode 100644 index 00000000..a4c30c86 Binary files /dev/null and b/node_modules/.cache/babel-loader/2c1968cb74be1a265be1297360a6bf52.json.gz differ diff --git a/node_modules/.cache/babel-loader/2c40f365395aee701b1bd5ca8043aa20.json.gz b/node_modules/.cache/babel-loader/2c40f365395aee701b1bd5ca8043aa20.json.gz new file mode 100644 index 00000000..1a6325a5 Binary files /dev/null and b/node_modules/.cache/babel-loader/2c40f365395aee701b1bd5ca8043aa20.json.gz differ diff --git a/node_modules/.cache/babel-loader/2f0b3a3b2a16ed4282aae9d1aee91aae.json.gz b/node_modules/.cache/babel-loader/2f0b3a3b2a16ed4282aae9d1aee91aae.json.gz new file mode 100644 index 00000000..8b8d20c1 Binary files /dev/null and b/node_modules/.cache/babel-loader/2f0b3a3b2a16ed4282aae9d1aee91aae.json.gz differ diff --git a/node_modules/.cache/babel-loader/30ff010afd8b8b60095c8213da38ebf4.json.gz b/node_modules/.cache/babel-loader/30ff010afd8b8b60095c8213da38ebf4.json.gz new file mode 100644 index 00000000..703635f1 Binary files /dev/null and b/node_modules/.cache/babel-loader/30ff010afd8b8b60095c8213da38ebf4.json.gz differ diff --git a/node_modules/.cache/babel-loader/334f078b0cce939a3a3e681dc2b0956a.json.gz b/node_modules/.cache/babel-loader/334f078b0cce939a3a3e681dc2b0956a.json.gz new file mode 100644 index 00000000..07152980 Binary files /dev/null and b/node_modules/.cache/babel-loader/334f078b0cce939a3a3e681dc2b0956a.json.gz differ diff --git a/node_modules/.cache/babel-loader/367190afd9b9ce69f964eb7b5c8fab48.json.gz b/node_modules/.cache/babel-loader/367190afd9b9ce69f964eb7b5c8fab48.json.gz new file mode 100644 index 00000000..75689927 Binary files /dev/null and b/node_modules/.cache/babel-loader/367190afd9b9ce69f964eb7b5c8fab48.json.gz differ diff --git a/node_modules/.cache/babel-loader/3731aba991aaca90da85fbd6b9150d4a.json.gz b/node_modules/.cache/babel-loader/3731aba991aaca90da85fbd6b9150d4a.json.gz new file mode 100644 index 00000000..4c9bc248 Binary files /dev/null and b/node_modules/.cache/babel-loader/3731aba991aaca90da85fbd6b9150d4a.json.gz differ diff --git a/node_modules/.cache/babel-loader/3d3378688e12692b7f97162478db291e.json.gz b/node_modules/.cache/babel-loader/3d3378688e12692b7f97162478db291e.json.gz new file mode 100644 index 00000000..6617571b Binary files /dev/null and b/node_modules/.cache/babel-loader/3d3378688e12692b7f97162478db291e.json.gz differ diff --git a/node_modules/.cache/babel-loader/3d622d3c882b3f2b56ab779bd187d31b.json.gz b/node_modules/.cache/babel-loader/3d622d3c882b3f2b56ab779bd187d31b.json.gz new file mode 100644 index 00000000..6e601391 Binary files /dev/null and b/node_modules/.cache/babel-loader/3d622d3c882b3f2b56ab779bd187d31b.json.gz differ diff --git a/node_modules/.cache/babel-loader/3d6354c18c2c7bdfe26cbd55f7116639.json.gz b/node_modules/.cache/babel-loader/3d6354c18c2c7bdfe26cbd55f7116639.json.gz new file mode 100644 index 00000000..048c040c Binary files /dev/null and b/node_modules/.cache/babel-loader/3d6354c18c2c7bdfe26cbd55f7116639.json.gz differ diff --git a/node_modules/.cache/babel-loader/3fb1133bffadf0f255d4e03f0152fd3f.json.gz b/node_modules/.cache/babel-loader/3fb1133bffadf0f255d4e03f0152fd3f.json.gz new file mode 100644 index 00000000..50f9cc61 Binary files /dev/null and b/node_modules/.cache/babel-loader/3fb1133bffadf0f255d4e03f0152fd3f.json.gz differ diff --git a/node_modules/.cache/babel-loader/40861fc061f6ff3d4bb16b5b2588e2f8.json.gz b/node_modules/.cache/babel-loader/40861fc061f6ff3d4bb16b5b2588e2f8.json.gz new file mode 100644 index 00000000..691d39a9 Binary files /dev/null and b/node_modules/.cache/babel-loader/40861fc061f6ff3d4bb16b5b2588e2f8.json.gz differ diff --git a/node_modules/.cache/babel-loader/40bc26ef101c002a0aca675b57887c98.json.gz b/node_modules/.cache/babel-loader/40bc26ef101c002a0aca675b57887c98.json.gz new file mode 100644 index 00000000..1e066b28 Binary files /dev/null and b/node_modules/.cache/babel-loader/40bc26ef101c002a0aca675b57887c98.json.gz differ diff --git a/node_modules/.cache/babel-loader/4694b113ae939d8f7d6f115e0dd354a3.json.gz b/node_modules/.cache/babel-loader/4694b113ae939d8f7d6f115e0dd354a3.json.gz new file mode 100644 index 00000000..8742b5d2 Binary files /dev/null and b/node_modules/.cache/babel-loader/4694b113ae939d8f7d6f115e0dd354a3.json.gz differ diff --git a/node_modules/.cache/babel-loader/477e5ad5fa880a06ae251b4a2f639db2.json.gz b/node_modules/.cache/babel-loader/477e5ad5fa880a06ae251b4a2f639db2.json.gz new file mode 100644 index 00000000..2d28039d Binary files /dev/null and b/node_modules/.cache/babel-loader/477e5ad5fa880a06ae251b4a2f639db2.json.gz differ diff --git a/node_modules/.cache/babel-loader/4c905ae7b2b203688ab7304c761e6683.json.gz b/node_modules/.cache/babel-loader/4c905ae7b2b203688ab7304c761e6683.json.gz new file mode 100644 index 00000000..4885ae21 Binary files /dev/null and b/node_modules/.cache/babel-loader/4c905ae7b2b203688ab7304c761e6683.json.gz differ diff --git a/node_modules/.cache/babel-loader/4d11ad9f99c6c39cf0ab41a3e63497ab.json.gz b/node_modules/.cache/babel-loader/4d11ad9f99c6c39cf0ab41a3e63497ab.json.gz new file mode 100644 index 00000000..ad78255d Binary files /dev/null and b/node_modules/.cache/babel-loader/4d11ad9f99c6c39cf0ab41a3e63497ab.json.gz differ diff --git a/node_modules/.cache/babel-loader/5563ecff1b12f56979f13415736d15d8.json.gz b/node_modules/.cache/babel-loader/5563ecff1b12f56979f13415736d15d8.json.gz new file mode 100644 index 00000000..a114eb1c Binary files /dev/null and b/node_modules/.cache/babel-loader/5563ecff1b12f56979f13415736d15d8.json.gz differ diff --git a/node_modules/.cache/babel-loader/5744845386f6d350e5daef357f96d720.json.gz b/node_modules/.cache/babel-loader/5744845386f6d350e5daef357f96d720.json.gz new file mode 100644 index 00000000..c69ecbed Binary files /dev/null and b/node_modules/.cache/babel-loader/5744845386f6d350e5daef357f96d720.json.gz differ diff --git a/node_modules/.cache/babel-loader/595ce7e5d143c1138fadfb1ca19728be.json.gz b/node_modules/.cache/babel-loader/595ce7e5d143c1138fadfb1ca19728be.json.gz new file mode 100644 index 00000000..a6513d10 Binary files /dev/null and b/node_modules/.cache/babel-loader/595ce7e5d143c1138fadfb1ca19728be.json.gz differ diff --git a/node_modules/.cache/babel-loader/60bf1b44a3782846653c9e0f895d2ff0.json.gz b/node_modules/.cache/babel-loader/60bf1b44a3782846653c9e0f895d2ff0.json.gz new file mode 100644 index 00000000..2eba66b5 Binary files /dev/null and b/node_modules/.cache/babel-loader/60bf1b44a3782846653c9e0f895d2ff0.json.gz differ diff --git a/node_modules/.cache/babel-loader/61c3f455934ea80d39af69da96e53c22.json.gz b/node_modules/.cache/babel-loader/61c3f455934ea80d39af69da96e53c22.json.gz new file mode 100644 index 00000000..5788dfa9 Binary files /dev/null and b/node_modules/.cache/babel-loader/61c3f455934ea80d39af69da96e53c22.json.gz differ diff --git a/node_modules/.cache/babel-loader/6a16e12c79cfb46b0f6d38ab40619095.json.gz b/node_modules/.cache/babel-loader/6a16e12c79cfb46b0f6d38ab40619095.json.gz new file mode 100644 index 00000000..4d6a0935 Binary files /dev/null and b/node_modules/.cache/babel-loader/6a16e12c79cfb46b0f6d38ab40619095.json.gz differ diff --git a/node_modules/.cache/babel-loader/6a39096eb94fa2937e1df541dab580ee.json.gz b/node_modules/.cache/babel-loader/6a39096eb94fa2937e1df541dab580ee.json.gz new file mode 100644 index 00000000..c60696ea Binary files /dev/null and b/node_modules/.cache/babel-loader/6a39096eb94fa2937e1df541dab580ee.json.gz differ diff --git a/node_modules/.cache/babel-loader/706a1e506c94aa9f9aab2da7e595e612.json.gz b/node_modules/.cache/babel-loader/706a1e506c94aa9f9aab2da7e595e612.json.gz new file mode 100644 index 00000000..1865f8b3 Binary files /dev/null and b/node_modules/.cache/babel-loader/706a1e506c94aa9f9aab2da7e595e612.json.gz differ diff --git a/node_modules/.cache/babel-loader/739424e25e0fcd5af958af9d0a82a6aa.json.gz b/node_modules/.cache/babel-loader/739424e25e0fcd5af958af9d0a82a6aa.json.gz new file mode 100644 index 00000000..ed0ea669 Binary files /dev/null and b/node_modules/.cache/babel-loader/739424e25e0fcd5af958af9d0a82a6aa.json.gz differ diff --git a/node_modules/.cache/babel-loader/73ef339675e2eea304f4a6cb3173858a.json.gz b/node_modules/.cache/babel-loader/73ef339675e2eea304f4a6cb3173858a.json.gz new file mode 100644 index 00000000..ea62b9e7 Binary files /dev/null and b/node_modules/.cache/babel-loader/73ef339675e2eea304f4a6cb3173858a.json.gz differ diff --git a/node_modules/.cache/babel-loader/7577fa58cf752a23536c23bc154a9040.json.gz b/node_modules/.cache/babel-loader/7577fa58cf752a23536c23bc154a9040.json.gz new file mode 100644 index 00000000..581cc95c Binary files /dev/null and b/node_modules/.cache/babel-loader/7577fa58cf752a23536c23bc154a9040.json.gz differ diff --git a/node_modules/.cache/babel-loader/7918c47b5ffb9888696ee828b6fa20f8.json.gz b/node_modules/.cache/babel-loader/7918c47b5ffb9888696ee828b6fa20f8.json.gz new file mode 100644 index 00000000..c0f20b5f Binary files /dev/null and b/node_modules/.cache/babel-loader/7918c47b5ffb9888696ee828b6fa20f8.json.gz differ diff --git a/node_modules/.cache/babel-loader/796628d43ea3294380b23f0ab784bcff.json.gz b/node_modules/.cache/babel-loader/796628d43ea3294380b23f0ab784bcff.json.gz new file mode 100644 index 00000000..fe947bac Binary files /dev/null and b/node_modules/.cache/babel-loader/796628d43ea3294380b23f0ab784bcff.json.gz differ diff --git a/node_modules/.cache/babel-loader/79fb56096bb6f8e02d1d107a5d954481.json.gz b/node_modules/.cache/babel-loader/79fb56096bb6f8e02d1d107a5d954481.json.gz new file mode 100644 index 00000000..14a97ded Binary files /dev/null and b/node_modules/.cache/babel-loader/79fb56096bb6f8e02d1d107a5d954481.json.gz differ diff --git a/node_modules/.cache/babel-loader/7aac87ef9780fe4aacc763157302b21d.json.gz b/node_modules/.cache/babel-loader/7aac87ef9780fe4aacc763157302b21d.json.gz new file mode 100644 index 00000000..1c1d42e8 Binary files /dev/null and b/node_modules/.cache/babel-loader/7aac87ef9780fe4aacc763157302b21d.json.gz differ diff --git a/node_modules/.cache/babel-loader/7d3d3571b8335b458cb3c0f442baeabd.json.gz b/node_modules/.cache/babel-loader/7d3d3571b8335b458cb3c0f442baeabd.json.gz new file mode 100644 index 00000000..11abb725 Binary files /dev/null and b/node_modules/.cache/babel-loader/7d3d3571b8335b458cb3c0f442baeabd.json.gz differ diff --git a/node_modules/.cache/babel-loader/7d5e00c1320559317fb16615fe739acf.json.gz b/node_modules/.cache/babel-loader/7d5e00c1320559317fb16615fe739acf.json.gz new file mode 100644 index 00000000..337192b7 Binary files /dev/null and b/node_modules/.cache/babel-loader/7d5e00c1320559317fb16615fe739acf.json.gz differ diff --git a/node_modules/.cache/babel-loader/817e2bb54bed96a4f1e9a35493a6e9a4.json.gz b/node_modules/.cache/babel-loader/817e2bb54bed96a4f1e9a35493a6e9a4.json.gz new file mode 100644 index 00000000..e719a61a Binary files /dev/null and b/node_modules/.cache/babel-loader/817e2bb54bed96a4f1e9a35493a6e9a4.json.gz differ diff --git a/node_modules/.cache/babel-loader/83dacb7035de57ca96c8c311dc8466e0.json.gz b/node_modules/.cache/babel-loader/83dacb7035de57ca96c8c311dc8466e0.json.gz new file mode 100644 index 00000000..03165666 Binary files /dev/null and b/node_modules/.cache/babel-loader/83dacb7035de57ca96c8c311dc8466e0.json.gz differ diff --git a/node_modules/.cache/babel-loader/850c6aeaffbaa248861c607d2394d21d.json.gz b/node_modules/.cache/babel-loader/850c6aeaffbaa248861c607d2394d21d.json.gz new file mode 100644 index 00000000..8983f327 Binary files /dev/null and b/node_modules/.cache/babel-loader/850c6aeaffbaa248861c607d2394d21d.json.gz differ diff --git a/node_modules/.cache/babel-loader/85cee853e89bbf6954379377fe6a181f.json.gz b/node_modules/.cache/babel-loader/85cee853e89bbf6954379377fe6a181f.json.gz new file mode 100644 index 00000000..ca9db0d2 Binary files /dev/null and b/node_modules/.cache/babel-loader/85cee853e89bbf6954379377fe6a181f.json.gz differ diff --git a/node_modules/.cache/babel-loader/865ccf297fae141321fcf45e967e4671.json.gz b/node_modules/.cache/babel-loader/865ccf297fae141321fcf45e967e4671.json.gz new file mode 100644 index 00000000..27ca521a Binary files /dev/null and b/node_modules/.cache/babel-loader/865ccf297fae141321fcf45e967e4671.json.gz differ diff --git a/node_modules/.cache/babel-loader/8afeff1399ab5ee4c352c1778a64706b.json.gz b/node_modules/.cache/babel-loader/8afeff1399ab5ee4c352c1778a64706b.json.gz new file mode 100644 index 00000000..6f7af83c Binary files /dev/null and b/node_modules/.cache/babel-loader/8afeff1399ab5ee4c352c1778a64706b.json.gz differ diff --git a/node_modules/.cache/babel-loader/91cb87b8fc0bcf9f8255525cc1020f77.json.gz b/node_modules/.cache/babel-loader/91cb87b8fc0bcf9f8255525cc1020f77.json.gz new file mode 100644 index 00000000..af35448d Binary files /dev/null and b/node_modules/.cache/babel-loader/91cb87b8fc0bcf9f8255525cc1020f77.json.gz differ diff --git a/node_modules/.cache/babel-loader/942f429aaa3db838c5f300af10de0c48.json.gz b/node_modules/.cache/babel-loader/942f429aaa3db838c5f300af10de0c48.json.gz new file mode 100644 index 00000000..08a1a845 Binary files /dev/null and b/node_modules/.cache/babel-loader/942f429aaa3db838c5f300af10de0c48.json.gz differ diff --git a/node_modules/.cache/babel-loader/946961b2e4bc53c872fa94eead2810ee.json.gz b/node_modules/.cache/babel-loader/946961b2e4bc53c872fa94eead2810ee.json.gz new file mode 100644 index 00000000..d4e142fb Binary files /dev/null and b/node_modules/.cache/babel-loader/946961b2e4bc53c872fa94eead2810ee.json.gz differ diff --git a/node_modules/.cache/babel-loader/950fcf6b19ace7508917f9ff6d827a20.json.gz b/node_modules/.cache/babel-loader/950fcf6b19ace7508917f9ff6d827a20.json.gz new file mode 100644 index 00000000..79b395fe Binary files /dev/null and b/node_modules/.cache/babel-loader/950fcf6b19ace7508917f9ff6d827a20.json.gz differ diff --git a/node_modules/.cache/babel-loader/97c0a6fc6ddebac974c5dd9dced4f98e.json.gz b/node_modules/.cache/babel-loader/97c0a6fc6ddebac974c5dd9dced4f98e.json.gz new file mode 100644 index 00000000..b09cd652 Binary files /dev/null and b/node_modules/.cache/babel-loader/97c0a6fc6ddebac974c5dd9dced4f98e.json.gz differ diff --git a/node_modules/.cache/babel-loader/9d71853c7958db912d0d5bd38a02a239.json.gz b/node_modules/.cache/babel-loader/9d71853c7958db912d0d5bd38a02a239.json.gz new file mode 100644 index 00000000..83b16228 Binary files /dev/null and b/node_modules/.cache/babel-loader/9d71853c7958db912d0d5bd38a02a239.json.gz differ diff --git a/node_modules/.cache/babel-loader/9e62cb9f3186005ca41fb138af655414.json.gz b/node_modules/.cache/babel-loader/9e62cb9f3186005ca41fb138af655414.json.gz new file mode 100644 index 00000000..872b53f5 Binary files /dev/null and b/node_modules/.cache/babel-loader/9e62cb9f3186005ca41fb138af655414.json.gz differ diff --git a/node_modules/.cache/babel-loader/9f054aa4dcf090ac6f29278f48466eb2.json.gz b/node_modules/.cache/babel-loader/9f054aa4dcf090ac6f29278f48466eb2.json.gz new file mode 100644 index 00000000..cfac71b7 Binary files /dev/null and b/node_modules/.cache/babel-loader/9f054aa4dcf090ac6f29278f48466eb2.json.gz differ diff --git a/node_modules/.cache/babel-loader/a06b01c34aa785abd714b0de48907d2f.json.gz b/node_modules/.cache/babel-loader/a06b01c34aa785abd714b0de48907d2f.json.gz new file mode 100644 index 00000000..0e43991e Binary files /dev/null and b/node_modules/.cache/babel-loader/a06b01c34aa785abd714b0de48907d2f.json.gz differ diff --git a/node_modules/.cache/babel-loader/a0d44515985cba966c5c69bd88fe5e33.json.gz b/node_modules/.cache/babel-loader/a0d44515985cba966c5c69bd88fe5e33.json.gz new file mode 100644 index 00000000..c22339e0 Binary files /dev/null and b/node_modules/.cache/babel-loader/a0d44515985cba966c5c69bd88fe5e33.json.gz differ diff --git a/node_modules/.cache/babel-loader/a100ac5f00b39e0c34acb1efba16ed6a.json.gz b/node_modules/.cache/babel-loader/a100ac5f00b39e0c34acb1efba16ed6a.json.gz new file mode 100644 index 00000000..2f1096a9 Binary files /dev/null and b/node_modules/.cache/babel-loader/a100ac5f00b39e0c34acb1efba16ed6a.json.gz differ diff --git a/node_modules/.cache/babel-loader/a166372fe0bcfb9f6ca141beef374756.json.gz b/node_modules/.cache/babel-loader/a166372fe0bcfb9f6ca141beef374756.json.gz new file mode 100644 index 00000000..3c7e310c Binary files /dev/null and b/node_modules/.cache/babel-loader/a166372fe0bcfb9f6ca141beef374756.json.gz differ diff --git a/node_modules/.cache/babel-loader/a1f5b019b0aba4a63a79fed13ca8f546.json.gz b/node_modules/.cache/babel-loader/a1f5b019b0aba4a63a79fed13ca8f546.json.gz new file mode 100644 index 00000000..693c1b09 Binary files /dev/null and b/node_modules/.cache/babel-loader/a1f5b019b0aba4a63a79fed13ca8f546.json.gz differ diff --git a/node_modules/.cache/babel-loader/a9c2ab8ca649ee622b74857ee18c9529.json.gz b/node_modules/.cache/babel-loader/a9c2ab8ca649ee622b74857ee18c9529.json.gz new file mode 100644 index 00000000..530e02f2 Binary files /dev/null and b/node_modules/.cache/babel-loader/a9c2ab8ca649ee622b74857ee18c9529.json.gz differ diff --git a/node_modules/.cache/babel-loader/b0a7ef7182d6466e48e46f5429d2cc7a.json.gz b/node_modules/.cache/babel-loader/b0a7ef7182d6466e48e46f5429d2cc7a.json.gz new file mode 100644 index 00000000..d91a607f Binary files /dev/null and b/node_modules/.cache/babel-loader/b0a7ef7182d6466e48e46f5429d2cc7a.json.gz differ diff --git a/node_modules/.cache/babel-loader/b13d1796adf73bfa5fe447799a20aade.json.gz b/node_modules/.cache/babel-loader/b13d1796adf73bfa5fe447799a20aade.json.gz new file mode 100644 index 00000000..75feedf2 Binary files /dev/null and b/node_modules/.cache/babel-loader/b13d1796adf73bfa5fe447799a20aade.json.gz differ diff --git a/node_modules/.cache/babel-loader/b2806565f2a2431e71b3da1a4ace62b0.json.gz b/node_modules/.cache/babel-loader/b2806565f2a2431e71b3da1a4ace62b0.json.gz new file mode 100644 index 00000000..43cda2c3 Binary files /dev/null and b/node_modules/.cache/babel-loader/b2806565f2a2431e71b3da1a4ace62b0.json.gz differ diff --git a/node_modules/.cache/babel-loader/b69567758d5a0f21b9b858f69b6d2b38.json.gz b/node_modules/.cache/babel-loader/b69567758d5a0f21b9b858f69b6d2b38.json.gz new file mode 100644 index 00000000..c73ffeaf Binary files /dev/null and b/node_modules/.cache/babel-loader/b69567758d5a0f21b9b858f69b6d2b38.json.gz differ diff --git a/node_modules/.cache/babel-loader/b76281d5fe0e2f013aa6057e668088fc.json.gz b/node_modules/.cache/babel-loader/b76281d5fe0e2f013aa6057e668088fc.json.gz new file mode 100644 index 00000000..e5605975 Binary files /dev/null and b/node_modules/.cache/babel-loader/b76281d5fe0e2f013aa6057e668088fc.json.gz differ diff --git a/node_modules/.cache/babel-loader/bfbb85bea0d169e6781b9c2ade144e5f.json.gz b/node_modules/.cache/babel-loader/bfbb85bea0d169e6781b9c2ade144e5f.json.gz new file mode 100644 index 00000000..5cd6cc6d Binary files /dev/null and b/node_modules/.cache/babel-loader/bfbb85bea0d169e6781b9c2ade144e5f.json.gz differ diff --git a/node_modules/.cache/babel-loader/c1fb55bf297cecedff1ad4dc0c48098b.json.gz b/node_modules/.cache/babel-loader/c1fb55bf297cecedff1ad4dc0c48098b.json.gz new file mode 100644 index 00000000..644ef115 Binary files /dev/null and b/node_modules/.cache/babel-loader/c1fb55bf297cecedff1ad4dc0c48098b.json.gz differ diff --git a/node_modules/.cache/babel-loader/c5adc2aa159115e3f53ee4440e5bc5a1.json.gz b/node_modules/.cache/babel-loader/c5adc2aa159115e3f53ee4440e5bc5a1.json.gz new file mode 100644 index 00000000..d2b7f666 Binary files /dev/null and b/node_modules/.cache/babel-loader/c5adc2aa159115e3f53ee4440e5bc5a1.json.gz differ diff --git a/node_modules/.cache/babel-loader/c78e468b5b93323a10c16bf460ecbb95.json.gz b/node_modules/.cache/babel-loader/c78e468b5b93323a10c16bf460ecbb95.json.gz new file mode 100644 index 00000000..bb9d14f9 Binary files /dev/null and b/node_modules/.cache/babel-loader/c78e468b5b93323a10c16bf460ecbb95.json.gz differ diff --git a/node_modules/.cache/babel-loader/c97e19a53abc6d9fb22e30ffd831e0da.json.gz b/node_modules/.cache/babel-loader/c97e19a53abc6d9fb22e30ffd831e0da.json.gz new file mode 100644 index 00000000..120c3b60 Binary files /dev/null and b/node_modules/.cache/babel-loader/c97e19a53abc6d9fb22e30ffd831e0da.json.gz differ diff --git a/node_modules/.cache/babel-loader/d41f3c61b9166c3e017df6964ce79762.json.gz b/node_modules/.cache/babel-loader/d41f3c61b9166c3e017df6964ce79762.json.gz new file mode 100644 index 00000000..026a2169 Binary files /dev/null and b/node_modules/.cache/babel-loader/d41f3c61b9166c3e017df6964ce79762.json.gz differ diff --git a/node_modules/.cache/babel-loader/db4c6ccec33ad65ae0e71a562f131bb2.json.gz b/node_modules/.cache/babel-loader/db4c6ccec33ad65ae0e71a562f131bb2.json.gz new file mode 100644 index 00000000..0820f5d1 Binary files /dev/null and b/node_modules/.cache/babel-loader/db4c6ccec33ad65ae0e71a562f131bb2.json.gz differ diff --git a/node_modules/.cache/babel-loader/dc7bc027b524219fab87d3ffbecd591d.json.gz b/node_modules/.cache/babel-loader/dc7bc027b524219fab87d3ffbecd591d.json.gz new file mode 100644 index 00000000..b9086e1a Binary files /dev/null and b/node_modules/.cache/babel-loader/dc7bc027b524219fab87d3ffbecd591d.json.gz differ diff --git a/node_modules/.cache/babel-loader/e13b65403aa227396395692391670d76.json.gz b/node_modules/.cache/babel-loader/e13b65403aa227396395692391670d76.json.gz new file mode 100644 index 00000000..fda0be57 Binary files /dev/null and b/node_modules/.cache/babel-loader/e13b65403aa227396395692391670d76.json.gz differ diff --git a/node_modules/.cache/babel-loader/e49ae2d9fe4011907129b0581871f29d.json.gz b/node_modules/.cache/babel-loader/e49ae2d9fe4011907129b0581871f29d.json.gz new file mode 100644 index 00000000..5172e4f9 Binary files /dev/null and b/node_modules/.cache/babel-loader/e49ae2d9fe4011907129b0581871f29d.json.gz differ diff --git a/node_modules/.cache/babel-loader/e6f37c7825769ff6917d30f5be2c8ad6.json.gz b/node_modules/.cache/babel-loader/e6f37c7825769ff6917d30f5be2c8ad6.json.gz new file mode 100644 index 00000000..0ff951b0 Binary files /dev/null and b/node_modules/.cache/babel-loader/e6f37c7825769ff6917d30f5be2c8ad6.json.gz differ diff --git a/node_modules/.cache/babel-loader/e9abfe026a0d42e59fde0e3817ce15ee.json.gz b/node_modules/.cache/babel-loader/e9abfe026a0d42e59fde0e3817ce15ee.json.gz new file mode 100644 index 00000000..9d5803de Binary files /dev/null and b/node_modules/.cache/babel-loader/e9abfe026a0d42e59fde0e3817ce15ee.json.gz differ diff --git a/node_modules/.cache/babel-loader/ef06d380e1a14972a4514b8b49df8b01.json.gz b/node_modules/.cache/babel-loader/ef06d380e1a14972a4514b8b49df8b01.json.gz new file mode 100644 index 00000000..d04b4d3c Binary files /dev/null and b/node_modules/.cache/babel-loader/ef06d380e1a14972a4514b8b49df8b01.json.gz differ diff --git a/node_modules/.cache/babel-loader/f127cb44b9af54d392bbc2fc024f6d0d.json.gz b/node_modules/.cache/babel-loader/f127cb44b9af54d392bbc2fc024f6d0d.json.gz new file mode 100644 index 00000000..b9b24789 Binary files /dev/null and b/node_modules/.cache/babel-loader/f127cb44b9af54d392bbc2fc024f6d0d.json.gz differ diff --git a/node_modules/.cache/babel-loader/f7eb006995409be03ed1a6444f5db5f8.json.gz b/node_modules/.cache/babel-loader/f7eb006995409be03ed1a6444f5db5f8.json.gz new file mode 100644 index 00000000..b3bd1283 Binary files /dev/null and b/node_modules/.cache/babel-loader/f7eb006995409be03ed1a6444f5db5f8.json.gz differ diff --git a/node_modules/.cache/babel-loader/f8a5c6fc981355b6a68f304b42227ae8.json.gz b/node_modules/.cache/babel-loader/f8a5c6fc981355b6a68f304b42227ae8.json.gz new file mode 100644 index 00000000..efef1899 Binary files /dev/null and b/node_modules/.cache/babel-loader/f8a5c6fc981355b6a68f304b42227ae8.json.gz differ diff --git a/node_modules/.cache/babel-loader/f999ea4f8b8f230197ab0d01018ecfcc.json.gz b/node_modules/.cache/babel-loader/f999ea4f8b8f230197ab0d01018ecfcc.json.gz new file mode 100644 index 00000000..391fe37c Binary files /dev/null and b/node_modules/.cache/babel-loader/f999ea4f8b8f230197ab0d01018ecfcc.json.gz differ diff --git a/node_modules/.cache/babel-loader/fc2369b639068ab3d9a8fb62d54514ba.json.gz b/node_modules/.cache/babel-loader/fc2369b639068ab3d9a8fb62d54514ba.json.gz new file mode 100644 index 00000000..b4caa8fb Binary files /dev/null and b/node_modules/.cache/babel-loader/fc2369b639068ab3d9a8fb62d54514ba.json.gz differ diff --git a/node_modules/.cache/babel-loader/fe2561d3325c87a7c36cd0b4f6d45d61.json.gz b/node_modules/.cache/babel-loader/fe2561d3325c87a7c36cd0b4f6d45d61.json.gz new file mode 100644 index 00000000..01d1a55d Binary files /dev/null and b/node_modules/.cache/babel-loader/fe2561d3325c87a7c36cd0b4f6d45d61.json.gz differ diff --git a/public/js/vue/app.js b/public/js/vue/app.js index 5d630c72..4b59cf8c 100644 --- a/public/js/vue/app.js +++ b/public/js/vue/app.js @@ -43,7 +43,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"b47d9eaedcbd0f34d95c","1":"1a2ec2568db9e0d01036","2":"4f5525aabb9601dde4be","3":"02c941910d5eee1fceff","4":"df99230719144eec9812","5":"29e184ef07c70ad44e82","6":"2e3cea1e2ee220bcd12d","7":"9ef0114b3eb1b40652cd","8":"8e259fe897cde698bfc3","9":"5059ce6d2ab207088c31","10":"1222a2375fd940705a78","11":"a447fe0b0f0e846ad8b1","12":"ab3efed496c91cd795a5","13":"dfe16420782798d2be26","14":"0f6eeb76c4839e34f069","15":"ea55482413b70efcb3f7","16":"a81c0a25caa8d6957a37","17":"39ae6a640f4f7aee70ef","18":"b836f822bb8c2a3c29b5","19":"c27e4577cf5fbce49df4","20":"5ebb0d270ca28e346931","21":"4eab9f986d73cdfc57b2","22":"45e250b6a4deec80f3f9","23":"700cf55012ee90e7a0ba","24":"d46a5a5f496271a8198c","25":"5e531b62fd7cb4562c0d"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"b47d9eaedcbd0f34d95c","1":"5281a63adedfa1ab604f","2":"abacdd6bab5e4915fa53","3":"2a73bb5275f88a4f40e6","4":"c86d2279a0e7e608d701","5":"fcbe48953bb36d580043","6":"a4ae77e78a4e40cbeef3","7":"1611b93024c3c3797e5b","8":"06fbbd38b7093e6b4893","9":"c2e574557797d3e532bd","10":"08dac5ffd0bdb279e3a7","11":"c19ecbe43f1fe1df27be","12":"a51c01071a7d82df7c30","13":"71b02e8b0dbb5d54976a","14":"62caaf781a1e3c3a2b6a","15":"eb9050c9e4ad3bfda595","16":"937daff9542b6e61f1be","17":"11a6c99dde22cbdba94b","18":"d7386e1230132449d750","19":"e805cbb8fb10ad2bb914","20":"dd2c23f64db9c69489a2","21":"e0b2e05fc291eabb1dc5","22":"3628652a3184dab8a987","23":"5aa86f225cdaab849bdd","24":"0ddf54596b06da690a77","25":"c8115836fea88cecd8bf"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function @@ -67112,7 +67112,7 @@ module.exports = webpackAsyncContext; /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(/*! D:\Atom\Git\CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js"); +module.exports = __webpack_require__(/*! D:\FYZ\CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js"); /***/ }) diff --git a/routes/api.php b/routes/api.php index c09e59ff..7572544d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -46,7 +46,9 @@ Route::middleware('auth:api')->group(function () { Route::resource('Packages', 'PackageController'); + Route::resource('Items', 'ItemController'); Route::resource('Messages', 'MessageController'); Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages'); Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage'); + Route::get('/GetItems', 'ItemController@getItems'); });