uidaho / smartsettia

app/DataTables/SensorDataDataTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     /**
      * Get columns.
      *
-     * @return array
+     * @return string[]
      */
     protected function getColumns()
     {

Spacing +4 added lines, -4 removed lines

@@ -15,12 +15,12 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('sensor_id', function ($sensordata) {
-                return '<a href="/sensor/' . $sensordata->sensor_id . '">'. $sensordata->sensor->name . '</a>';
+            ->editColumn('sensor_id', function($sensordata) {
+                return '<a href="/sensor/'.$sensordata->sensor_id.'">'.$sensordata->sensor->name.'</a>';
             })
             ->addColumn('action', 'sensordata.action')
-            ->blacklist([ 'action'])
-            ->rawColumns(['sensor_id', 'action']);
+            ->blacklist([ 'action' ])
+            ->rawColumns([ 'sensor_id', 'action' ]);
     }
 
     /**

app/Http/Controllers/ApiController.php

Doc Comments +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * Creates a json response for all the devices.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function index()
     {
@@ -28,7 +28,7 @@ 
      * Creates a json response for a specifc device.
      *
      * @param  Device  $device
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function show(Device $device)
     {
@@ -39,7 +39,7 @@ 
      * Updates the status of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request)
     {
@@ -107,7 +107,7 @@ 
      * Updates the sensors of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function sensor(Request $request)
     {
@@ -170,7 +170,7 @@ 
      * Registers a new device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -228,7 +228,7 @@ 
      * Updates the image for a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function image(Request $request) {
         // Validate the request.

Unused Use Statements -2 removed lines

@@ -9,8 +9,6 @@
 use App\User;
 use App\Sensor;
 use App\SensorData;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
 
 class ApiController extends Controller
 {

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
      */    
     public function index()
     {
-        return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400);
+        return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400);
     }
 
     /**
@@ -65,7 +65,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.
@@ -73,7 +73,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);
     }
     
     /**
@@ -122,7 +122,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.
@@ -130,7 +130,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.
@@ -147,13 +147,13 @@ 
         foreach ($sensor_datas as $sensor_data) {
             $sensor = Sensor::firstOrCreate([
                 "device_id" => $device->id,
-                "name" => $sensor_data['name'], 
-                "type" => $sensor_data['type']
+                "name" => $sensor_data[ 'name' ], 
+                "type" => $sensor_data[ 'type' ]
             ]);
             
             SensorData::create([
                 "sensor_id" => $sensor->id,
-                "value" => $sensor_data['value']
+                "value" => $sensor_data[ 'value' ]
             ]);
         }
         
@@ -163,7 +163,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);
     }
     
     /**
@@ -182,12 +182,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.
@@ -197,7 +197,7 @@ 
                 'uuid' => $device->uuid,
                 'id' => $device->id,
                 'token' => $device->token,
-            ]], 200);
+            ] ], 200);
         }
         
         // Create the new device.
@@ -221,7 +221,7 @@ 
             'uuid' => $device->uuid,
             'id' => $device->id,
             'token' => $device->token,
-        ]], 201);
+        ] ], 201);
     }
     
     /**
@@ -240,7 +240,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.
@@ -248,25 +248,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/SensorDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -15,18 +15,18 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('device_id', function ($sensor) {
-                return '<a href="/device/' . $sensor->device_id . '">'. $sensor->device->name . '</a>';
+            ->editColumn('device_id', function($sensor) {
+                return '<a href="/device/'.$sensor->device_id.'">'.$sensor->device->name.'</a>';
             })
-            ->editColumn('name', function ($sensor) {
-                return '<a href="/sensor/' . $sensor->id . '">'. $sensor->name . '</a>';
+            ->editColumn('name', function($sensor) {
+                return '<a href="/sensor/'.$sensor->id.'">'.$sensor->name.'</a>';
             })
-            ->addColumn('value', function ($sensor) {
+            ->addColumn('value', function($sensor) {
                 return $sensor->latestData->value;
             })
             ->addColumn('action', 'sensor.action')
-            ->blacklist([ 'action', 'value'])
-            ->rawColumns(['device_id', 'name', 'action']);
+            ->blacklist([ 'action', 'value' ])
+            ->rawColumns([ 'device_id', 'name', 'action' ]);
     }
 
     /**

app/Http/Controllers/SensorController.php

Indentation +36 added lines, -36 removed lines

@@ -9,51 +9,51 @@ 
 class SensorController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
     public function index(SensorDataTable $dataTable)
     {
         return $dataTable->render('sensor.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensor.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @return Response
+     */
     public function store()
     {
     
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -62,11 +62,11 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -75,22 +75,22 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function update($id)
     {
     
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {
     

app/Http/Controllers/SensorDataController.php

Indentation +36 added lines, -36 removed lines

@@ -9,51 +9,51 @@ 
 class SensorDataController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
     public function index(SensorDataDataTable $dataTable)
     {
         return $dataTable->render('sensordata.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensordata.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @return Response
+     */
     public function store()
     {
     
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -62,11 +62,11 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -75,22 +75,22 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function update($id)
     {
     
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {