Merge branch 'master' of https://gitlab.com/Saeid74/cssd

app/Http/Controllers/ItemController.php

@@ -19,7 +19,6 @@ class ItemController extends Controller
         })->paginate(10);
         return \MessageResponse::data($Items);
     }
-
     public function create()
     {
 
@@ -34,12 +33,11 @@ class ItemController extends Controller
         // $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);
-
+        $ItemObj->packages()->attach($request->package_id);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function edit(Item $Item)
@@ -48,8 +46,8 @@ class ItemController extends Controller
     }
     public function update(StoreItemRequest $request, Item $Item)
     {
-        // dd($request->all());
         $Item->update($request->all());
+        $ItemObj->packages()->sync($request->package_ids);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function destroy(Item $Item)
@@ -61,9 +59,4 @@ class ItemController extends Controller
         return \MessageResponse::success(trans('messages.success'));
     }
 
-    public function getItems(){
-        $Items = Item::with('user')->get();
-        return \MessageResponse::data($Items);
-    }
-
 }

app/Http/Controllers/PackageController.php

@@ -28,7 +28,6 @@ class PackageController extends Controller
     }
     public function show(Package $Package)
     {
-        $Package->load('user', 'items');
         return \MessageResponse::data($Package);
     }
     public function store(StorePackageRequest $request)
@@ -42,19 +41,16 @@ class PackageController extends Controller
           'user_id' => auth('api')->user()->id,
           'verified' => 'NotVerified',
         ];
-        $PackageObj = Package::create($PackageData);
+        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->except(['items']));
+        $Package->update($request->all());
-        $Package->items()->sync($request->items);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function destroy(Package $Package)

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') {
+                         if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
 
+                           // 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(is_array($Value) && in_array($Option->id,$Value)){
+                             if(in_array($Option->id,$Value)){
-                                   $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
+                               $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,15 +120,14 @@ class TestResultController extends Controller
                          foreach ($Input->children as $InputChild) {
                              $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
 
-                             if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
+                             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]);
+                               // }
                                foreach ($InputChild->options as $Option) {//--2
-                                 if(is_array($Value) && in_array($Option->id,$Value)){
+                                 if(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 {
@@ -140,16 +139,32 @@ class TestResultController extends Controller
                      }
                  }
                  ///////////////////////////////////////////////////////////////////////////Inputs
-                 ///////////////////////////////////////////////////////////////////////////Images
+                 ///////////////////////////////////////////////////////////////////////////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
                  if ($request->imgs != null) {
 
-                     foreach ($request->imgs as $key => $img) {
+                     foreach ($request->imgs as $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().$key.'.'.$Mime[1];
+                         $ImageName = time().'.'.$Mime[1];
                          $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName;
 
                          Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id);
@@ -159,7 +174,7 @@ class TestResultController extends Controller
                          $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
                      }
                  }
-                 ///////////////////////////////////////////////////////////////////////////Images
+                 ///////////////////////////////////////////////////////////////////////////Image
 
             });
         } catch (\Exception $e) {
@@ -178,7 +193,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') {
+              if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
                   $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
                   $options = [];
                   foreach ($input_options as $input_option) {
@@ -198,7 +213,7 @@ class TestResultController extends Controller
           }
           else {
               //-----------------------------------------------------------------------Anothertype
-              if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
+              if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
                   $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
                   $options = [];
                   foreach ($input_options as $input_option) {
@@ -216,12 +231,8 @@ class TestResultController extends Controller
           }
         }
 
-        $ImagesPath = [];
         if (count($TestResult->TitleImage)) {
-            foreach ($TestResult->TitleImage as $Key => $TitleImage) {
+            $TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
-                $ImagesPath[] = $TitleImage->path;
-            }
-            $TestResult['imagesPath'] = $ImagesPath;
         }
         return \MessageResponse::data($TestResult);
     }
