Completed
Pull Request — master (#119)
by
unknown
17:56
created
app/Http/Controllers/ImageController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
app/Http/Controllers/ActivityLogController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     /**
24 24
      * Display index page and process dataTable ajax request.
25 25
      *
26
-     * @param \App\DataTables\UsersDataTable $dataTable
26
+     * @param ActivityLogDataTable $dataTable
27 27
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
28 28
      */
29 29
     public function index(ActivityLogDataTable $dataTable)
Please login to merge, or discard this patch.
app/Site.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
app/Location.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
app/Deviceimage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
app/Http/Controllers/ApiController.php 2 patches
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     /**
18 18
      * Creates a json response for all the devices.
19 19
      *
20
-     * @return Response
20
+     * @return \Illuminate\Http\JsonResponse
21 21
      */    
22 22
     public function index()
23 23
     {
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
      * Creates a json response for a specifc device.
29 29
      *
30 30
      * @param  Device  $device
31
-     * @return Response
31
+     * @return \Illuminate\Http\JsonResponse
32 32
      */    
33 33
     public function show(Device $device)
34 34
     {
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
      * Updates the status of a device.
40 40
      *
41 41
      * @param  Request  $request
42
-     * @return Response
42
+     * @return \Illuminate\Http\JsonResponse
43 43
      */
44 44
     public function update(Request $request)
45 45
     {
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
      * Updates the sensors of a device.
108 108
      *
109 109
      * @param  Request  $request
110
-     * @return Response
110
+     * @return \Illuminate\Http\JsonResponse
111 111
      */
112 112
     public function sensor(Request $request)
113 113
     {
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
      * Registers a new device.
171 171
      *
172 172
      * @param  Request  $request
173
-     * @return Response
173
+     * @return \Illuminate\Http\JsonResponse
174 174
      */
175 175
     public function register(Request $request)
176 176
     {
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
      * Updates the image for a device.
229 229
      *
230 230
      * @param  Request  $request
231
-     * @return Response
231
+     * @return \Illuminate\Http\JsonResponse
232 232
      */
233 233
     public function image(Request $request) {
234 234
         // Validate the request.
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
app/Http/Controllers/SensorDataController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     * Store a newly created resource in storage.
44 44
     *
45 45
     * @param Request $request
46
-    * @return Response
46
+    * @return \Illuminate\Http\RedirectResponse
47 47
     */
48 48
     public function store(Request $request)
49 49
     {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     * Update the specified resource in storage.
90 90
     *
91 91
     * @param  int  $id
92
-    * @return Response
92
+    * @return \Illuminate\Http\RedirectResponse
93 93
     */
94 94
     public function update($id)
95 95
     {
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     * Remove the specified resource from storage.
107 107
     *
108 108
     * @param  int  $id
109
-    * @return Response
109
+    * @return \Illuminate\Http\RedirectResponse
110 110
     */
111 111
     public function destroy($id)
112 112
     {
Please login to merge, or discard this patch.
app/Http/Controllers/SensorController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     * Store a newly created resource in storage.
45 45
     *
46 46
     * @param Request $request
47
-    * @return Response
47
+    * @return \Illuminate\Http\RedirectResponse
48 48
     */
49 49
     public function store(Request $request)
50 50
     {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     *
96 96
     * @param  Request  $request
97 97
     * @param  int  $id
98
-    * @return Response
98
+    * @return \Illuminate\Http\RedirectResponse
99 99
     */
100 100
     public function update(Request $request, $id)
101 101
     {
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     * Remove the specified resource from storage.
114 114
     *
115 115
     * @param  int  $id
116
-    * @return Response
116
+    * @return \Illuminate\Http\RedirectResponse
117 117
     */
118 118
     public function destroy($id)
119 119
     {
Please login to merge, or discard this patch.
app/DataTables/SensorDataDataTable.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,15 +15,15 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.