@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | - |
|
7 | 5 | class HomeController extends Controller |
8 | 6 | { |
9 | 7 | /** |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Bus\Queueable; |
6 | 6 | use Illuminate\Notifications\Notification; |
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 7 | use Illuminate\Notifications\Messages\NexmoMessage; |
9 | 8 | |
10 | 9 | class InvoicePaid extends Notification |
@@ -2,9 +2,7 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | 5 | use Intervention\Image\Facades\Image as Image; |
7 | -use Illuminate\Support\Facades\Cache; |
|
8 | 6 | use Illuminate\Support\Facades\Storage; |
9 | 7 | |
10 | 8 | class ImageController extends Controller |
@@ -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 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function index() |
20 | 20 | { |
21 | - return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400); |
|
21 | + return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | // If validation fails, send the validation error back with status 400. |
64 | 64 | if ($validator->fails()) { |
65 | - return response()->json(['data' => $validator->errors()], 400); |
|
65 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | // Get the device record. |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | // If token doesnt match then send 401 unauthorized. |
72 | 72 | if ($request->input('token') != $device->token) { |
73 | - return response()->json(['data' => 'Bad token.'], 401); |
|
73 | + return response()->json([ 'data' => 'Bad token.' ], 401); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | // Update the device. |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | //event(new Registered(true)); |
101 | 101 | |
102 | 102 | // Return the new device info including the token. |
103 | - return response()->json(['data' => $device->toArray()], 201); |
|
103 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | /** |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | // If validation fails, send the validation error back with status 400. |
121 | 121 | if ($validator->fails()) { |
122 | - return response()->json(['data' => $validator->errors()], 400); |
|
122 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | // If challenge string doesnt match then send 401 unauthorized. |
126 | 126 | if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) { |
127 | - return response()->json(['data' => 'Bad challenge.'], 401); |
|
127 | + return response()->json([ 'data' => 'Bad challenge.' ], 401); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | // If the uuid already exists then just send them the record. |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | 'uuid' => $device->uuid, |
135 | 135 | 'id' => $device->id, |
136 | 136 | 'token' => $device->token, |
137 | - ]], 200); |
|
137 | + ] ], 200); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | // Create the new device. |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | 'uuid' => $device->uuid, |
158 | 158 | 'id' => $device->id, |
159 | 159 | 'token' => $device->token, |
160 | - ]], 201); |
|
160 | + ] ], 201); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | // If validation fails, send the validation error back with status 400. |
178 | 178 | if ($validator->fails()) { |
179 | - return response()->json(['data' => $validator->errors()], 400); |
|
179 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | // Get the device record. |
@@ -184,25 +184,25 @@ discard block |
||
184 | 184 | |
185 | 185 | // If token doesnt match then send 401 unauthorized. |
186 | 186 | if ($request->input('token') != $device->token) { |
187 | - return response()->json(['data' => 'Bad token.'], 401); |
|
187 | + return response()->json([ 'data' => 'Bad token.' ], 401); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | // Save the image to disk. |
191 | - $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private'); |
|
191 | + $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private'); |
|
192 | 192 | |
193 | 193 | // Update the url for the image. |
194 | 194 | $deviceimage = Deviceimage::updateOrCreate( |
195 | - ['device_id' => $device['id']], |
|
196 | - ['url' => $path] |
|
195 | + [ 'device_id' => $device[ 'id' ] ], |
|
196 | + [ 'url' => $path ] |
|
197 | 197 | ); |
198 | 198 | |
199 | 199 | // Force the updated_at timestamp to update as the url may not change. |
200 | 200 | $deviceimage->touch(); |
201 | 201 | |
202 | 202 | return response()->json([ 'data' => [ |
203 | - 'id' => $deviceimage['id'], |
|
203 | + 'id' => $deviceimage[ 'id' ], |
|
204 | 204 | 'url' => $path, |
205 | - ]], 201); |
|
205 | + ] ], 201); |
|
206 | 206 | } |
207 | 207 | } |
208 | 208 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Bus\Queueable; |
6 | 6 | use Illuminate\Notifications\Notification; |
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 7 | use Illuminate\Notifications\Messages\NexmoMessage; |
9 | 8 | |
10 | 9 | class DeviceRegister extends Notification |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use App\Http\Requests\EditDevice; |
6 | -use Validator; |
|
7 | 6 | use Illuminate\Http\Request; |
8 | 7 | use App\DataTables\DevicesDataTable; |
9 | -use Illuminate\Support\Facades\Route; |
|
10 | 8 | use App\Device; |
11 | 9 | use App\Site; |
12 | 10 | use App\Location; |
@@ -2,11 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use Validator; |
|
6 | -use Illuminate\Http\Request; |
|
7 | 5 | use App\Http\Controllers\Controller; |
8 | 6 | use App\DataTables\ActivityLogDataTable; |
9 | -use App\User; |
|
10 | 7 | |
11 | 8 | class ActivityLogController extends Controller |
12 | 9 | { |
@@ -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 |
@@ -17,7 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | return datatables($query) |
19 | 19 | ->addColumn('action', 'device.action') |
20 | - ->blacklist([ 'action']) |
|
20 | + ->blacklist([ 'action' ]) |
|
21 | 21 | ->setRowClass(function($device) { |
22 | 22 | return $device->trashed() ? 'alert-danger' : ""; |
23 | 23 | }); |