@@ -230,25 +241,16 @@ class TestResultController extends Controller
     {
         foreach ($TestResult->input_values as $key => $value) {
           $input = $value->input;
-          if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
+          if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
               $input_options = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get()->pluck('option_id')->toArray();
-              if ($input['type'] == 'Radiobutton') {
+              $TestResult[$input->name.'_'.$input->id] = $input_options;
-                  $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)) {
-            foreach ($TestResult->TitleImage as $Key => $TitleImage) {
+            $TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
-                $ImagesPath[] = $TitleImage->path;
-            }
-            $TestResult['imagesPath'] = $ImagesPath;
         }
         return \MessageResponse::data($TestResult);
     }
@@ -267,7 +269,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',
@@ -280,17 +282,19 @@ 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') {
+
+                 if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
 
                      $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(is_array($Value) && in_array($Option->id,$Value)){
+                       if(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 {
@@ -302,16 +306,16 @@ class TestResultController extends Controller
 
                      $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
 
-                      if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
+                      if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
                           $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(is_array($Value) && in_array($Option->id,$Value)){
+                            if(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 {
@@ -320,38 +324,42 @@ class TestResultController extends Controller
                  }
              }
          }
-         /////////////////////////////////////////////////////////////////////Images
+         /////////////////////////////////////////////////////////////////////Image
-            $images = '';
+         $image = '';
-            if (count($TestResult->TitleImage))
+         if (count($TestResult->TitleImage))
-            {
+                $image = $TestResult->TitleImage[0];
-                $images = $TestResult->TitleImage;
+
-                foreach ($images as $key => $image) {
+            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 !== ''){
                     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();
+
+                    //--------------------------------------------------------
+                    $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']);
+                    //--------------------------------------------------------
                 }
             }
-
+            //////////////////////////////////////////////////////////////////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'));
     }
@@ -361,16 +369,6 @@ 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'));
     }

app/Http/Controllers/TestTypeController.php

@@ -105,7 +105,6 @@ class TestTypeController extends Controller
                 $TestType = [
                     'name' => $request['name'],
                     'unique_code' => $request['unique_code'],
-                    'device_label' => $request['device_label'],
                     'user_id' => auth('api')->user()->id
                 ];
 
@@ -322,7 +321,6 @@ class TestTypeController extends Controller
         $TestTypeData = [
             'name' => $request['name'],
             'unique_code' => $request['unique_code'],
-            'device_label' => $request['device_label'],
         ];
         $TestType->update($TestTypeData);
         $TestTypeInfo = $request['info'];

app/Http/Requests/StoreItemRequest.php

@@ -26,8 +26,7 @@ class StoreItemRequest extends FormRequest
             case 'POST': {
                 return [
                     'name' => 'required|max:100|unique:Items',
-                    'result' => 'required',
+                    'description' => 'required',
-                    // 'description' => 'required',
                 ];
                 break;
             }
@@ -36,8 +35,7 @@ class StoreItemRequest extends FormRequest
                 $Item =  $this->route('Item');
                 return [
                     'name' => 'required|max:100|unique:Items,id,'.$Item->id,
-                    'result' => 'required',
+                    'description' => 'required',
-                    // 'description' => 'required',
                 ];
                 break;
 

app/Http/Requests/StoreTestResultRequest.php

@@ -25,7 +25,14 @@ class StoreTestResultRequest extends FormRequest
         switch ($this->method()) {
             case 'POST': {
                 return [
+<<<<<<< HEAD
+                    // 'user_id' => 'required',
+                    // 'autoclave_id' => 'required',
+                    'device_id' => 'required',
+                    'device_label' => 'required',
+=======
                     'device_id' => 'requisred',
+>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
                     'cycle_number' => 'required',
                     'test_type_id' => 'required|numeric|exists:test_types,id',
                     'result' => 'required',
@@ -36,7 +43,14 @@ class StoreTestResultRequest extends FormRequest
             case 'PATCH': {
                 // $TestResult =  $this->route('TestResult');
                 return [
+<<<<<<< HEAD
+                    // 'user_id' => 'required',
+                    // 'autoclave_id' => 'required',
                     'device_id' => 'required',
+                    'device_label' => 'required',
+=======
+                    'device_id' => 'required',
+>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
                     'cycle_number' => 'required',
                     'test_type_id' => 'required|numeric|exists:test_types,id',
                     'result' => 'required',

app/Http/Requests/StoreTestTypeRequest.php

@@ -27,7 +27,6 @@ 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',
@@ -41,7 +40,6 @@ 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',

app/Item.php

@@ -6,13 +6,24 @@ use Illuminate\Database\Eloquent\Model;
 
 class Item extends Model
 {
-    public $fillable = ['name', 'result', 'description', 'user_id'];
+    public $fillable = [];
     public function packages()
     {
         return $this->belongsToMany('App\Package', 'item_package');
     }
-    public function user()
-    {
-        return $this->belongsTo('App\User');
-    }
 }
+// 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');
+//
+// });

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', 'cycle_number'];
+    public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'device_label', 'cycle_number'];
     public function test_type()
     {
         return $this->belongsTo('App\TestType');

app/TestType.php

@@ -9,7 +9,7 @@ class TestType extends Model
 {
     use SoftDeletes;
 
-    public $fillable = ['name', 'unique_code', 'user_id', 'bar_code', 'device_label'];
+    public $fillable = ['name','unique_code','user_id','bar_code'];
     // protected $softDelete = true;
 
     public function user()

app/User.php

@@ -69,8 +69,4 @@ class User extends Authenticatable
    {
        return $this->hasMany('App\Package');
    }
-   public function items()
-   {
-       return $this->hasMany('App\Item');
-   }
 }

composer.json

@@ -10,7 +10,6 @@
     "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",

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": "c8fc2e38aa1756fdf6c2038c630a5b1b",
+    "content-hash": "282319c473e3a4fae1950c36e3c9832a",
     "packages": [
         {
             "name": "defuse/php-encryption",
@@ -663,76 +663,6 @@
             ],
             "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",

config/app.php

@@ -161,7 +161,6 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        Intervention\Image\ImageServiceProvider::class,
 
         /*
          * Package Service Providers...
@@ -230,7 +229,6 @@ 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
     ],
 
 ];

database/migrations/2019_04_11_104917_create_test_types_table.php

@@ -17,7 +17,6 @@ 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');

database/migrations/2019_04_11_105013_create_test_results_table.php

@@ -21,6 +21,7 @@ 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');

database/migrations/2019_07_16_100154_create_items_table.php

@@ -16,10 +16,6 @@ class CreateItemsTable extends Migration
         Schema::create('items', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
-<<<<<<< HEAD
-            $table->enum('result', array('Pass', 'Fail'));
-=======
->>>>>>> 10d953023daea025df330b1f017bb2d80751d14d
             $table->text('description');
             $table->unsignedBigInteger('user_id');
             $table->foreign('user_id')->references('id')->on('users');

node_modules/.bin/acorn

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../acorn/bin/acorn" "$@"
-  ret=$?
-else 
-  node  "$basedir/../acorn/bin/acorn" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/acorn.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\acorn\bin\acorn" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\acorn\bin\acorn" %*
-)

node_modules/.bin/ansi-html

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../ansi-html/bin/ansi-html" "$@"
-  ret=$?
-else 
-  node  "$basedir/../ansi-html/bin/ansi-html" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/ansi-html.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\ansi-html\bin\ansi-html" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\ansi-html\bin\ansi-html" %*
-)

node_modules/.bin/atob

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../atob/bin/atob.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../atob/bin/atob.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/atob.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\atob\bin\atob.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\atob\bin\atob.js" %*
-)

node_modules/.bin/autoprefixer

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../autoprefixer/bin/autoprefixer" "$@"
-  ret=$?
-else 
-  node  "$basedir/../autoprefixer/bin/autoprefixer" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/autoprefixer.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\autoprefixer\bin\autoprefixer" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\autoprefixer\bin\autoprefixer" %*
-)

node_modules/.bin/browser-sync

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../browser-sync/dist/bin.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../browser-sync/dist/bin.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/browser-sync.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\browser-sync\dist\bin.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\browser-sync\dist\bin.js" %*
-)

node_modules/.bin/browserslist

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../browserslist/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../browserslist/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/browserslist.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\browserslist\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\browserslist\cli.js" %*
-)

node_modules/.bin/cross-env

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../cross-env/dist/bin/cross-env.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../cross-env/dist/bin/cross-env.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/cross-env-shell

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../cross-env/dist/bin/cross-env-shell.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../cross-env/dist/bin/cross-env-shell.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/cross-env-shell.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\cross-env\dist\bin\cross-env-shell.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\cross-env\dist\bin\cross-env-shell.js" %*
-)

node_modules/.bin/cross-env.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\cross-env\dist\bin\cross-env.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\cross-env\dist\bin\cross-env.js" %*
-)

node_modules/.bin/cssesc

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../cssesc/bin/cssesc" "$@"
-  ret=$?
-else 
-  node  "$basedir/../cssesc/bin/cssesc" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/cssesc.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\cssesc\bin\cssesc" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\cssesc\bin\cssesc" %*
-)

node_modules/.bin/dev-ip

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../dev-ip/lib/dev-ip.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../dev-ip/lib/dev-ip.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/dev-ip.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\dev-ip\lib\dev-ip.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\dev-ip\lib\dev-ip.js" %*
-)

node_modules/.bin/errno

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../errno/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../errno/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/errno.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\errno\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\errno\cli.js" %*
-)

node_modules/.bin/eslint

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../eslint/bin/eslint.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../eslint/bin/eslint.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/eslint.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\eslint\bin\eslint.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\eslint\bin\eslint.js" %*
-)

node_modules/.bin/esparse

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../esprima/bin/esparse.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../esprima/bin/esparse.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/esparse.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esparse.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\esprima\bin\esparse.js" %*
-)

node_modules/.bin/esvalidate

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../esprima/bin/esvalidate.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../esprima/bin/esvalidate.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/esvalidate.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\esprima\bin\esvalidate.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\esprima\bin\esvalidate.js" %*
-)

node_modules/.bin/fontello

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../fontello/bin/fontello" "$@"
-  ret=$?
-else 
-  node  "$basedir/../fontello/bin/fontello" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/fontello.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\fontello\bin\fontello" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\fontello\bin\fontello" %*
-)

node_modules/.bin/he

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../he/bin/he" "$@"
-  ret=$?
-else 
-  node  "$basedir/../he/bin/he" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/he.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\he\bin\he" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\he\bin\he" %*
-)

node_modules/.bin/html-minifier

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../html-minifier/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../html-minifier/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/html-minifier.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\html-minifier\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\html-minifier\cli.js" %*
-)

node_modules/.bin/import-local-fixture

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../import-local/fixtures/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../import-local/fixtures/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/import-local-fixture.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\import-local\fixtures\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\import-local\fixtures\cli.js" %*
-)

node_modules/.bin/in-install

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../in-publish/in-install.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../in-publish/in-install.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/in-install.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\in-publish\in-install.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\in-publish\in-install.js" %*
-)

node_modules/.bin/in-publish

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../in-publish/in-publish.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../in-publish/in-publish.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/in-publish.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\in-publish\in-publish.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\in-publish\in-publish.js" %*
-)

node_modules/.bin/is-ci

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../is-ci/bin.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../is-ci/bin.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/is-ci.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\is-ci\bin.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\is-ci\bin.js" %*
-)

node_modules/.bin/js-yaml

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/js-yaml.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\js-yaml\bin\js-yaml.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\js-yaml\bin\js-yaml.js" %*
-)

node_modules/.bin/jsesc

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../jsesc/bin/jsesc" "$@"
-  ret=$?
-else 
-  node  "$basedir/../jsesc/bin/jsesc" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/jsesc.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\jsesc\bin\jsesc" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\jsesc\bin\jsesc" %*
-)

node_modules/.bin/json5

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../json5/lib/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../json5/lib/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/json5.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\json5\lib\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\json5\lib\cli.js" %*
-)

node_modules/.bin/loose-envify

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../loose-envify/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../loose-envify/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/loose-envify.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\loose-envify\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\loose-envify\cli.js" %*
-)

node_modules/.bin/lt

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../localtunnel/bin/client" "$@"
-  ret=$?
-else 
-  node  "$basedir/../localtunnel/bin/client" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/lt.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\localtunnel\bin\client" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\localtunnel\bin\client" %*
-)

node_modules/.bin/miller-rabin

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../miller-rabin/bin/miller-rabin" "$@"
-  ret=$?
-else 
-  node  "$basedir/../miller-rabin/bin/miller-rabin" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/miller-rabin.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\miller-rabin\bin\miller-rabin" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\miller-rabin\bin\miller-rabin" %*
-)

node_modules/.bin/mime

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../mime/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../mime/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/mime.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\mime\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\mime\cli.js" %*
-)

node_modules/.bin/mkdirp

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../mkdirp/bin/cmd.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../mkdirp/bin/cmd.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/mkdirp.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\mkdirp\bin\cmd.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\mkdirp\bin\cmd.js" %*
-)

node_modules/.bin/multicast-dns

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../multicast-dns/cli.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../multicast-dns/cli.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/multicast-dns.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\multicast-dns\cli.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\multicast-dns\cli.js" %*
-)

node_modules/.bin/needle

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../needle/bin/needle" "$@"
-  ret=$?
-else 
-  node  "$basedir/../needle/bin/needle" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/needle.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\needle\bin\needle" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\needle\bin\needle" %*
-)

node_modules/.bin/node-gyp

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../node-gyp/bin/node-gyp.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../node-gyp/bin/node-gyp.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/node-gyp.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\node-gyp\bin\node-gyp.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\node-gyp\bin\node-gyp.js" %*
-)

node_modules/.bin/node-sass

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../node-sass/bin/node-sass" "$@"
-  ret=$?
-else 
-  node  "$basedir/../node-sass/bin/node-sass" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/node-sass.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\node-sass\bin\node-sass" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\node-sass\bin\node-sass" %*
-)

node_modules/.bin/nopt

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../nopt/bin/nopt.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../nopt/bin/nopt.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/nopt.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\nopt\bin\nopt.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\nopt\bin\nopt.js" %*
-)

node_modules/.bin/not-in-install

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../in-publish/not-in-install.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../in-publish/not-in-install.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/not-in-install.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\in-publish\not-in-install.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\in-publish\not-in-install.js" %*
-)

node_modules/.bin/not-in-publish

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../in-publish/not-in-publish.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../in-publish/not-in-publish.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/not-in-publish.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\in-publish\not-in-publish.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\in-publish\not-in-publish.js" %*
-)

node_modules/.bin/opener

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../opener/bin/opener-bin.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../opener/bin/opener-bin.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/opener.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\opener\bin\opener-bin.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\opener\bin\opener-bin.js" %*
-)

node_modules/.bin/parser

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../@babel/parser/bin/babel-parser.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../@babel/parser/bin/babel-parser.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/parser.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\@babel\parser\bin\babel-parser.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\@babel\parser\bin\babel-parser.js" %*
-)

node_modules/.bin/prettier

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../prettier/bin-prettier.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../prettier/bin-prettier.js" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/prettier.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\prettier\bin-prettier.js" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\prettier\bin-prettier.js" %*
-)

node_modules/.bin/regexp-tree

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../regexp-tree/bin/regexp-tree" "$@"
-  ret=$?
-else 
-  node  "$basedir/../regexp-tree/bin/regexp-tree" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/regexp-tree.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\regexp-tree\bin\regexp-tree" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\regexp-tree\bin\regexp-tree" %*
-)

node_modules/.bin/regjsparser

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../regjsparser/bin/parser" "$@"
-  ret=$?
-else 
-  node  "$basedir/../regjsparser/bin/parser" "$@"
-  ret=$?
-fi
-exit $ret

node_modules/.bin/regjsparser.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\regjsparser\bin\parser" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\regjsparser\bin\parser" %*
-)

node_modules/.bin/rimraf

@@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../rimraf/bin.js" "$@"
-  ret=$?
-else 
-  node  "$basedir/../rimraf/bin.js" "$@"
-  ret=$?
-fi
-exit $ret