7.0.0-beta3 Release (#541)

* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
2020-02-08 13:29:34 -05:00
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
--- a/app/Http/Routes/admin.php
+++ b/app/Http/Routes/admin.php
@@ -2,101 +2,214 @@
 /**
 * Admin Routes
 */
-Route::group([
-    'namespace'  => 'Admin', 'prefix' => 'admin', 'as' => 'admin.',
-    'middleware' => ['ability:admin,admin-access'],
-], static function () {
-    // CRUD for airlines
-    Route::resource('airlines', 'AirlinesController');
+use Illuminate\Support\Facades\Route;

-    // CRUD for roles
-    Route::resource('roles', 'RolesController');
+Route::group(
+    [
+        'namespace'  => 'Admin',
+        'prefix'     => 'admin',
+        'as'         => 'admin.',
+        'middleware' => ['auth', 'ability:admin,admin-access'],
+    ],
+    static function () {
+        // CRUD for airlines
+        Route::resource('airlines', 'AirlinesController')->middleware('ability:admin,airlines');

-    Route::get('airports/export', 'AirportController@export')->name('airports.export');
-    Route::match(['get', 'post', 'put'], 'airports/fuel', 'AirportController@fuel');
-    Route::match(['get', 'post'], 'airports/import', 'AirportController@import')->name('airports.import');
-    Route::match(['get', 'post', 'put', 'delete'], 'airports/{id}/expenses', 'AirportController@expenses');
-    Route::resource('airports', 'AirportController');
+        // CRUD for roles
+        Route::resource('roles', 'RolesController')->middleware('role:admin');

-    // Awards
-    Route::resource('awards', 'AwardController');
+        Route::get('airports/export', 'AirportController@export')
+            ->name('airports.export')
+            ->middleware('ability:admin,airports');

-    // 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');
+        Route::match(['get', 'post', 'put'], 'airports/fuel', 'AirportController@fuel')
+            ->middleware('ability:admin,airports');

-    // 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');
+        Route::match(['get', 'post'], 'airports/import', 'AirportController@import')
+            ->name('airports.import')->middleware('ability:admin,airports');

-    // 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');
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'airports/{id}/expenses',
+            'AirportController@expenses'
+        )->middleware('ability:admin,airports');

-    // files
-    Route::post('files', 'FileController@store')->name('files.store');
-    Route::delete('files/{id}', 'FileController@destroy')->name('files.delete');
+        Route::resource('airports', 'AirportController')->middleware('ability:admin,airports');

-    // finances
-    Route::resource('finances', 'FinanceController');
+        // Awards
+        Route::resource('awards', 'AwardController')->middleware('ability:admin,awards');

-    // 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');
-    Route::match(['get', 'post', 'put', 'delete'], 'flights/{id}/fields', 'FlightController@field_values');
-    Route::match(['get', 'post', 'put', 'delete'], 'flights/{id}/subfleets', 'FlightController@subfleets');
-    Route::resource('flights', 'FlightController');
+        // aircraft and fare associations
+        Route::get('aircraft/export', 'AircraftController@export')
+            ->name('aircraft.export')
+            ->middleware('ability:admin,aircraft');

-    Route::resource('flightfields', 'FlightFieldController');
+        Route::match(['get', 'post'], 'aircraft/import', 'AircraftController@import')
+            ->name('aircraft.import')->middleware('ability:admin,aircraft');

-    // pirep related routes
-    Route::get('pireps/fares', 'PirepController@fares');
-    Route::get('pireps/pending', 'PirepController@pending');
-    Route::resource('pireps', 'PirepController');
-    Route::match(['get', 'post', 'delete'], 'pireps/{id}/comments', 'PirepController@comments');
-    Route::match(['post', 'put'], 'pireps/{id}/status', 'PirepController@status')->name('pirep.status');
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'aircraft/{id}/expenses',
+            'AircraftController@expenses'
+        )->middleware('ability:admin,aircraft');

-    Route::resource('pirepfields', 'PirepFieldController');
+        Route::resource('aircraft', 'AircraftController')->middleware('ability:admin,aircraft');

-    // rankings
-    Route::resource('ranks', 'RankController');
-    Route::match(['get', 'post', 'put', 'delete'], 'ranks/{id}/subfleets', 'RankController@subfleets');
+        // expenses
+        Route::get('expenses/export', 'ExpenseController@export')
+            ->name('expenses.export')
+            ->middleware('ability:admin,finances');

-    // settings
-    Route::match(['get'], 'settings', 'SettingsController@index');
-    Route::match(['post', 'put'], 'settings', 'SettingsController@update')->name('settings.update');
+        Route::match(['get', 'post'], 'expenses/import', 'ExpenseController@import')
+            ->name('expenses.import')
+            ->middleware('ability:admin,finances');

-    // maintenance
-    Route::match(['get'], 'maintenance', 'MaintenanceController@index')->name('maintenance.index');
-    Route::match(['post'], 'maintenance', 'MaintenanceController@cache')->name('maintenance.cache');
+        Route::resource('expenses', 'ExpenseController')->middleware('ability:admin,finances');

-    // 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');
-    Route::match(['get', 'post', 'put', 'delete'], 'subfleets/{id}/fares', 'SubfleetController@fares');
-    Route::match(['get', 'post', 'put', 'delete'], 'subfleets/{id}/ranks', 'SubfleetController@ranks');
-    Route::resource('subfleets', 'SubfleetController');
+        // fares
+        Route::get('fares/export', 'FareController@export')
+            ->name('fares.export')
+            ->middleware('ability:admin,finances');

-    Route::resource('users', 'UserController');
-    Route::get(
-        'users/{id}/regen_apikey',
-        'UserController@regen_apikey'
-    )->name('users.regen_apikey');
+        Route::match(['get', 'post'], 'fares/import', 'FareController@import')
+            ->name('fares.import')->middleware('ability:admin,finances');

-    // defaults
-    Route::get('', ['uses' => 'DashboardController@index'])->middleware('update_pending');
-    Route::get('/', ['uses' => 'DashboardController@index'])->middleware('update_pending');
+        Route::resource('fares', 'FareController')->middleware('ability:admin,finances');

-    Route::get('dashboard', ['uses' => 'DashboardController@index', 'name' => 'dashboard']);
-    Route::match(
-        ['get', 'post', 'delete'],
-        'dashboard/news',
-        ['uses' => 'DashboardController@news']
-    )->name('dashboard.news');
-});
+        // files
+        Route::post('files', 'FileController@store')
+            ->name('files.store')
+            ->middleware('ability:admin,files');
+
+        Route::delete('files/{id}', 'FileController@destroy')
+            ->name('files.delete')
+            ->middleware('ability:admin,files');
+
+        // finances
+        Route::resource('finances', 'FinanceController')->middleware('ability:admin,finances');
+
+        // flights and aircraft associations
+        Route::get('flights/export', 'FlightController@export')
+            ->name('flights.export')
+            ->middleware('ability:admin,flights');
+
+        Route::match(['get', 'post'], 'flights/import', 'FlightController@import')
+            ->name('flights.import')
+            ->middleware('ability:admin,flights');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'flights/{id}/fares',
+            'FlightController@fares'
+        )->middleware('ability:admin,flights');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'flights/{id}/fields',
+            'FlightController@field_values'
+        )->middleware('ability:admin,flights');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'flights/{id}/subfleets',
+            'FlightController@subfleets'
+        )->middleware('ability:admin,flights');
+
+        Route::resource('flights', 'FlightController')
+            ->middleware('ability:admin,flights');
+
+        Route::resource('flightfields', 'FlightFieldController')
+            ->middleware('ability:admin,flights');
+
+        // pirep related routes
+        Route::get('pireps/fares', 'PirepController@fares')->middleware('ability:admin,pireps');
+        Route::get('pireps/pending', 'PirepController@pending')->middleware('ability:admin,pireps');
+        Route::resource('pireps', 'PirepController')->middleware('ability:admin,pireps');
+
+        Route::match(['get', 'post', 'delete'], 'pireps/{id}/comments', 'PirepController@comments')
+            ->middleware('ability:admin,pireps');
+
+        Route::match(['post', 'put'], 'pireps/{id}/status', 'PirepController@status')
+            ->name('pirep.status')
+            ->middleware('ability:admin,pireps');
+
+        Route::resource('pirepfields', 'PirepFieldController')
+            ->middleware('ability:admin,pireps');
+
+        // rankings
+        Route::resource('ranks', 'RankController')->middleware('ability:admin,ranks');
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'ranks/{id}/subfleets',
+            'RankController@subfleets'
+        )->middleware('ability:admin,ranks');
+
+        // settings
+        Route::match(['get'], 'settings', 'SettingsController@index')
+            ->middleware('ability:admin,settings');
+
+        Route::match(['post', 'put'], 'settings', 'SettingsController@update')
+            ->name('settings.update')
+            ->middleware('ability:admin,settings');
+
+        // maintenance
+        Route::match(['get'], 'maintenance', 'MaintenanceController@index')
+            ->name('maintenance.index')
+            ->middleware('ability:admin,maintenance');
+
+        Route::match(['post'], 'maintenance', 'MaintenanceController@cache')
+            ->name('maintenance.cache')
+            ->middleware('ability:admin,maintenance');
+
+        // subfleet
+        Route::get('subfleets/export', 'SubfleetController@export')
+            ->name('subfleets.export')
+            ->middleware('ability:admin,fleet');
+
+        Route::match(['get', 'post'], 'subfleets/import', 'SubfleetController@import')
+            ->name('subfleets.import')
+            ->middleware('ability:admin,fleet');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'subfleets/{id}/expenses',
+            'SubfleetController@expenses'
+        )->middleware('ability:admin,fleet');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'subfleets/{id}/fares',
+            'SubfleetController@fares'
+        )->middleware('ability:admin,fleet');
+
+        Route::match(
+            ['get', 'post', 'put', 'delete'],
+            'subfleets/{id}/ranks',
+            'SubfleetController@ranks'
+        )->middleware('ability:admin,fleet');
+
+        Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');
+
+        Route::resource('users', 'UserController')->middleware('ability:admin,users');
+        Route::get(
+            'users/{id}/regen_apikey',
+            'UserController@regen_apikey'
+        )->name('users.regen_apikey')->middleware('ability:admin,users');
+
+        // defaults
+        Route::get('', ['uses' => 'DashboardController@index'])
+            ->middleware('update_pending', 'ability:admin,admin-access');
+
+        Route::get('/', ['uses' => 'DashboardController@index'])
+            ->middleware('update_pending', 'ability:admin,admin-access');
+
+        Route::get('dashboard', ['uses' => 'DashboardController@index', 'name' => 'dashboard'])
+            ->middleware('update_pending', 'ability:admin,admin-access');
+
+        Route::match(
+            ['get', 'post', 'delete'],
+            'dashboard/news',
+            ['uses' => 'DashboardController@news']
+        )->name('dashboard.news')->middleware('update_pending', 'ability:admin,admin-access');
+    }
+);