@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | if (Storage::disk('private')->exists('deviceimage/'.$device_id)) { |
| 31 | 31 | $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id)); |
| 32 | 32 | } else { |
| 33 | - $image = Image::make(public_path() . '/img/video_not_found.jpg'); |
|
| 33 | + $image = Image::make(public_path().'/img/video_not_found.jpg'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | return $image->response(); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function store($device_id, $binaryData) |
| 47 | 47 | { |
| 48 | - $storagePath = storage_path('app/private/deviceimage/') . $device_id; |
|
| 48 | + $storagePath = storage_path('app/private/deviceimage/').$device_id; |
|
| 49 | 49 | $image = Image::make($binaryData); |
| 50 | 50 | $image->save($storagePath, 75); |
| 51 | 51 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
| 27 | - protected static $ignoreChangedAttributes = ['updated_at']; |
|
| 27 | + protected static $ignoreChangedAttributes = [ 'updated_at' ]; |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * The attributes to log in the Activity Log |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
| 27 | - protected static $ignoreChangedAttributes = ['updated_at']; |
|
| 27 | + protected static $ignoreChangedAttributes = [ 'updated_at' ]; |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * The attributes to log in the Activity Log |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
| 27 | - protected static $ignoreChangedAttributes = ['updated_at']; |
|
| 27 | + protected static $ignoreChangedAttributes = [ 'updated_at' ]; |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * The attributes to log in the Activity Log |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function index() |
| 23 | 23 | { |
| 24 | - return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400); |
|
| 24 | + return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | //event(new Registered(true)); |
| 91 | 91 | |
| 92 | 92 | // Return the new device info including the token. |
| 93 | - return response()->json(['data' => $device->toArray()], 201); |
|
| 93 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | foreach ($sensor_datas as $sensor_data) { |
| 128 | 128 | $sensor = Sensor::firstOrCreate([ |
| 129 | 129 | "device_id" => $device->id, |
| 130 | - "name" => $sensor_data['name'], |
|
| 131 | - "type" => $sensor_data['type'] |
|
| 130 | + "name" => $sensor_data[ 'name' ], |
|
| 131 | + "type" => $sensor_data[ 'type' ] |
|
| 132 | 132 | ]); |
| 133 | 133 | |
| 134 | 134 | SensorData::create([ |
| 135 | 135 | "sensor_id" => $sensor->id, |
| 136 | - "value" => $sensor_data['value'] |
|
| 136 | + "value" => $sensor_data[ 'value' ] |
|
| 137 | 137 | ]); |
| 138 | 138 | } |
| 139 | 139 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | //event(new Registered(true)); |
| 144 | 144 | |
| 145 | 145 | // Return the new device info including the token. |
| 146 | - return response()->json(['data' => $device->toArray()], 201); |
|
| 146 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | // If challenge string doesnt match then send 401 unauthorized. |
| 164 | 164 | if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) { |
| 165 | - return response()->json(['data' => 'Bad challenge.'], 401); |
|
| 165 | + return response()->json([ 'data' => 'Bad challenge.' ], 401); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // If the uuid already exists then just send them the record. |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | 'uuid' => $device->uuid, |
| 173 | 173 | 'id' => $device->id, |
| 174 | 174 | 'token' => $device->token, |
| 175 | - ]], 200); |
|
| 175 | + ] ], 200); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | // Create the new device. |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | 'uuid' => $device->uuid, |
| 197 | 197 | 'id' => $device->id, |
| 198 | 198 | 'token' => $device->token, |
| 199 | - ]], 201); |
|
| 199 | + ] ], 201); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -217,21 +217,21 @@ discard block |
||
| 217 | 217 | $device = Device::getDeviceByUUID($request->input('uuid')); |
| 218 | 218 | |
| 219 | 219 | // Save the image to disk. |
| 220 | - $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private'); |
|
| 220 | + $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private'); |
|
| 221 | 221 | |
| 222 | 222 | // Update the url for the image. |
| 223 | 223 | $deviceimage = Deviceimage::updateOrCreate( |
| 224 | - ['device_id' => $device['id']], |
|
| 225 | - ['url' => $path] |
|
| 224 | + [ 'device_id' => $device[ 'id' ] ], |
|
| 225 | + [ 'url' => $path ] |
|
| 226 | 226 | ); |
| 227 | 227 | |
| 228 | 228 | // Force the updated_at timestamp to update as the url may not change. |
| 229 | 229 | $deviceimage->touch(); |
| 230 | 230 | |
| 231 | 231 | return response()->json([ 'data' => [ |
| 232 | - 'id' => $deviceimage['id'], |
|
| 232 | + 'id' => $deviceimage[ 'id' ], |
|
| 233 | 233 | 'url' => $path, |
| 234 | - ]], 201); |
|
| 234 | + ] ], 201); |
|
| 235 | 235 | } |
| 236 | 236 | } |
| 237 | 237 | |
@@ -16,16 +16,16 @@ discard block |
||
| 16 | 16 | public function dataTable($query) |
| 17 | 17 | { |
| 18 | 18 | return datatables($query) |
| 19 | - ->editColumn('causer_id', function ($activity) { |
|
| 20 | - return ($activity->causer_id ? '<a href="/' . ($activity->causer_type == "App\User" ? 'user' : 'device') . '/' . $activity->causer_id . '">' . ($activity->causer->name ?? '') . '</a>' : 'App'); |
|
| 19 | + ->editColumn('causer_id', function($activity) { |
|
| 20 | + return ($activity->causer_id ? '<a href="/'.($activity->causer_type == "App\User" ? 'user' : 'device').'/'.$activity->causer_id.'">'.($activity->causer->name ?? '').'</a>' : 'App'); |
|
| 21 | 21 | }) |
| 22 | - ->editColumn('subject_id', function ($activity) { |
|
| 23 | - return ($activity->subject_id ? '<a href="/' . ($activity->subject_type == "App\User" ? 'user' : 'device') . '/' . $activity->subject_id . '">' . ($activity->subject->name ?? '') . '</a>' : 'App'); |
|
| 22 | + ->editColumn('subject_id', function($activity) { |
|
| 23 | + return ($activity->subject_id ? '<a href="/'.($activity->subject_type == "App\User" ? 'user' : 'device').'/'.$activity->subject_id.'">'.($activity->subject->name ?? '').'</a>' : 'App'); |
|
| 24 | 24 | }) |
| 25 | - ->editColumn('properties', function ($activity) { |
|
| 25 | + ->editColumn('properties', function($activity) { |
|
| 26 | 26 | return $activity->properties; |
| 27 | 27 | }) |
| 28 | - ->rawColumns(['causer_id', 'subject_id', 'properties']); |
|
| 28 | + ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -98,6 +98,6 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | protected function filename() |
| 100 | 100 | { |
| 101 | - return 'activitylog_' . time(); |
|
| 101 | + return 'activitylog_'.time(); |
|
| 102 | 102 | } |
| 103 | 103 | } |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | { |
| 112 | 112 | SensorData::find($id)->delete(); |
| 113 | 113 | return redirect()->route('sensordata.index') |
| 114 | - ->with('success','SensorData deleted successfully'); |
|
| 114 | + ->with('success', 'SensorData deleted successfully'); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | } |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | { |
| 118 | 118 | Sensor::findOrFail($id)->delete(); |
| 119 | 119 | return redirect()->route('sensor.index') |
| 120 | - ->with('success','Sensor deleted successfully'); |
|
| 120 | + ->with('success', 'Sensor deleted successfully'); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | } |
@@ -15,15 +15,15 @@ |
||
| 15 | 15 | public function dataTable($query) |
| 16 | 16 | { |
| 17 | 17 | return datatables($query) |
| 18 | - ->addColumn('sensor', function ($sensordata) { |
|
| 19 | - return '<a href="' . route('sensor.show', $sensordata->sensor_id) . '">'. ($sensordata->sensor->name ?? 'null') . '</a>'; |
|
| 18 | + ->addColumn('sensor', function($sensordata) { |
|
| 19 | + return '<a href="'.route('sensor.show', $sensordata->sensor_id).'">'.($sensordata->sensor->name ?? 'null').'</a>'; |
|
| 20 | 20 | }) |
| 21 | - ->addColumn('device', function ($sensordata) { |
|
| 22 | - return '<a href="' . route('device.show', $sensordata->sensor->device->id ?? '0') . '">'. ($sensordata->sensor->device->name ?? 'null') . '</a>'; |
|
| 21 | + ->addColumn('device', function($sensordata) { |
|
| 22 | + return '<a href="'.route('device.show', $sensordata->sensor->device->id ?? '0').'">'.($sensordata->sensor->device->name ?? 'null').'</a>'; |
|
| 23 | 23 | }) |
| 24 | 24 | ->addColumn('action', 'sensordata.action') |
| 25 | - ->blacklist([ 'action']) |
|
| 26 | - ->rawColumns(['device', 'sensor', 'action']); |
|
| 25 | + ->blacklist([ 'action' ]) |
|
| 26 | + ->rawColumns([ 'device', 'sensor', 'action' ]); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |