uidaho / smartsettia

app/Http/Controllers/ImageController.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         if (Storage::disk('private')->exists('deviceimage/'.$device_id)) {
             $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id));
         } else {
-            $image = Image::make(public_path() . '/img/video_not_found.jpg');
+            $image = Image::make(public_path().'/img/video_not_found.jpg');
         }
         
         return $image->response();
@@ -45,7 +45,7 @@ 
      */
     public function store($device_id, $binaryData)
     {
-        $storagePath = storage_path('app/private/deviceimage/') . $device_id;
+        $storagePath = storage_path('app/private/deviceimage/').$device_id;
         $image = Image::make($binaryData);
         $image->save($storagePath, 75);
     }

app/Http/Controllers/ApiController.php

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
      */    
     public function index()
     {
-        return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400);
+        return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400);
     }
 
     /**
@@ -62,7 +62,7 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // Get the device record.
@@ -70,7 +70,7 @@ 
         
         // If token doesnt match then send 401 unauthorized.
         if ($request->input('token') != $device->token) {
-            return response()->json(['data' => 'Bad token.'], 401);
+            return response()->json([ 'data' => 'Bad token.' ], 401);
         }
         
         // Update the device.
@@ -100,7 +100,7 @@ 
         //event(new Registered(true));
         
         // Return the new device info including the token.
-        return response()->json(['data' => $device->toArray()], 201);
+        return response()->json([ 'data' => $device->toArray() ], 201);
     }
     
     /**
@@ -119,12 +119,12 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // If challenge string doesnt match then send 401 unauthorized.
         if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) {
-            return response()->json(['data' => 'Bad challenge.'], 401);
+            return response()->json([ 'data' => 'Bad challenge.' ], 401);
         }
         
         // If the uuid already exists then just send them the record.
@@ -134,7 +134,7 @@ 
                 'uuid' => $device->uuid,
                 'id' => $device->id,
                 'token' => $device->token,
-            ]], 200);
+            ] ], 200);
         }
         
         // Create the new device.
@@ -157,7 +157,7 @@ 
             'uuid' => $device->uuid,
             'id' => $device->id,
             'token' => $device->token,
-        ]], 201);
+        ] ], 201);
     }
     
     /**
@@ -176,7 +176,7 @@ 
         
         // If validation fails, send the validation error back with status 400.
         if ($validator->fails()) {
-            return response()->json(['data' => $validator->errors()], 400);
+            return response()->json([ 'data' => $validator->errors() ], 400);
         }
         
         // Get the device record.
@@ -184,25 +184,25 @@ 
         
         // If token doesnt match then send 401 unauthorized.
         if ($request->input('token') != $device->token) {
-            return response()->json(['data' => 'Bad token.'], 401);
+            return response()->json([ 'data' => 'Bad token.' ], 401);
         }
         
         // Save the image to disk.
-        $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private');
+        $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private');
         
         // Update the url for the image.
         $deviceimage = Deviceimage::updateOrCreate(
-            ['device_id' => $device['id']],
-            ['url' => $path]
+            [ 'device_id' => $device[ 'id' ] ],
+            [ 'url' => $path ]
         );
         
         // Force the updated_at timestamp to update as the url may not change.
         $deviceimage->touch();
         
         return response()->json([ 'data' => [ 
-            'id' => $deviceimage['id'],
+            'id' => $deviceimage[ 'id' ],
             'url' => $path,
-        ]], 201);
+        ] ], 201);
     }
 }
 

app/DataTables/DevicesDataTable.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         return $this->datatables
             ->eloquent($this->query())
             ->addColumn('action', 'device.action')
-            ->blacklist([ 'action'])
+            ->blacklist([ 'action' ])
             ->setRowClass(function($device) {
                 return $device->trashed() ? 'alert-danger' : "";
             });

app/Device.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
      *
      * @var array
      */
-    protected $hidden = ['token'];
+    protected $hidden = [ 'token' ];
     
     /**
      * The attributes that are mass assignable.
@@ -98,7 +98,7 @@ 
     {
         $time = new Carbon($value, Auth::user()->timezone);
         $time = $time->setTimezone('UTC');
-        $this->attributes['open_time'] = $time;
+        $this->attributes[ 'open_time' ] = $time;
     }
     
     /**
@@ -111,7 +111,7 @@ 
     {
         $time = new Carbon($value, Auth::user()->timezone);
         $time = $time->setTimezone('UTC');
-        $this->attributes['close_time'] = $time;
+        $this->attributes[ 'close_time' ] = $time;
     }
     
     /**

app/Http/Controllers/DashboardController.php

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
     
         $data = $this->dashData($site, $location, $device);
         
-        return view('dashboard.index', [ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return view('dashboard.index', [ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -99,7 +99,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -119,7 +119,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -139,7 +139,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -161,9 +161,9 @@ 
         //Get all the devices that belong to the given location ordered by name
         $devices = $location->devices()->publicDashData()->orderBy('name', 'ASC')->get();
         
-        $active_device = collect([$device, $location, $site]);
+        $active_device = collect([ $device, $location, $site ]);
         
-        return collect([$active_device, $devices, $locations, $sites]);
+        return collect([ $active_device, $devices, $locations, $sites ]);
     }
     
     /**
@@ -184,7 +184,7 @@ 
             return response()->json("Device is currently in use.", 403);
         
         //1 = open, 2 = close, 3 = lock
-        switch($request->command)
+        switch ($request->command)
         {
             case 1:
                 $device->cover_command = 'open';
@@ -220,12 +220,12 @@ 
             
             //Check if the current time is during the open schedule or not
             if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
+                $command = 'open';
             else
-                $command =  'close';
+                $command = 'close';
         }
         else
-            $command =  'lock';
+            $command = 'lock';
         
         return $command;
     }