@@ -7,102 +7,102 @@ |
||
| 7 | 7 | |
| 8 | 8 | class ApiController extends Controller |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * Default Status Code. |
|
| 12 | - * |
|
| 13 | - * @var int |
|
| 14 | - */ |
|
| 15 | - protected $statusCode = 200; |
|
| 10 | + /** |
|
| 11 | + * Default Status Code. |
|
| 12 | + * |
|
| 13 | + * @var int |
|
| 14 | + */ |
|
| 15 | + protected $statusCode = 200; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @return int |
|
| 19 | - */ |
|
| 20 | - public function getStatusCode() |
|
| 21 | - { |
|
| 22 | - return $this->statusCode; |
|
| 23 | - } |
|
| 17 | + /** |
|
| 18 | + * @return int |
|
| 19 | + */ |
|
| 20 | + public function getStatusCode() |
|
| 21 | + { |
|
| 22 | + return $this->statusCode; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * @param int $statusCode |
|
| 27 | - * |
|
| 28 | - * @return $this |
|
| 29 | - */ |
|
| 30 | - public function setStatusCode($statusCode) |
|
| 31 | - { |
|
| 32 | - $this->statusCode = $statusCode; |
|
| 25 | + /** |
|
| 26 | + * @param int $statusCode |
|
| 27 | + * |
|
| 28 | + * @return $this |
|
| 29 | + */ |
|
| 30 | + public function setStatusCode($statusCode) |
|
| 31 | + { |
|
| 32 | + $this->statusCode = $statusCode; |
|
| 33 | 33 | |
| 34 | - return $this; |
|
| 35 | - } |
|
| 34 | + return $this; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param array $data |
|
| 39 | - * |
|
| 40 | - * @return mixed |
|
| 41 | - */ |
|
| 42 | - public function respondCreated($data, $id) |
|
| 43 | - { |
|
| 44 | - $headers = [ |
|
| 45 | - 'Location' => route('api.v1.devices.show', $id), |
|
| 46 | - ]; |
|
| 37 | + /** |
|
| 38 | + * @param array $data |
|
| 39 | + * |
|
| 40 | + * @return mixed |
|
| 41 | + */ |
|
| 42 | + public function respondCreated($data, $id) |
|
| 43 | + { |
|
| 44 | + $headers = [ |
|
| 45 | + 'Location' => route('api.v1.devices.show', $id), |
|
| 46 | + ]; |
|
| 47 | 47 | |
| 48 | - return $this->setStatusCode(201)->respond(compact('data'), $headers); |
|
| 49 | - } |
|
| 48 | + return $this->setStatusCode(201)->respond(compact('data'), $headers); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param array $data |
|
| 53 | - * |
|
| 54 | - * @return mixed |
|
| 55 | - */ |
|
| 56 | - public function respondPoked($data, $id) |
|
| 57 | - { |
|
| 58 | - $headers = [ |
|
| 59 | - 'Location' => route('api.v1.devices.show', $id), |
|
| 60 | - ]; |
|
| 51 | + /** |
|
| 52 | + * @param array $data |
|
| 53 | + * |
|
| 54 | + * @return mixed |
|
| 55 | + */ |
|
| 56 | + public function respondPoked($data, $id) |
|
| 57 | + { |
|
| 58 | + $headers = [ |
|
| 59 | + 'Location' => route('api.v1.devices.show', $id), |
|
| 60 | + ]; |
|
| 61 | 61 | |
| 62 | - return $this->setStatusCode(200)->respond(compact('data'), $headers); |
|
| 63 | - } |
|
| 62 | + return $this->setStatusCode(200)->respond(compact('data'), $headers); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @return mixed |
|
| 67 | - */ |
|
| 68 | - public function respondNoContent() |
|
| 69 | - { |
|
| 70 | - return $this->setStatusCode(204)->respond([]); |
|
| 71 | - } |
|
| 65 | + /** |
|
| 66 | + * @return mixed |
|
| 67 | + */ |
|
| 68 | + public function respondNoContent() |
|
| 69 | + { |
|
| 70 | + return $this->setStatusCode(204)->respond([]); |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * @param string $message |
|
| 75 | - * |
|
| 76 | - * @return mixed |
|
| 77 | - */ |
|
| 78 | - public function respondNotFound($message = 'Did not find the resource you are looking for!') |
|
| 79 | - { |
|
| 80 | - return $this->setStatusCode(404)->respondWithError($message); |
|
| 81 | - } |
|
| 73 | + /** |
|
| 74 | + * @param string $message |
|
| 75 | + * |
|
| 76 | + * @return mixed |
|
| 77 | + */ |
|
| 78 | + public function respondNotFound($message = 'Did not find the resource you are looking for!') |
|
| 79 | + { |
|
| 80 | + return $this->setStatusCode(404)->respondWithError($message); |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @param $data |
|
| 85 | - * @param array $headers |
|
| 86 | - * |
|
| 87 | - * @return mixed |
|
| 88 | - */ |
|
| 89 | - public function respond($data, $headers = []) |
|
| 90 | - { |
|
| 91 | - return Response::json($data, $this->getStatusCode(), $headers); |
|
| 92 | - } |
|
| 83 | + /** |
|
| 84 | + * @param $data |
|
| 85 | + * @param array $headers |
|
| 86 | + * |
|
| 87 | + * @return mixed |
|
| 88 | + */ |
|
| 89 | + public function respond($data, $headers = []) |
|
| 90 | + { |
|
| 91 | + return Response::json($data, $this->getStatusCode(), $headers); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * @param $message |
|
| 96 | - * |
|
| 97 | - * @return mixed |
|
| 98 | - */ |
|
| 99 | - public function respondWithError($message) |
|
| 100 | - { |
|
| 101 | - return $this->respond([ |
|
| 102 | - 'errors' => [ |
|
| 103 | - 'title' => $message, |
|
| 104 | - 'status' => $this->getStatusCode(), |
|
| 105 | - ], |
|
| 106 | - ]); |
|
| 107 | - } |
|
| 94 | + /** |
|
| 95 | + * @param $message |
|
| 96 | + * |
|
| 97 | + * @return mixed |
|
| 98 | + */ |
|
| 99 | + public function respondWithError($message) |
|
| 100 | + { |
|
| 101 | + return $this->respond([ |
|
| 102 | + 'errors' => [ |
|
| 103 | + 'title' => $message, |
|
| 104 | + 'status' => $this->getStatusCode(), |
|
| 105 | + ], |
|
| 106 | + ]); |
|
| 107 | + } |
|
| 108 | 108 | } |
@@ -10,135 +10,135 @@ |
||
| 10 | 10 | |
| 11 | 11 | class DeviceController extends ApiController |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * @var DeviceTransformer |
|
| 15 | - */ |
|
| 16 | - private $transformer; |
|
| 17 | - |
|
| 18 | - public function __construct(DeviceTransformer $transformer) |
|
| 19 | - { |
|
| 20 | - $this->middleware('auth.basic', ['except' => ['poke', 'show']]); |
|
| 21 | - |
|
| 22 | - $this->transformer = $transformer; |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - /** |
|
| 26 | - * Display a listing of the resource. |
|
| 27 | - * |
|
| 28 | - * @return Response |
|
| 29 | - */ |
|
| 30 | - public function index() |
|
| 31 | - { |
|
| 32 | - $devices = Device::all(); |
|
| 33 | - |
|
| 34 | - return $this->respond([ |
|
| 35 | - 'data' => $this->transformer->transformCollection($devices->all()), |
|
| 36 | - ]); |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * Store a newly created resource in storage. |
|
| 41 | - * |
|
| 42 | - * @param StoreComputerRequest $request |
|
| 43 | - * |
|
| 44 | - * @return Response |
|
| 45 | - */ |
|
| 46 | - public function store(StoreComputerRequest $request) |
|
| 47 | - { |
|
| 48 | - $device = Device::create($request->all()); |
|
| 49 | - |
|
| 50 | - $device->public = $request->get('public', 'auto'); |
|
| 51 | - |
|
| 52 | - return $this->respondCreated($this->transformer->transform($device), $device->id); |
|
| 53 | - } |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Display the specified resource. |
|
| 57 | - * |
|
| 58 | - * @param int $id |
|
| 59 | - * |
|
| 60 | - * @return Response |
|
| 61 | - */ |
|
| 62 | - public function show($id) |
|
| 63 | - { |
|
| 64 | - $device = Device::find($id); |
|
| 65 | - |
|
| 66 | - if (!$device) { |
|
| 67 | - return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - return $this->respond([ |
|
| 71 | - 'data' => $this->transformer->transform($device), |
|
| 72 | - ]); |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - /** |
|
| 76 | - * Update the specified resource in storage. |
|
| 77 | - * |
|
| 78 | - * @param StoreComputerRequest $request |
|
| 79 | - * @param int $id |
|
| 80 | - * |
|
| 81 | - * @return Response |
|
| 82 | - */ |
|
| 83 | - public function update(StoreComputerRequest $request, $id) |
|
| 84 | - { |
|
| 85 | - $device = Device::find($id); |
|
| 86 | - |
|
| 87 | - if (!$device) { |
|
| 88 | - return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - $device = $device->fill($request->all()); |
|
| 92 | - |
|
| 93 | - $device->save(); |
|
| 94 | - |
|
| 95 | - return $this->respond([ |
|
| 96 | - 'data' => $this->transformer->transform($device), |
|
| 97 | - ]); |
|
| 98 | - } |
|
| 99 | - |
|
| 100 | - /** |
|
| 101 | - * Remove the specified resource from storage. |
|
| 102 | - * |
|
| 103 | - * @param int $id |
|
| 104 | - * |
|
| 105 | - * @return Response |
|
| 106 | - */ |
|
| 107 | - public function destroy($id) |
|
| 108 | - { |
|
| 109 | - $device = Device::find($id); |
|
| 110 | - |
|
| 111 | - if (!$device) { |
|
| 112 | - return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - $device->delete(); |
|
| 116 | - |
|
| 117 | - return $this->respondNoContent(); |
|
| 118 | - } |
|
| 119 | - |
|
| 120 | - /** |
|
| 121 | - * Handle device pokes. |
|
| 122 | - * |
|
| 123 | - * @param StoreComputerRequest $request |
|
| 124 | - * |
|
| 125 | - * @throws \Exception |
|
| 126 | - * |
|
| 127 | - * @return Response |
|
| 128 | - */ |
|
| 129 | - public function poke(StoreComputerRequest $request) |
|
| 130 | - { |
|
| 131 | - $device = Device::firstOrNew(['mac' => $request->mac]); |
|
| 132 | - |
|
| 133 | - $device->fill($request->all()); |
|
| 134 | - |
|
| 135 | - $device->group = $request->get('group', null); |
|
| 136 | - $device->public = $request->get('public', 'auto'); |
|
| 137 | - |
|
| 138 | - $device->touch(); |
|
| 139 | - |
|
| 140 | - event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString()))); |
|
| 141 | - |
|
| 142 | - return $this->respondPoked($this->transformer->transform($device), $device->id); |
|
| 143 | - } |
|
| 13 | + /** |
|
| 14 | + * @var DeviceTransformer |
|
| 15 | + */ |
|
| 16 | + private $transformer; |
|
| 17 | + |
|
| 18 | + public function __construct(DeviceTransformer $transformer) |
|
| 19 | + { |
|
| 20 | + $this->middleware('auth.basic', ['except' => ['poke', 'show']]); |
|
| 21 | + |
|
| 22 | + $this->transformer = $transformer; |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + /** |
|
| 26 | + * Display a listing of the resource. |
|
| 27 | + * |
|
| 28 | + * @return Response |
|
| 29 | + */ |
|
| 30 | + public function index() |
|
| 31 | + { |
|
| 32 | + $devices = Device::all(); |
|
| 33 | + |
|
| 34 | + return $this->respond([ |
|
| 35 | + 'data' => $this->transformer->transformCollection($devices->all()), |
|
| 36 | + ]); |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * Store a newly created resource in storage. |
|
| 41 | + * |
|
| 42 | + * @param StoreComputerRequest $request |
|
| 43 | + * |
|
| 44 | + * @return Response |
|
| 45 | + */ |
|
| 46 | + public function store(StoreComputerRequest $request) |
|
| 47 | + { |
|
| 48 | + $device = Device::create($request->all()); |
|
| 49 | + |
|
| 50 | + $device->public = $request->get('public', 'auto'); |
|
| 51 | + |
|
| 52 | + return $this->respondCreated($this->transformer->transform($device), $device->id); |
|
| 53 | + } |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Display the specified resource. |
|
| 57 | + * |
|
| 58 | + * @param int $id |
|
| 59 | + * |
|
| 60 | + * @return Response |
|
| 61 | + */ |
|
| 62 | + public function show($id) |
|
| 63 | + { |
|
| 64 | + $device = Device::find($id); |
|
| 65 | + |
|
| 66 | + if (!$device) { |
|
| 67 | + return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + return $this->respond([ |
|
| 71 | + 'data' => $this->transformer->transform($device), |
|
| 72 | + ]); |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + /** |
|
| 76 | + * Update the specified resource in storage. |
|
| 77 | + * |
|
| 78 | + * @param StoreComputerRequest $request |
|
| 79 | + * @param int $id |
|
| 80 | + * |
|
| 81 | + * @return Response |
|
| 82 | + */ |
|
| 83 | + public function update(StoreComputerRequest $request, $id) |
|
| 84 | + { |
|
| 85 | + $device = Device::find($id); |
|
| 86 | + |
|
| 87 | + if (!$device) { |
|
| 88 | + return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + $device = $device->fill($request->all()); |
|
| 92 | + |
|
| 93 | + $device->save(); |
|
| 94 | + |
|
| 95 | + return $this->respond([ |
|
| 96 | + 'data' => $this->transformer->transform($device), |
|
| 97 | + ]); |
|
| 98 | + } |
|
| 99 | + |
|
| 100 | + /** |
|
| 101 | + * Remove the specified resource from storage. |
|
| 102 | + * |
|
| 103 | + * @param int $id |
|
| 104 | + * |
|
| 105 | + * @return Response |
|
| 106 | + */ |
|
| 107 | + public function destroy($id) |
|
| 108 | + { |
|
| 109 | + $device = Device::find($id); |
|
| 110 | + |
|
| 111 | + if (!$device) { |
|
| 112 | + return $this->respondNotFound('Did not find the device you are looking for!'); |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + $device->delete(); |
|
| 116 | + |
|
| 117 | + return $this->respondNoContent(); |
|
| 118 | + } |
|
| 119 | + |
|
| 120 | + /** |
|
| 121 | + * Handle device pokes. |
|
| 122 | + * |
|
| 123 | + * @param StoreComputerRequest $request |
|
| 124 | + * |
|
| 125 | + * @throws \Exception |
|
| 126 | + * |
|
| 127 | + * @return Response |
|
| 128 | + */ |
|
| 129 | + public function poke(StoreComputerRequest $request) |
|
| 130 | + { |
|
| 131 | + $device = Device::firstOrNew(['mac' => $request->mac]); |
|
| 132 | + |
|
| 133 | + $device->fill($request->all()); |
|
| 134 | + |
|
| 135 | + $device->group = $request->get('group', null); |
|
| 136 | + $device->public = $request->get('public', 'auto'); |
|
| 137 | + |
|
| 138 | + $device->touch(); |
|
| 139 | + |
|
| 140 | + event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString()))); |
|
| 141 | + |
|
| 142 | + return $this->respondPoked($this->transformer->transform($device), $device->id); |
|
| 143 | + } |
|
| 144 | 144 | } |
@@ -8,5 +8,5 @@ |
||
| 8 | 8 | |
| 9 | 9 | abstract class Controller extends BaseController |
| 10 | 10 | { |
| 11 | - use DispatchesCommands, ValidatesRequests; |
|
| 11 | + use DispatchesCommands, ValidatesRequests; |
|
| 12 | 12 | } |
@@ -6,17 +6,17 @@ |
||
| 6 | 6 | |
| 7 | 7 | class GroupController extends Controller |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Show all Devices for the given group. |
|
| 11 | - * |
|
| 12 | - * @param string $group |
|
| 13 | - * |
|
| 14 | - * @return Response |
|
| 15 | - */ |
|
| 16 | - public function show($group) |
|
| 17 | - { |
|
| 18 | - $devices = Device::where('group', $group)->get(); |
|
| 9 | + /** |
|
| 10 | + * Show all Devices for the given group. |
|
| 11 | + * |
|
| 12 | + * @param string $group |
|
| 13 | + * |
|
| 14 | + * @return Response |
|
| 15 | + */ |
|
| 16 | + public function show($group) |
|
| 17 | + { |
|
| 18 | + $devices = Device::where('group', $group)->get(); |
|
| 19 | 19 | |
| 20 | - return view('overview')->with(compact('devices', 'group')); |
|
| 21 | - } |
|
| 20 | + return view('overview')->with(compact('devices', 'group')); |
|
| 21 | + } |
|
| 22 | 22 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | class WelcomeController extends Controller |
| 13 | 13 | { |
| 14 | - /* |
|
| 14 | + /* |
|
| 15 | 15 | |-------------------------------------------------------------------------- |
| 16 | 16 | | Welcome Controller |
| 17 | 17 | |-------------------------------------------------------------------------- |
@@ -22,64 +22,64 @@ discard block |
||
| 22 | 22 | | |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * Create a new controller instance. |
|
| 27 | - */ |
|
| 28 | - public function __construct() |
|
| 29 | - { |
|
| 30 | - $this->middleware('guest'); |
|
| 31 | - } |
|
| 32 | - |
|
| 33 | - /** |
|
| 34 | - * Show the application welcome screen to the user. |
|
| 35 | - * |
|
| 36 | - * @return Response |
|
| 37 | - */ |
|
| 38 | - public function index() |
|
| 39 | - { |
|
| 40 | - $devices = Device::onHomePage()->get(); |
|
| 41 | - |
|
| 42 | - return view('overview')->with(compact('devices')); |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * Show the getting started screen to the user. |
|
| 47 | - * |
|
| 48 | - * @param MarkdownParser $markdown |
|
| 49 | - * @param Cache $cache |
|
| 50 | - * @param Filesystem $file |
|
| 51 | - * |
|
| 52 | - * @return Response |
|
| 53 | - */ |
|
| 54 | - public function gettingStarted(MarkdownParser $markdown, Cache $cache, Filesystem $file) |
|
| 55 | - { |
|
| 56 | - $gettingStarted = $cache->remember('getting-started', 5, function () use ($markdown, $file) { |
|
| 57 | - |
|
| 58 | - $gettingStarted = $file->get(base_path('resources/getting-started/readme.md')); |
|
| 59 | - |
|
| 60 | - return $markdown->parse($gettingStarted); |
|
| 61 | - }); |
|
| 62 | - |
|
| 63 | - return view('getting-started')->with(compact('gettingStarted')); |
|
| 64 | - } |
|
| 65 | - |
|
| 66 | - /** |
|
| 67 | - * Show the statistics screen to the user. |
|
| 68 | - * |
|
| 69 | - * @return Response |
|
| 70 | - */ |
|
| 71 | - public function statistics(Statistics $statistics) |
|
| 72 | - { |
|
| 73 | - $pokes_total = $statistics->totalPokes(); |
|
| 74 | - |
|
| 75 | - $devices_total = $statistics->totalDevices(); |
|
| 76 | - |
|
| 77 | - $pokes = $statistics->allPokes()->toArray(); |
|
| 78 | - |
|
| 79 | - $network_distribution = $statistics->networkDistribution()->toArray(); |
|
| 80 | - |
|
| 81 | - JavaScript::put(compact('pokes', 'network_distribution')); |
|
| 82 | - |
|
| 83 | - return view('statistics')->with(compact('pokes_total', 'devices_total')); |
|
| 84 | - } |
|
| 25 | + /** |
|
| 26 | + * Create a new controller instance. |
|
| 27 | + */ |
|
| 28 | + public function __construct() |
|
| 29 | + { |
|
| 30 | + $this->middleware('guest'); |
|
| 31 | + } |
|
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * Show the application welcome screen to the user. |
|
| 35 | + * |
|
| 36 | + * @return Response |
|
| 37 | + */ |
|
| 38 | + public function index() |
|
| 39 | + { |
|
| 40 | + $devices = Device::onHomePage()->get(); |
|
| 41 | + |
|
| 42 | + return view('overview')->with(compact('devices')); |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * Show the getting started screen to the user. |
|
| 47 | + * |
|
| 48 | + * @param MarkdownParser $markdown |
|
| 49 | + * @param Cache $cache |
|
| 50 | + * @param Filesystem $file |
|
| 51 | + * |
|
| 52 | + * @return Response |
|
| 53 | + */ |
|
| 54 | + public function gettingStarted(MarkdownParser $markdown, Cache $cache, Filesystem $file) |
|
| 55 | + { |
|
| 56 | + $gettingStarted = $cache->remember('getting-started', 5, function () use ($markdown, $file) { |
|
| 57 | + |
|
| 58 | + $gettingStarted = $file->get(base_path('resources/getting-started/readme.md')); |
|
| 59 | + |
|
| 60 | + return $markdown->parse($gettingStarted); |
|
| 61 | + }); |
|
| 62 | + |
|
| 63 | + return view('getting-started')->with(compact('gettingStarted')); |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + /** |
|
| 67 | + * Show the statistics screen to the user. |
|
| 68 | + * |
|
| 69 | + * @return Response |
|
| 70 | + */ |
|
| 71 | + public function statistics(Statistics $statistics) |
|
| 72 | + { |
|
| 73 | + $pokes_total = $statistics->totalPokes(); |
|
| 74 | + |
|
| 75 | + $devices_total = $statistics->totalDevices(); |
|
| 76 | + |
|
| 77 | + $pokes = $statistics->allPokes()->toArray(); |
|
| 78 | + |
|
| 79 | + $network_distribution = $statistics->networkDistribution()->toArray(); |
|
| 80 | + |
|
| 81 | + JavaScript::put(compact('pokes', 'network_distribution')); |
|
| 82 | + |
|
| 83 | + return view('statistics')->with(compact('pokes_total', 'devices_total')); |
|
| 84 | + } |
|
| 85 | 85 | } |
@@ -6,28 +6,28 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Kernel extends HttpKernel |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * The application's global HTTP middleware stack. |
|
| 11 | - * |
|
| 12 | - * @var array |
|
| 13 | - */ |
|
| 14 | - protected $middleware = [ |
|
| 15 | - 'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode', |
|
| 16 | - 'Illuminate\Cookie\Middleware\EncryptCookies', |
|
| 17 | - 'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse', |
|
| 18 | - 'Illuminate\Session\Middleware\StartSession', |
|
| 19 | - 'Illuminate\View\Middleware\ShareErrorsFromSession', |
|
| 20 | - 'PiFinder\Http\Middleware\VerifyCsrfToken', |
|
| 21 | - ]; |
|
| 9 | + /** |
|
| 10 | + * The application's global HTTP middleware stack. |
|
| 11 | + * |
|
| 12 | + * @var array |
|
| 13 | + */ |
|
| 14 | + protected $middleware = [ |
|
| 15 | + 'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode', |
|
| 16 | + 'Illuminate\Cookie\Middleware\EncryptCookies', |
|
| 17 | + 'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse', |
|
| 18 | + 'Illuminate\Session\Middleware\StartSession', |
|
| 19 | + 'Illuminate\View\Middleware\ShareErrorsFromSession', |
|
| 20 | + 'PiFinder\Http\Middleware\VerifyCsrfToken', |
|
| 21 | + ]; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * The application's route middleware. |
|
| 25 | - * |
|
| 26 | - * @var array |
|
| 27 | - */ |
|
| 28 | - protected $routeMiddleware = [ |
|
| 29 | - 'auth' => 'PiFinder\Http\Middleware\Authenticate', |
|
| 30 | - 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', |
|
| 31 | - 'guest' => 'PiFinder\Http\Middleware\RedirectIfAuthenticated', |
|
| 32 | - ]; |
|
| 23 | + /** |
|
| 24 | + * The application's route middleware. |
|
| 25 | + * |
|
| 26 | + * @var array |
|
| 27 | + */ |
|
| 28 | + protected $routeMiddleware = [ |
|
| 29 | + 'auth' => 'PiFinder\Http\Middleware\Authenticate', |
|
| 30 | + 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', |
|
| 31 | + 'guest' => 'PiFinder\Http\Middleware\RedirectIfAuthenticated', |
|
| 32 | + ]; |
|
| 33 | 33 | } |
@@ -7,41 +7,41 @@ |
||
| 7 | 7 | |
| 8 | 8 | class Authenticate |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * The Guard implementation. |
|
| 12 | - * |
|
| 13 | - * @var Guard |
|
| 14 | - */ |
|
| 15 | - protected $auth; |
|
| 10 | + /** |
|
| 11 | + * The Guard implementation. |
|
| 12 | + * |
|
| 13 | + * @var Guard |
|
| 14 | + */ |
|
| 15 | + protected $auth; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Create a new filter instance. |
|
| 19 | - * |
|
| 20 | - * @param Guard $auth |
|
| 21 | - */ |
|
| 22 | - public function __construct(Guard $auth) |
|
| 23 | - { |
|
| 24 | - $this->auth = $auth; |
|
| 25 | - } |
|
| 17 | + /** |
|
| 18 | + * Create a new filter instance. |
|
| 19 | + * |
|
| 20 | + * @param Guard $auth |
|
| 21 | + */ |
|
| 22 | + public function __construct(Guard $auth) |
|
| 23 | + { |
|
| 24 | + $this->auth = $auth; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Handle an incoming request. |
|
| 29 | - * |
|
| 30 | - * @param \Illuminate\Http\Request $request |
|
| 31 | - * @param \Closure $next |
|
| 32 | - * |
|
| 33 | - * @return mixed |
|
| 34 | - */ |
|
| 35 | - public function handle($request, Closure $next) |
|
| 36 | - { |
|
| 37 | - if ($this->auth->guest()) { |
|
| 38 | - if ($request->ajax()) { |
|
| 39 | - return response('Unauthorized.', 401); |
|
| 40 | - } else { |
|
| 41 | - return redirect()->guest('auth/login'); |
|
| 42 | - } |
|
| 43 | - } |
|
| 27 | + /** |
|
| 28 | + * Handle an incoming request. |
|
| 29 | + * |
|
| 30 | + * @param \Illuminate\Http\Request $request |
|
| 31 | + * @param \Closure $next |
|
| 32 | + * |
|
| 33 | + * @return mixed |
|
| 34 | + */ |
|
| 35 | + public function handle($request, Closure $next) |
|
| 36 | + { |
|
| 37 | + if ($this->auth->guest()) { |
|
| 38 | + if ($request->ajax()) { |
|
| 39 | + return response('Unauthorized.', 401); |
|
| 40 | + } else { |
|
| 41 | + return redirect()->guest('auth/login'); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - return $next($request); |
|
| 46 | - } |
|
| 45 | + return $next($request); |
|
| 46 | + } |
|
| 47 | 47 | } |
@@ -8,37 +8,37 @@ |
||
| 8 | 8 | |
| 9 | 9 | class RedirectIfAuthenticated |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * The Guard implementation. |
|
| 13 | - * |
|
| 14 | - * @var Guard |
|
| 15 | - */ |
|
| 16 | - protected $auth; |
|
| 11 | + /** |
|
| 12 | + * The Guard implementation. |
|
| 13 | + * |
|
| 14 | + * @var Guard |
|
| 15 | + */ |
|
| 16 | + protected $auth; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Create a new filter instance. |
|
| 20 | - * |
|
| 21 | - * @param Guard $auth |
|
| 22 | - */ |
|
| 23 | - public function __construct(Guard $auth) |
|
| 24 | - { |
|
| 25 | - $this->auth = $auth; |
|
| 26 | - } |
|
| 18 | + /** |
|
| 19 | + * Create a new filter instance. |
|
| 20 | + * |
|
| 21 | + * @param Guard $auth |
|
| 22 | + */ |
|
| 23 | + public function __construct(Guard $auth) |
|
| 24 | + { |
|
| 25 | + $this->auth = $auth; |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Handle an incoming request. |
|
| 30 | - * |
|
| 31 | - * @param \Illuminate\Http\Request $request |
|
| 32 | - * @param \Closure $next |
|
| 33 | - * |
|
| 34 | - * @return mixed |
|
| 35 | - */ |
|
| 36 | - public function handle($request, Closure $next) |
|
| 37 | - { |
|
| 38 | - if ($this->auth->check()) { |
|
| 39 | - return new RedirectResponse(url('/home')); |
|
| 40 | - } |
|
| 28 | + /** |
|
| 29 | + * Handle an incoming request. |
|
| 30 | + * |
|
| 31 | + * @param \Illuminate\Http\Request $request |
|
| 32 | + * @param \Closure $next |
|
| 33 | + * |
|
| 34 | + * @return mixed |
|
| 35 | + */ |
|
| 36 | + public function handle($request, Closure $next) |
|
| 37 | + { |
|
| 38 | + if ($this->auth->check()) { |
|
| 39 | + return new RedirectResponse(url('/home')); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - return $next($request); |
|
| 43 | - } |
|
| 42 | + return $next($request); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -7,21 +7,21 @@ |
||
| 7 | 7 | |
| 8 | 8 | class VerifyCsrfToken extends BaseVerifier |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * Handle an incoming request. |
|
| 12 | - * |
|
| 13 | - * @param \Illuminate\Http\Request $request |
|
| 14 | - * @param \Closure $next |
|
| 15 | - * |
|
| 16 | - * @return mixed |
|
| 17 | - */ |
|
| 18 | - public function handle($request, Closure $next) |
|
| 19 | - { |
|
| 20 | - // Do not perform CSRF checks for API requests |
|
| 21 | - if (preg_match('#^/api#', $request->path()) !== false) { |
|
| 22 | - return $next($request); |
|
| 23 | - } |
|
| 10 | + /** |
|
| 11 | + * Handle an incoming request. |
|
| 12 | + * |
|
| 13 | + * @param \Illuminate\Http\Request $request |
|
| 14 | + * @param \Closure $next |
|
| 15 | + * |
|
| 16 | + * @return mixed |
|
| 17 | + */ |
|
| 18 | + public function handle($request, Closure $next) |
|
| 19 | + { |
|
| 20 | + // Do not perform CSRF checks for API requests |
|
| 21 | + if (preg_match('#^/api#', $request->path()) !== false) { |
|
| 22 | + return $next($request); |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - return parent::handle($request, $next); |
|
| 26 | - } |
|
| 25 | + return parent::handle($request, $next); |
|
| 26 | + } |
|
| 27 | 27 | } |