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/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 1 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.
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -9,42 +9,42 @@  discard block
 block discarded – undo
9 9
 class SensorDataController extends Controller 
10 10
 {
11 11
     /**
12
-    * Create a new controller instance.
13
-    *
14
-    * @return void
15
-    */
12
+     * Create a new controller instance.
13
+     *
14
+     * @return void
15
+     */
16 16
     public function __construct()
17 17
     {
18 18
         $this->middleware('auth');
19 19
     }
20 20
 
21 21
     /**
22
-    * Display a listing of the resource.
23
-    *
24
-    * @param SensorDataDataTable $dataTable
25
-    * @return Response
26
-    */
22
+     * Display a listing of the resource.
23
+     *
24
+     * @param SensorDataDataTable $dataTable
25
+     * @return Response
26
+     */
27 27
     public function index(SensorDataDataTable $dataTable)
28 28
     {
29 29
         return $dataTable->render('sensordata.index');
30 30
     }
31 31
 
32 32
     /**
33
-    * Show the form for creating a new resource.
34
-    *
35
-    * @return Response
36
-    */
33
+     * Show the form for creating a new resource.
34
+     *
35
+     * @return Response
36
+     */
37 37
     public function create()
38 38
     {
39 39
         return view('sensordata.create');
40 40
     }
41 41
 
42 42
     /**
43
-    * Store a newly created resource in storage.
44
-    *
45
-    * @param Request $request
46
-    * @return Response
47
-    */
43
+     * Store a newly created resource in storage.
44
+     *
45
+     * @param Request $request
46
+     * @return Response
47
+     */
48 48
     public function store(Request $request)
49 49
     {
50 50
         request()->validate([
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
     }
60 60
 
61 61
     /**
62
-    * Display the specified resource.
63
-    *
64
-    * @param  Request  $request
65
-    * @param  int  $id
66
-    * @return Response
67
-    */
62
+     * Display the specified resource.
63
+     *
64
+     * @param  Request  $request
65
+     * @param  int  $id
66
+     * @return Response
67
+     */
68 68
     public function show(Request $request, $id)
69 69
     {
70 70
         $sensordata = SensorData::findOrFail($id);
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
     }
74 74
 
75 75
     /**
76
-    * Show the form for editing the specified resource.
77
-    *
78
-    * @param  int  $id
79
-    * @return Response
80
-    */
76
+     * Show the form for editing the specified resource.
77
+     *
78
+     * @param  int  $id
79
+     * @return Response
80
+     */
81 81
     public function edit(Request $request, $id)
82 82
     {
83 83
         $sensordata = SensorData::findOrFail($id);
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
86 86
     }
87 87
 
88 88
     /**
89
-    * Update the specified resource in storage.
90
-    *
91
-    * @param  int  $id
92
-    * @return Response
93
-    */
89
+     * Update the specified resource in storage.
90
+     *
91
+     * @param  int  $id
92
+     * @return Response
93
+     */
94 94
     public function update($id)
95 95
     {
96 96
         request()->validate([
@@ -103,11 +103,11 @@  discard block
 block discarded – undo
103 103
     }
104 104
 
105 105
     /**
106
-    * Remove the specified resource from storage.
107
-    *
108
-    * @param  int  $id
109
-    * @return Response
110
-    */
106
+     * Remove the specified resource from storage.
107
+     *
108
+     * @param  int  $id
109
+     * @return Response
110
+     */
111 111
     public function destroy($id)
112 112
     {
113 113
         SensorData::find($id)->delete();
Please login to merge, or discard this patch.
app/Http/Controllers/SensorController.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -10,42 +10,42 @@  discard block
 block discarded – undo
10 10
 class SensorController extends Controller 
11 11
 {
12 12
     /**
13
-    * Create a new controller instance.
14
-    *
15
-    * @return void
16
-    */
13
+     * Create a new controller instance.
14
+     *
15
+     * @return void
16
+     */
17 17
     public function __construct()
18 18
     {
19 19
         $this->middleware('auth');
20 20
     }
21 21
 
22 22
     /**
23
-    * Display a listing of the resource.
24
-    *
25
-    * @param  SensorDataTable   $dataTable
26
-    * @return Response
27
-    */
23
+     * Display a listing of the resource.
24
+     *
25
+     * @param  SensorDataTable   $dataTable
26
+     * @return Response
27
+     */
28 28
     public function index(SensorDataTable $dataTable)
29 29
     {
30 30
         return $dataTable->render('sensor.index');
31 31
     }
32 32
 
33 33
     /**
34
-    * Show the form for creating a new resource.
35
-    *
36
-    * @return Response
37
-    */
34
+     * Show the form for creating a new resource.
35
+     *
36
+     * @return Response
37
+     */
38 38
     public function create()
39 39
     {
40 40
         return view('sensor.create');
41 41
     }
42 42
 
43 43
     /**
44
-    * Store a newly created resource in storage.
45
-    *
46
-    * @param Request $request
47
-    * @return Response
48
-    */
44
+     * Store a newly created resource in storage.
45
+     *
46
+     * @param Request $request
47
+     * @return Response
48
+     */
49 49
     public function store(Request $request)
50 50
     {
51 51
         request()->validate([
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
     }
62 62
 
63 63
     /**
64
-    * Display the specified resource.
65
-    *
66
-    * @param  Request  $request
67
-    * @param  int  $id
68
-    * @return Response
69
-    */
64
+     * Display the specified resource.
65
+     *
66
+     * @param  Request  $request
67
+     * @param  int  $id
68
+     * @return Response
69
+     */
70 70
     public function show(Request $request, $id)
71 71
     {
72 72
         $sensor = Sensor::findOrFail($id);
@@ -75,12 +75,12 @@  discard block
 block discarded – undo
75 75
     }
76 76
 
77 77
     /**
78
-    * Show the form for editing the specified resource.
79
-    *
80
-    * @param  Request  $request
81
-    * @param  int  $id
82
-    * @return Response
83
-    */
78
+     * Show the form for editing the specified resource.
79
+     *
80
+     * @param  Request  $request
81
+     * @param  int  $id
82
+     * @return Response
83
+     */
84 84
     public function edit(Request $request, $id)
85 85
     {
86 86
         $sensor = Sensor::findOrFail($id);
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
     }
90 90
 
91 91
     /**
92
-    * Update the specified resource in storage.
93
-    *
94
-    * @param  Request  $request
95
-    * @param  int  $id
96
-    * @return Response
97
-    */
92
+     * Update the specified resource in storage.
93
+     *
94
+     * @param  Request  $request
95
+     * @param  int  $id
96
+     * @return Response
97
+     */
98 98
     public function update(Request $request, $id)
99 99
     {
100 100
         request()->validate([
@@ -108,11 +108,11 @@  discard block
 block discarded – undo
108 108
     }
109 109
 
110 110
     /**
111
-    * Remove the specified resource from storage.
112
-    *
113
-    * @param  int  $id
114
-    * @return Response
115
-    */
111
+     * Remove the specified resource from storage.
112
+     *
113
+     * @param  int  $id
114
+     * @return Response
115
+     */
116 116
     public function destroy($id)
117 117
     {
118 118
         Sensor::findOrFail($id)->delete();
Please login to merge, or discard this patch.
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.
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.
app/DataTables/SensorDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@
 block discarded – undo
15 15
     public function dataTable($query)
16 16
     {
17 17
         return datatables($query)
18
-            ->editColumn('name', function ($sensor) {
19
-                return '<a href="' . route('sensor.show', $sensor->id) . '">'. $sensor->name . '</a>';
18
+            ->editColumn('name', function($sensor) {
19
+                return '<a href="'.route('sensor.show', $sensor->id).'">'.$sensor->name.'</a>';
20 20
             })
21
-            ->editColumn('device_id', function ($sensor) {
22
-                return '<a href="' . route('device.show', $sensor->device_id) . '">'. ($sensor->device->name ?? '') . '</a>';
21
+            ->editColumn('device_id', function($sensor) {
22
+                return '<a href="'.route('device.show', $sensor->device_id).'">'.($sensor->device->name ?? '').'</a>';
23 23
             })
24
-            ->addColumn('value', function ($sensor) {
25
-                return '<a href="' . route('sensordata.show', $sensor->latest_data->id ?? '0') . '">'. ($sensor->latest_data->value ?? 'null') . '</a>';
24
+            ->addColumn('value', function($sensor) {
25
+                return '<a href="'.route('sensordata.show', $sensor->latest_data->id ?? '0').'">'.($sensor->latest_data->value ?? 'null').'</a>';
26 26
             })
27 27
             ->addColumn('action', 'sensor.action')
28 28
             ->blacklist([ 'value', 'action' ])
29
-            ->rawColumns(['device_id', 'name', 'value', 'action']);
29
+            ->rawColumns([ 'device_id', 'name', 'value', 'action' ]);
30 30
     }
31 31
 
32 32
     /**
Please login to merge, or discard this patch.