Apply fixes from StyleCI

This commit is contained in:
Nabeel Shahzad
2018-08-26 16:40:04 +00:00
committed by StyleCI Bot
parent 20f46adbc4
commit 9596d88b48
407 changed files with 4032 additions and 3286 deletions
+12 -13
View File
@@ -2,7 +2,6 @@
/**
* Admin Routes
*/
Route::group([
'namespace' => 'Admin', 'prefix' => 'admin', 'as' => 'admin.',
'middleware' => ['role:admin'],
@@ -15,33 +14,33 @@ Route::group([
Route::match(['get', 'post', 'put', 'delete'], 'airports/{id}/expenses', 'AirportController@expenses');
Route::resource('airports', 'AirportController');
# Awards
// Awards
Route::resource('awards', 'AwardController');
# aircraft and fare associations
// aircraft and fare associations
Route::get('aircraft/export', 'AircraftController@export')->name('aircraft.export');
Route::match(['get', 'post'], 'aircraft/import', 'AircraftController@import')->name('aircraft.import');
Route::match(['get', 'post', 'put', 'delete'], 'aircraft/{id}/expenses', 'AircraftController@expenses');
Route::resource('aircraft', 'AircraftController');
# expenses
// expenses
Route::get('expenses/export', 'ExpenseController@export')->name('expenses.export');
Route::match(['get', 'post'], 'expenses/import', 'ExpenseController@import')->name('expenses.import');
Route::resource('expenses', 'ExpenseController');
# fares
// fares
Route::get('fares/export', 'FareController@export')->name('fares.export');
Route::match(['get', 'post'], 'fares/import', 'FareController@import')->name('fares.import');
Route::resource('fares', 'FareController');
# files
// files
Route::post('files', 'FileController@store')->name('files.store');
Route::delete('files/{id}', 'FileController@destroy')->name('files.delete');
# finances
// finances
Route::resource('finances', 'FinanceController');
# flights and aircraft associations
// flights and aircraft associations
Route::get('flights/export', 'FlightController@export')->name('flights.export');
Route::match(['get', 'post'], 'flights/import', 'FlightController@import')->name('flights.import');
Route::match(['get', 'post', 'put', 'delete'], 'flights/{id}/fares', 'FlightController@fares');
@@ -51,7 +50,7 @@ Route::group([
Route::resource('flightfields', 'FlightFieldController');
# pirep related routes
// pirep related routes
Route::get('pireps/fares', 'PirepController@fares');
Route::get('pireps/pending', 'PirepController@pending');
Route::resource('pireps', 'PirepController');
@@ -60,15 +59,15 @@ Route::group([
Route::resource('pirepfields', 'PirepFieldController');
# rankings
// rankings
Route::resource('ranks', 'RankController');
Route::match(['get', 'post', 'put', 'delete'], 'ranks/{id}/subfleets', 'RankController@subfleets');
# settings
// settings
Route::match(['get'], 'settings', 'SettingsController@index');
Route::match(['post', 'put'], 'settings', 'SettingsController@update')->name('settings.update');
# subfleet
// subfleet
Route::get('subfleets/export', 'SubfleetController@export')->name('subfleets.export');
Route::match(['get', 'post'], 'subfleets/import', 'SubfleetController@import')->name('subfleets.import');
Route::match(['get', 'post', 'put', 'delete'], 'subfleets/{id}/expenses', 'SubfleetController@expenses');
@@ -80,7 +79,7 @@ Route::group([
Route::get('users/{id}/regen_apikey',
'UserController@regen_apikey')->name('users.regen_apikey');
# defaults
// defaults
Route::get('', ['uses' => 'DashboardController@index']);
Route::get('/', ['uses' => 'DashboardController@index']);
+2 -3
View File
@@ -14,7 +14,7 @@ Route::group([], function () {
Route::get('version', 'StatusController@status');
});
/**
/*
* these need to be authenticated with a user's API key
*/
Route::group(['middleware' => ['api.auth']], function () {
@@ -48,7 +48,6 @@ Route::group(['middleware' => ['api.auth']], function () {
Route::get('pireps/{pirep_id}/fields', 'PirepController@fields_get');
Route::post('pireps/{pirep_id}/fields', 'PirepController@fields_post');
Route::get('pireps/{pirep_id}/finances', 'PirepController@finances_get');
Route::post('pireps/{pirep_id}/finances/recalculate', 'PirepController@finances_recalculate');
@@ -67,7 +66,7 @@ Route::group(['middleware' => ['api.auth']], function () {
Route::get('settings', 'SettingsController@index');
# This is the info of the user whose token is in use
// This is the info of the user whose token is in use
Route::get('user', 'UserController@index');
Route::get('user/fleet', 'UserController@fleet');
Route::get('user/pireps', 'UserController@pireps');
+2 -2
View File
@@ -4,7 +4,7 @@
* User doesn't need to be logged in for these
*/
Route::group([
'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.'
'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.',
], function () {
Route::get('/', 'HomeController@index')->name('home');
Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public');
@@ -16,7 +16,7 @@ Route::group([
Route::get('livemap', 'AcarsController@index')->name('livemap.index');
});
/**
/*
* These are only visible to a logged in user
*/
Route::group([