FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.0.0-beta3 Release (#541)

Browse Source 
* 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)
This commit is contained in:
Nabeel S
2020-02-08 13:29:34 -05:00
committed by GitHub
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -14,10 +14,10 @@ use App\Repositories\AircraftRepository;
use App\Repositories\AirportRepository;
use App\Services\ExportService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Storage;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
/**
* Class AircraftController

24
app/Http/Controllers/Admin/AirportController.php
View File

@@ -13,15 +13,11 @@ use App\Repositories\Criteria\WhereCriteria;
use App\Services\ExportService;
use App\Services\ImportService;
use App\Support\Timezonelist;
use Flash;
use Illuminate\Http\Request;
use Log;
use Response;
use Storage;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
/**
* Class AirportController
*/
class AirportController extends Controller
{
private $airportRepo;
@@ -46,7 +42,7 @@ class AirportController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -68,7 +64,7 @@ class AirportController extends Controller
/**
* Show the form for creating a new Airport.
*
* @return Response
* @return mixed
*/
public function create()
{
@@ -84,7 +80,7 @@ class AirportController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreateAirportRequest $request)
{
@@ -102,7 +98,7 @@ class AirportController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -123,7 +119,7 @@ class AirportController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -148,7 +144,7 @@ class AirportController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateAirportRequest $request)
{
@@ -173,7 +169,7 @@ class AirportController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

17
app/Http/Controllers/Admin/AwardController.php
View File

@@ -7,10 +7,9 @@ use App\Http\Requests\CreateAwardRequest;
use App\Http\Requests\UpdateAwardRequest;
use App\Repositories\AwardRepository;
use App\Services\AwardService;
use Flash;
use Illuminate\Http\Request;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class AwardController extends Controller
{
@@ -62,7 +61,7 @@ class AwardController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -76,8 +75,6 @@ class AwardController extends Controller
/**
* Show the form for creating a new Fare.
*
* @return Response
*/
public function create()
{
@@ -96,7 +93,7 @@ class AwardController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreateAwardRequest $request)
{
@@ -112,7 +109,7 @@ class AwardController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -133,7 +130,7 @@ class AwardController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -161,7 +158,7 @@ class AwardController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateAwardRequest $request)
{
@@ -183,7 +180,7 @@ class AwardController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

23
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -7,6 +7,8 @@ use App\Repositories\KvpRepository;
use App\Repositories\NewsRepository;
use App\Repositories\PirepRepository;
use App\Repositories\UserRepository;
use App\Services\CronService;
use App\Services\NewsService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
@@ -14,27 +16,35 @@ use Laracasts\Flash\Flash;
class DashboardController extends Controller
{
private $cronSvc;
private $kvpRepo;
private $newsRepo;
private $newsSvc;
private $pirepRepo;
private $userRepo;
/**
* DashboardController constructor.
*
* @param CronService $cronSvc
* @param KvpRepository $kvpRepo
* @param NewsRepository $newsRepo
* @param NewsService $newsSvc
* @param PirepRepository $pirepRepo
* @param UserRepository $userRepo
*/
public function __construct(
CronService $cronSvc,
KvpRepository $kvpRepo,
NewsRepository $newsRepo,
NewsService $newsSvc,
PirepRepository $pirepRepo,
UserRepository $userRepo
) {
$this->cronSvc = $cronSvc;
$this->kvpRepo = $kvpRepo;
$this->newsRepo = $newsRepo;
$this->newsSvc = $newsSvc;
$this->pirepRepo = $pirepRepo;
$this->userRepo = $userRepo;
}
@@ -74,9 +84,10 @@ class DashboardController extends Controller
$this->checkNewVersion();
return view('admin.dashboard.index', [
'news' => $this->newsRepo->getLatest(),
'pending_pireps' => $this->pirepRepo->getPendingCount(),
'pending_users' => $this->userRepo->getPendingCount(),
'news' => $this->newsRepo->getLatest(),
'pending_pireps' => $this->pirepRepo->getPendingCount(),
'pending_users' => $this->userRepo->getPendingCount(),
'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
]);
}
@@ -93,10 +104,10 @@ class DashboardController extends Controller
$attrs = $request->post();
$attrs['user_id'] = Auth::user()->id;
$this->newsRepo->create($attrs);
$this->newsSvc->addNews($attrs);
} elseif ($request->isMethod('delete')) {
$news_id = $request->input('news_id');
$this->newsRepo->delete($news_id);
$id = $request->input('news_id');
$this->newsSvc->deleteNews($id);
}
return view('admin.dashboard.news', [

16
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -10,16 +10,12 @@ use App\Repositories\AirlineRepository;
use App\Repositories\ExpenseRepository;
use App\Services\ExportService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
use Storage;
/**
* Class ExpenseController
*/
class ExpenseController extends Controller
{
private $airlineRepo;
@@ -122,7 +118,7 @@ class ExpenseController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -149,7 +145,7 @@ class ExpenseController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, Request $request)
{
@@ -173,7 +169,7 @@ class ExpenseController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

24
app/Http/Controllers/Admin/FareController.php
View File

@@ -9,16 +9,12 @@ use App\Http\Requests\UpdateFareRequest;
use App\Repositories\FareRepository;
use App\Services\ExportService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
use Storage;
/**
* Class FareController
*/
class FareController extends Controller
{
private $fareRepo;
@@ -45,7 +41,7 @@ class FareController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -58,8 +54,6 @@ class FareController extends Controller
/**
* Show the form for creating a new Fare.
*
* @return Response
*/
public function create()
{
@@ -73,7 +67,7 @@ class FareController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreateFareRequest $request)
{
@@ -89,7 +83,7 @@ class FareController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -107,7 +101,7 @@ class FareController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -128,7 +122,7 @@ class FareController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateFareRequest $request)
{
@@ -149,7 +143,7 @@ class FareController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

4
app/Http/Controllers/Admin/FileController.php
View File

@@ -8,12 +8,8 @@ use App\Services\FileService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Laracasts\Flash\Flash;
/**
* Class FileController
*/
class FileController extends Controller
{
private $fileSvc;

20
app/Http/Controllers/Admin/FinanceController.php
View File

@@ -10,9 +10,6 @@ use App\Services\FinanceService;
use App\Support\Dates;
use Illuminate\Http\Request;
/**
* Class FinanceController
*/
class FinanceController extends Controller
{
private $airlineRepo;
@@ -43,25 +40,14 @@ class FinanceController extends Controller
public function index(Request $request)
{
$month = $request->query('month', date('Y-m'));
$between = Dates::getMonthBoundary($month);
$transaction_groups = $this->financeSvc->getAllAirlineTransactionsBetween($month);
$first_journal = Journal::where(['type' => JournalType::AIRLINE])
$first_journal = Journal::select(['created_at'])
->where(['type' => JournalType::AIRLINE])
->orderBy('created_at', 'asc')
->limit(1)
->first();
$transaction_groups = [];
$airlines = $this->airlineRepo->orderBy('icao')->all();
// group by the airline
foreach ($airlines as $airline) {
$transaction_groups[] = $this->financeSvc->getAirlineTransactionsBetween(
$airline,
$between[0],
$between[1]
);
}
return view('admin.finances.index', [
'current_month' => $month,
'months_list' => Dates::getMonthsList($first_journal->created_at),

1
app/Http/Controllers/Admin/FlightController.php
View File

@@ -23,6 +23,7 @@ use App\Services\ImportService;
use App\Support\Units\Time;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
/**

20
app/Http/Controllers/Admin/FlightFieldController.php
View File

@@ -4,14 +4,10 @@ namespace App\Http\Controllers\Admin;
use App\Contracts\Controller;
use App\Repositories\FlightFieldRepository;
use Flash;
use Illuminate\Http\Request;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class FlightFieldController
*/
class FlightFieldController extends Controller
{
private $flightFieldRepo;
@@ -34,7 +30,7 @@ class FlightFieldController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -48,8 +44,6 @@ class FlightFieldController extends Controller
/**
* Show the form for creating a new FlightField.
*
* @return Response
*/
public function create()
{
@@ -63,7 +57,7 @@ class FlightFieldController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(Request $request)
{
@@ -81,7 +75,7 @@ class FlightFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -102,7 +96,7 @@ class FlightFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -126,7 +120,7 @@ class FlightFieldController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return mixed
*/
public function update($id, Request $request)
{
@@ -150,7 +144,7 @@ class FlightFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

10
app/Http/Controllers/Admin/MaintenanceController.php
View File

@@ -19,15 +19,8 @@ class MaintenanceController extends Controller
public function index()
{
// Generate the cron path. Replace php-fpm with just php
$cron_path = [
'* * * * *',
$this->cronSvc->getCronPath(),
'>> /dev/null 2>&1',
];
return view('admin.maintenance.index', [
'cron_path' => implode(' ', $cron_path),
'cron_path' => $this->cronSvc->getCronExecString(),
'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
]);
}
@@ -49,6 +42,7 @@ class MaintenanceController extends Controller
$calls[] = 'config:cache';
$calls[] = 'cache:clear';
$calls[] = 'route:cache';
$calls[] = 'clear-compiled';
}
// If we want to clear only the views but keep everything else

22
app/Http/Controllers/Admin/PirepController.php
View File

@@ -21,16 +21,12 @@ use App\Services\FareService;
use App\Services\PirepService;
use App\Services\UserService;
use App\Support\Units\Time;
use Flash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Log;
use Illuminate\Support\Facades\Log;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class PirepController
*/
class PirepController extends Controller
{
private $airportRepo;
@@ -170,7 +166,7 @@ class PirepController extends Controller
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function fares(Request $request)
{
@@ -192,7 +188,7 @@ class PirepController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function index(Request $request)
{
@@ -218,7 +214,7 @@ class PirepController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function pending(Request $request)
{
@@ -238,7 +234,7 @@ class PirepController extends Controller
/**
* Show the form for creating a new Pirep.
*
* @return Response
* @return mixed
*/
public function create()
{
@@ -279,7 +275,7 @@ class PirepController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -302,7 +298,7 @@ class PirepController extends Controller
*
* @throws \InvalidArgumentException
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -388,7 +384,7 @@ class PirepController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

18
app/Http/Controllers/Admin/PirepFieldController.php
View File

@@ -6,14 +6,10 @@ use App\Contracts\Controller;
use App\Http\Requests\CreatePirepFieldRequest;
use App\Http\Requests\UpdatePirepFieldRequest;
use App\Repositories\PirepFieldRepository;
use Flash;
use Illuminate\Http\Request;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class PirepFieldController
*/
class PirepFieldController extends Controller
{
private $pirepFieldRepo;
@@ -36,7 +32,7 @@ class PirepFieldController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -51,7 +47,7 @@ class PirepFieldController extends Controller
/**
* Show the form for creating a new PirepField.
*
* @return Response
* @return mixed
*/
public function create()
{
@@ -65,7 +61,7 @@ class PirepFieldController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreatePirepFieldRequest $request)
{
@@ -85,7 +81,7 @@ class PirepFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -107,7 +103,7 @@ class PirepFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -158,7 +154,7 @@ class PirepFieldController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

20
app/Http/Controllers/Admin/RankController.php
View File

@@ -9,14 +9,10 @@ use App\Repositories\RankRepository;
use App\Repositories\SubfleetRepository;
use App\Services\FleetService;
use Cache;
use Flash;
use Illuminate\Http\Request;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class RankController
*/
class RankController extends Controller
{
private $fleetSvc;
@@ -67,7 +63,7 @@ class RankController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return mixed
*/
public function index(Request $request)
{
@@ -82,7 +78,7 @@ class RankController extends Controller
/**
* Show the form for creating a new Ranking.
*
* @return Response
* @return mixed
*/
public function create()
{
@@ -96,7 +92,7 @@ class RankController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreateRankRequest $request)
{
@@ -115,7 +111,7 @@ class RankController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -137,7 +133,7 @@ class RankController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -165,7 +161,7 @@ class RankController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateRankRequest $request)
{
@@ -190,7 +186,7 @@ class RankController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

30
app/Http/Controllers/Admin/RolesController.php
View File

@@ -7,29 +7,33 @@ use App\Http\Requests\CreateRoleRequest;
use App\Http\Requests\UpdateRoleRequest;
use App\Repositories\PermissionsRepository;
use App\Repositories\RoleRepository;
use Flash;
use App\Services\RoleService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class AirlinesController
*/
class RolesController extends Controller
{
private $permsRepo;
private $rolesRepo;
private $roleSvc;
/**
* AirlinesController constructor.
*
* @param PermissionsRepository $permsRepo
* @param RoleRepository $rolesRepo
* @param $roleSvc
*/
public function __construct(PermissionsRepository $permsRepo, RoleRepository $rolesRepo)
{
public function __construct(
PermissionsRepository $permsRepo,
RoleRepository $rolesRepo,
RoleService $roleSvc
) {
$this->permsRepo = $permsRepo;
$this->rolesRepo = $rolesRepo;
$this->roleSvc = $roleSvc;
}
/**
@@ -132,8 +136,6 @@ class RolesController extends Controller
* @param int $id
* @param UpdateRoleRequest $request
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateRoleRequest $request)
@@ -145,14 +147,8 @@ class RolesController extends Controller
return redirect(route('admin.roles.index'));
}
$this->rolesRepo->update($request->all(), $id);
// Update the permissions, filter out null/invalid values
$perms = collect($request->permissions)->filter(static function ($v, $k) {
return $v;
});
$role->permissions()->sync($perms);
$this->roleSvc->updateRole($role, $request->all());
$this->roleSvc->setPermissionsForRole($role, $request->permissions);
Flash::success('Roles updated successfully.');
return redirect(route('admin.roles.index'));

3
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -8,9 +8,6 @@ use Igaster\LaravelTheme\Facades\Theme;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/**
* Class SettingsController
*/
class SettingsController extends Controller
{
/**

40
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -18,16 +18,12 @@ use App\Services\ExportService;
use App\Services\FareService;
use App\Services\FleetService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
use Storage;
/**
* Class SubfleetController
*/
class SubfleetController extends Controller
{
private $aircraftRepo;
@@ -115,7 +111,7 @@ class SubfleetController extends Controller
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
@@ -129,8 +125,6 @@ class SubfleetController extends Controller
/**
* Show the form for creating a new Subfleet.
*
* @return Response
*/
public function create()
{
@@ -147,7 +141,7 @@ class SubfleetController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreateSubfleetRequest $request)
{
@@ -163,7 +157,7 @@ class SubfleetController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -186,7 +180,7 @@ class SubfleetController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -217,7 +211,7 @@ class SubfleetController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateSubfleetRequest $request)
{
@@ -239,7 +233,7 @@ class SubfleetController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{
@@ -269,8 +263,6 @@ class SubfleetController extends Controller
*
* @param Request $request
*
* @throws \League\Csv\CannotInsertRecord
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
@@ -291,7 +283,7 @@ class SubfleetController extends Controller
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function import(Request $request)
{
@@ -322,7 +314,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
protected function return_ranks_view(?Subfleet $subfleet)
{
@@ -338,7 +330,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
protected function return_fares_view(?Subfleet $subfleet)
{
@@ -357,7 +349,7 @@ class SubfleetController extends Controller
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function ranks($id, Request $request)
{
@@ -396,7 +388,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
protected function return_expenses_view(?Subfleet $subfleet)
{
@@ -414,7 +406,7 @@ class SubfleetController extends Controller
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function expenses($id, Request $request)
{
@@ -454,7 +446,7 @@ class SubfleetController extends Controller
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function fares($id, Request $request)
{

32
app/Http/Controllers/Admin/UserController.php
View File

@@ -15,17 +15,13 @@ use App\Repositories\PirepRepository;
use App\Repositories\UserRepository;
use App\Services\UserService;
use App\Support\Timezonelist;
use DB;
use Flash;
use Hash;
use Illuminate\Http\Request;
use Log;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Laracasts\Flash\Flash;
use Prettus\Repository\Exceptions\RepositoryException;
use Response;
/**
* Class UserController
*/
class UserController extends Controller
{
private $airlineRepo;
@@ -80,7 +76,7 @@ class UserController extends Controller
/**
* Show the form for creating a new User.
*
* @return Response
* @return mixed
*/
public function create()
{
@@ -106,7 +102,7 @@ class UserController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function store(CreateUserRequest $request)
{
@@ -122,7 +118,7 @@ class UserController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -158,7 +154,7 @@ class UserController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -202,7 +198,7 @@ class UserController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
* @return mixed
*/
public function update($id, UpdateUserRequest $request)
{
@@ -247,9 +243,11 @@ class UserController extends Controller
}
// Delete all of the roles and then re-attach the valid ones
DB::table('role_user')->where('user_id', $id)->delete();
foreach ($request->input('roles') as $key => $value) {
$user->attachRole($value);
if (!empty($request->input('roles'))) {
DB::table('role_user')->where('user_id', $id)->delete();
foreach ($request->input('roles') as $key => $value) {
$user->attachRole($value);
}
}
Flash::success('User updated successfully.');
@@ -262,7 +260,7 @@ class UserController extends Controller
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function destroy($id)
{

31
app/Http/Controllers/Api/FlightController.php
View File

@@ -13,9 +13,6 @@ use Illuminate\Support\Facades\Auth;
use Prettus\Repository\Criteria\RequestCriteria;
use Prettus\Repository\Exceptions\RepositoryException;
/**
* Class FlightController
*/
class FlightController extends Controller
{
private $flightRepo;
@@ -44,32 +41,7 @@ class FlightController extends Controller
*/
public function index(Request $request)
{
/**
* @var $user \App\Models\User
*/
$user = Auth::user();
$where = [
'active' => true,
'visible' => true,
];
if (setting('pilots.restrict_to_company')) {
$where['airline_id'] = $user->airline_id;
}
if (setting('pilots.only_flights_from_current', false)) {
$where['dpt_airport_id'] = $user->curr_airport_id;
}
$flights = $this->flightRepo
->whereOrder($where, 'flight_number', 'asc')
->paginate();
foreach ($flights as $flight) {
$this->flightSvc->filterSubfleets($user, $flight);
}
return FlightResource::collection($flights);
return $this->search($request);
}
/**
@@ -121,6 +93,7 @@ class FlightController extends Controller
return response($e, 503);
}
// TODO: Remove any flights here that a user doesn't have permissions to
foreach ($flights as $flight) {
$this->flightSvc->filterSubfleets(Auth::user(), $flight);
}

5
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -17,9 +17,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
/**
* Class RegisterController
*/
class RegisterController extends Controller
{
use RegistersUsers;
@@ -58,7 +55,7 @@ class RegisterController extends Controller
/**
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return mixed
*/
public function showRegistrationForm()
{

106
app/Http/Controllers/Frontend/FlightController.php
View File

@@ -8,50 +8,68 @@ use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository;
use App\Repositories\Criteria\WhereCriteria;
use App\Repositories\FlightRepository;
use App\Repositories\SubfleetRepository;
use App\Services\GeoService;
use Flash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Log;
use Illuminate\Support\Facades\Log;
use Prettus\Repository\Criteria\RequestCriteria;
use Prettus\Repository\Exceptions\RepositoryException;
/**
* Class FlightController
*/
class FlightController extends Controller
{
private $airlineRepo;
private $airportRepo;
private $flightRepo;
private $subfleetRepo;
private $geoSvc;
/**
* FlightController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param FlightRepository $flightRepo
* @param GeoService $geoSvc
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param FlightRepository $flightRepo
* @param GeoService $geoSvc
* @param SubfleetRepository $subfleetRepo
*/
public function __construct(
AirlineRepository $airlineRepo,
AirportRepository $airportRepo,
FlightRepository $flightRepo,
GeoService $geoSvc
GeoService $geoSvc,
SubfleetRepository $subfleetRepo
) {
$this->airlineRepo = $airlineRepo;
$this->airportRepo = $airportRepo;
$this->flightRepo = $flightRepo;
$this->geoSvc = $geoSvc;
$this->subfleetRepo = $subfleetRepo;
}
/**
* @param Request $request
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
return $this->search($request);
}
/**
* Make a search request using the Repository search
*
* @param Request $request
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return mixed
*/
public function search(Request $request)
{
$where = [
'active' => true,
@@ -67,14 +85,17 @@ class FlightController extends Controller
$where['dpt_airport_id'] = Auth::user()->curr_airport_id;
}
$this->flightRepo->resetCriteria();
try {
$this->flightRepo->searchCriteria($request);
$this->flightRepo->pushCriteria(new WhereCriteria($request, $where));
$this->flightRepo->pushCriteria(new RequestCriteria($request));
} catch (RepositoryException $e) {
Log::emergency($e);
}
$flights = $this->flightRepo
$flights = $this->flightRepo->searchCriteria($request)
->with(['dpt_airport', 'arr_airport', 'airline'])
->orderBy('flight_number', 'asc')
->orderBy('route_leg', 'asc')
@@ -84,10 +105,15 @@ class FlightController extends Controller
->pluck('flight_id')->toArray();
return view('flights.index', [
'airlines' => $this->airlineRepo->selectBoxList(true),
'airports' => $this->airportRepo->selectBoxList(true),
'flights' => $flights,
'saved' => $saved_flights,
'airlines' => $this->airlineRepo->selectBoxList(true),
'airports' => $this->airportRepo->selectBoxList(true),
'flights' => $flights,
'saved' => $saved_flights,
'subfleets' => $this->subfleetRepo->selectBoxList(true),
'flight_number' => $request->input('flight_number'),
'arr_icao' => $request->input('arr_icao'),
'dep_icao' => $request->input('dep_icao'),
'subfleet_id' => $request->input('subfleet_id'),
]);
}
@@ -114,62 +140,12 @@ class FlightController extends Controller
]);
}
/**
* Make a search request using the Repository search
*
* @param Request $request
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function search(Request $request)
{
$where = [
'active' => true,
'visible' => true,
];
if (setting('pilots.restrict_to_company')) {
$where['airline_id'] = Auth::user()->airline_id;
}
// default restrictions on the flights shown. Handle search differently
if (setting('pilots.only_flights_from_current')) {
$where['dpt_airport_id'] = Auth::user()->curr_airport_id;
}
$this->flightRepo->resetCriteria();
try {
$this->flightRepo->pushCriteria(new WhereCriteria($request, $where));
} catch (RepositoryException $e) {
Log::emergency($e);
}
$flights = $this->flightRepo->searchCriteria($request)
->with(['dpt_airport', 'arr_airport', 'airline'])
->orderBy('flight_number', 'asc')
->orderBy('route_leg', 'asc')
->paginate();
$saved_flights = Bid::where('user_id', Auth::id())
->pluck('flight_id')->toArray();
return view('flights.index', [
'airlines' => $this->airlineRepo->selectBoxList(true),
'airports' => $this->airportRepo->selectBoxList(true),
'flights' => $flights,
'saved' => $saved_flights,
]);
}
/**
* Show the flight information page
*
* @param $id
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
* @return mixed
*/
public function show($id)
{

6
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -21,6 +21,7 @@ use App\Services\FareService;
use App\Services\GeoService;
use App\Services\PirepService;
use App\Services\UserService;
use App\Support\Units\Fuel;
use App\Support\Units\Time;
use Carbon\Carbon;
use Illuminate\Http\Request;
@@ -325,8 +326,13 @@ class PirepController extends Controller
$minutes = (int) $request->input('minutes', 0);
$pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
// Set the correct fuel units
$pirep->block_fuel = new Fuel((float) $request->input('block_fuel'), setting('units.fuel'));
$pirep->fuel_used = new Fuel((float) $request->input('fuel_used'), setting('units.fuel'));
// Put the time that this is currently submitted
$attrs['submitted_at'] = Carbon::now('UTC');
$pirep->submitted_at = Carbon::now('UTC');
$pirep = $this->pirepSvc->create($pirep);
$this->saveCustomFields($pirep, $request);

42
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -18,10 +18,8 @@ use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Validator;
use Intervention\Image\Facades\Image;
use Laracasts\Flash\Flash;
use Nwidart\Modules\Facades\Module;
/**
* Class ProfileController
*/
class ProfileController extends Controller
{
private $airlineRepo;
@@ -45,6 +43,21 @@ class ProfileController extends Controller
$this->userRepo = $userRepo;
}
/**
* Return whether the vmsACARS module is enabled or not
*/
private function acarsEnabled(): bool
{
// Is the ACARS module enabled?
$acars_enabled = false;
$acars = Module::find('VMSACARS');
if ($acars) {
$acars_enabled = $acars->isEnabled();
}
return $acars_enabled;
}
/**
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
@@ -57,6 +70,7 @@ class ProfileController extends Controller
}
return view('profile.index', [
'acars' => $this->acarsEnabled(),
'user' => Auth::user(),
'airports' => $airports,
]);
@@ -119,7 +133,7 @@ class ProfileController extends Controller
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return $this
* @return mixed
*/
public function update(Request $request)
{
@@ -200,4 +214,24 @@ class ProfileController extends Controller
return redirect(route('frontend.profile.index'));
}
/**
* Generate the ACARS config and send it to download
*
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
*/
public function acars(Request $request)
{
$user = Auth::user();
$config = view('system.acars.config', ['user' => $user])->render();
return response($config)->withHeaders([
'Content-Type' => 'text/xml',
'Content-Length' => strlen($config),
'Cache-Control' => 'no-store, no-cache',
'Content-Disposition' => 'attachment; filename="settings.xml',
]);
}
}

6
app/Http/Kernel.php
View File

@@ -8,9 +8,7 @@ use App\Http\Middleware\InstalledCheck;
use App\Http\Middleware\JsonResponse;
use App\Http\Middleware\RedirectIfAuthenticated;
use App\Http\Middleware\UpdatePending;
use App\Http\Middleware\VerifyCsrfToken;
use Illuminate\Auth\Middleware\Authenticate;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -42,16 +40,14 @@ class Kernel extends HttpKernel
AddQueuedCookiesToResponse::class,
StartSession::class,
ShareErrorsFromSession::class,
VerifyCsrfToken::class,
// VerifyCsrfToken::class,
SubstituteBindings::class,
//\Spatie\Pjax\Middleware\FilterIfPjax::class,
],
];
protected $routeMiddleware = [
'api.auth' => ApiAuth::class,
'auth' => Authenticate::class,
'auth.basic' => AuthenticateWithBasicAuth::class,
'bindings' => SubstituteBindings::class,
'can' => Authorize::class,
'guest' => RedirectIfAuthenticated::class,

8
app/Http/Middleware/ApiAuth.php
View File

@@ -5,12 +5,14 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use App\Models\Enums\UserState;
use App\Models\User;
use Auth;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class ApiAuth
class ApiAuth implements Middleware
{
/**
* Handle an incoming request.
@@ -20,7 +22,7 @@ class ApiAuth
*
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
// Check if Authorization header is in place
$api_key = $request->header('x-api-key', null);

3
app/Http/Middleware/EncryptCookies.php
View File

@@ -2,9 +2,10 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
class EncryptCookies extends BaseEncrypter
class EncryptCookies extends BaseEncrypter implements Middleware
{
/**
* The names of the cookies that should not be encrypted.

15
app/Http/Middleware/InstalledCheck.php
View File

@@ -5,17 +5,18 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Closure;
use Illuminate\Http\Request;
class InstalledCheck
/**
* Check the app.key to see whether we're installed or not
*
* If the default key is set and we're not in any of the installer routes
* show the message that we need to be installed
*/
class InstalledCheck implements Middleware
{
/**
* Check the app.key to see whether we're installed or not
*
* If the default key is set and we're not in any of the installer routes
* show the message that we need to be installed
*/
public function handle(Request $request, Closure $next)
{
if (config('app.key') === 'base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY='

6
app/Http/Middleware/JsonResponse.php
View File

@@ -5,11 +5,13 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Closure;
use Illuminate\Http\Request;
class JsonResponse
class JsonResponse implements Middleware
{
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
$response = $next($request);
$response->headers->set('Content-Type', 'application/json');

18
app/Http/Middleware/MeasureExecutionTime.php
View File

@@ -5,19 +5,13 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Closure;
use Illuminate\Http\Request;
class MeasureExecutionTime
class MeasureExecutionTime implements Middleware
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
// Get the response
$response = $next($request);
@@ -31,8 +25,8 @@ class MeasureExecutionTime
// I assume you're using valid json in your responses
// Then I manipulate them below
$content = json_decode($response->getContent(), true) + [
'execution_time' => $executionTime,
];
'execution_time' => $executionTime,
];
// Change the content of your response
$response->setData($content);

15
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -2,21 +2,14 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class RedirectIfAuthenticated
class RedirectIfAuthenticated implements Middleware
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
public function handle(Request $request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/');

15
app/Http/Middleware/SetActiveTheme.php
View File

@@ -2,17 +2,26 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Closure;
use Igaster\LaravelTheme\Facades\Theme;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/**
* Read the current theme from the settings (set in admin), and set it
*/
class SetActiveTheme
class SetActiveTheme implements Middleware
{
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
$theme = setting('general.theme');
try {
$theme = setting('general.theme');
} catch (\Exception $e) {
Log::error($e->getMessage());
$theme = 'default';
}
if (!empty($theme)) {
Theme::set($theme);
}

12
app/Http/Middleware/UpdatePending.php
View File

@@ -2,13 +2,15 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use App\Services\Installer\InstallerService;
use Closure;
use Illuminate\Http\Request;
/**
* Determine if an update is pending by checking in with the Installer service
*/
class UpdatePending
class UpdatePending implements Middleware
{
private $installerSvc;
@@ -17,13 +19,7 @@ class UpdatePending
$this->installerSvc = $installerSvc;
}
/**
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
if ($this->installerSvc->isUpgradePending()) {
return redirect('/update/step1');

3
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -2,9 +2,10 @@
namespace App\Http\Middleware;
use App\Contracts\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
class VerifyCsrfToken extends BaseVerifier
class VerifyCsrfToken extends BaseVerifier implements Middleware
{
/**
* The URIs that should be excluded from CSRF verification.

2
app/Http/Requests/Acars/CommentRequest.php
View File

@@ -10,7 +10,7 @@ class CommentRequest extends FormRequest
{
$rules = [
'comment' => 'required',
'created_at' => 'nullable|date',
'created_at' => 'sometimes|date',
];
return $rules;

6
app/Http/Requests/Acars/EventRequest.php
View File

@@ -19,9 +19,9 @@ class EventRequest extends FormRequest
$rules = [
'events' => 'required|array',
'events.*.event' => 'required',
'events.*.lat' => 'nullable|numeric',
'events.*.lon' => 'nullable|numeric',
'events.*.created_at' => 'nullable|date',
'events.*.lat' => 'sometimes|numeric',
'events.*.lon' => 'sometimes|numeric',
'events.*.created_at' => 'sometimes|date',
];
return $rules;

44
app/Http/Requests/Acars/FileRequest.php
View File

@@ -20,28 +20,28 @@ class FileRequest extends FormRequest
'distance' => 'required|numeric',
'flight_time' => 'required|integer',
'fuel_used' => 'required|numeric',
'block_time' => 'nullable|integer',
'airline_id' => 'nullable|exists:airlines,id',
'aircraft_id' => 'nullable|exists:aircraft,id',
'flight_number' => 'nullable',
'flight_type' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'planned_distance' => 'nullable|numeric',
'planned_flight_time' => 'nullable|integer',
'level' => 'nullable|numeric',
'zfw' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'source_name' => 'nullable',
'score' => 'nullable|integer',
'landing_rate' => 'nullable|numeric',
'block_off_time' => 'nullable|date',
'block_on_time' => 'nullable|date',
'created_at' => 'nullable|date',
'block_time' => 'sometimes|integer',
'airline_id' => 'sometimes|exists:airlines,id',
'aircraft_id' => 'sometimes|exists:aircraft,id',
'flight_number' => 'sometimes',
'flight_type' => 'sometimes',
'dpt_airport_id' => 'sometimes|size:4',
'arr_airport_id' => 'sometimes|size:4',
'route_code' => 'sometimes',
'route_leg' => 'sometimes',
'planned_distance' => 'sometimes|numeric',
'planned_flight_time' => 'sometimes|integer',
'level' => 'sometimes|numeric',
'zfw' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'sometimes',
'notes' => 'sometimes',
'source_name' => 'sometimes',
'score' => 'sometimes|integer',
'landing_rate' => 'sometimes|numeric',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
// See if the fare objects are included and formatted properly
'fares' => 'nullable|array',

6
app/Http/Requests/Acars/LogRequest.php
View File

@@ -19,9 +19,9 @@ class LogRequest extends FormRequest
$rules = [
'logs' => 'required|array',
'logs.*.log' => 'required',
'logs.*.lat' => 'nullable|numeric',
'logs.*.lon' => 'nullable|numeric',
'logs.*.created_at' => 'nullable|date',
'logs.*.lat' => 'sometimes|numeric',
'logs.*.lon' => 'sometimes|numeric',
'logs.*.created_at' => 'sometimes|date',
];
return $rules;

24
app/Http/Requests/Acars/PositionRequest.php
View File

@@ -23,18 +23,18 @@ class PositionRequest extends FormRequest
'positions' => 'required|array',
'positions.*.lat' => 'required|numeric',
'positions.*.lon' => 'required|numeric',
'positions.*.status' => 'nullable',
'positions.*.altitude' => 'nullable|numeric',
'positions.*.heading' => 'nullable|numeric|between:0,360',
'positions.*.vs' => 'nullable',
'positions.*.gs' => 'nullable',
'positions.*.transponder' => 'nullable',
'positions.*.autopilot' => 'nullable',
'positions.*.fuel' => 'nullable|numeric',
'positions.*.fuel_flow' => 'nullable|numeric',
'positions.*.log' => 'nullable',
'positions.*.sim_time' => 'nullable|date',
'positions.*.created_at' => 'nullable|date',
'positions.*.status' => 'sometimes',
'positions.*.altitude' => 'sometimes|numeric',
'positions.*.heading' => 'sometimes|numeric|between:0,360',
'positions.*.vs' => 'sometimes',
'positions.*.gs' => 'sometimes',
'positions.*.transponder' => 'sometimes',
'positions.*.autopilot' => 'sometimes',
'positions.*.fuel' => 'sometimes|numeric',
'positions.*.fuel_flow' => 'sometimes|numeric',
'positions.*.log' => 'sometimes|nullable',
'positions.*.sim_time' => 'sometimes|date',
'positions.*.created_at' => 'sometimes|date',
];
return $rules;

38
app/Http/Requests/Acars/PrefileRequest.php
View File

@@ -11,30 +11,30 @@ class PrefileRequest extends FormRequest
$rules = [
'airline_id' => 'required|exists:airlines,id',
'aircraft_id' => 'required|exists:aircraft,id',
'flight_id' => 'sometimes|exists:flights,id',
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'flight_id' => 'nullable',
'dpt_airport_id' => 'required|size:4',
'arr_airport_id' => 'required|size:4',
'source_name' => 'required',
'alt_airport_id' => 'nullable',
'status' => 'nullable',
'alt_airport_id' => 'sometimes|size:4',
'status' => 'sometimes',
'level' => 'nullable|numeric',
'flight_type' => 'nullable',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'distance' => 'nullable|numeric',
'block_time' => 'nullable|integer',
'flight_time' => 'nullable|integer',
'planned_distance' => 'nullable|numeric',
'planned_flight_time' => 'nullable|integer',
'zfw' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'flight_type' => 'sometimes',
'route_code' => 'sometimes',
'route_leg' => 'sometimes',
'distance' => 'sometimes|numeric',
'block_time' => 'sometimes|integer',
'flight_time' => 'sometimes|integer',
'planned_distance' => 'sometimes|numeric',
'planned_flight_time' => 'sometimes|integer',
'zfw' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'score' => 'nullable|integer',
'block_off_time' => 'nullable|date',
'block_on_time' => 'nullable|date',
'created_at' => 'nullable|date',
'score' => 'sometimes|integer',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
// See if the fare objects are included and formatted properly
'fares' => 'nullable|array',

2
app/Http/Requests/Acars/RouteRequest.php
View File

@@ -20,7 +20,7 @@ class RouteRequest extends FormRequest
'route' => 'required|array',
'route.*.name' => 'required',
'route.*.order' => 'required|int',
'route.*.nav_type' => 'nullable|int',
'route.*.nav_type' => 'sometimes|int',
'route.*.lat' => 'required|numeric',
'route.*.lon' => 'required|numeric',
];

41
app/Http/Requests/Acars/UpdateRequest.php
View File

@@ -19,29 +19,30 @@ class UpdateRequest extends FormRequest
$rules = [
'airline_id' => 'nullable|exists:airlines,id',
'aircraft_id' => 'nullable|exists:aircraft,id',
'flight_number' => 'nullable',
'dpt_airport_id' => 'nullable',
'arr_airport_id' => 'nullable',
'flight_id' => 'sometimes|nullable|exists:flights,id',
'flight_number' => 'sometimes|required',
'dpt_airport_id' => 'sometimes|required|size:4',
'arr_airport_id' => 'sometimes|required|size:4',
'route_code' => 'nullable',
'route_leg' => 'nullable',
'distance' => 'nullable|numeric',
'planned_distance' => 'nullable|numeric',
'block_time' => 'nullable|integer',
'flight_time' => 'nullable|integer',
'distance' => 'sometimes|numeric',
'planned_distance' => 'sometimes|numeric',
'block_time' => 'sometimes|integer',
'flight_time' => 'sometimes|integer',
'flight_type' => 'nullable',
'planned_flight_time' => 'nullable|integer',
'level' => 'nullable|numeric',
'zfw' => 'nullable|numeric',
'fuel_used' => 'nullable|numeric',
'block_fuel' => 'nullable|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'source_name' => 'nullable|max:25',
'landing_rate' => 'nullable|numeric',
'block_off_time' => 'nullable',
'block_on_time' => 'nullable',
'created_at' => 'nullable',
'status' => 'nullable',
'planned_flight_time' => 'sometimes|integer',
'level' => 'sometimes|numeric',
'zfw' => 'sometimes|numeric',
'fuel_used' => 'sometimes|numeric',
'block_fuel' => 'sometimes|numeric',
'route' => 'sometimes|nullable',
'notes' => 'sometimes|nullable',
'source_name' => 'sometimes|max:25',
'landing_rate' => 'sometimes|numeric',
'block_off_time' => 'sometimes|date',
'block_on_time' => 'sometimes|date',
'created_at' => 'sometimes|date',
'status' => 'sometimes',
'score' => 'nullable|integer',
// See if the fare objects are included and formatted properly

271
app/Http/Routes/admin.php
View File

@@ -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');
}
);

4
app/Http/Routes/api.php
View File

@@ -3,6 +3,8 @@
/**
* Public routes
*/
use Illuminate\Support\Facades\Route;
Route::group([], function () {
Route::get('acars', 'AcarsController@live_flights');
Route::get('acars/geojson', 'AcarsController@pireps_geojson');
@@ -43,6 +45,8 @@ Route::group(['middleware' => ['api.auth']], function () {
* ACARS related
*/
Route::post('pireps/prefile', 'PirepController@prefile');
Route::post('pireps/{pirep_id}', 'PirepController@update');
Route::patch('pireps/{pirep_id}', 'PirepController@update');
Route::post('pireps/{pirep_id}/update', 'PirepController@update');
Route::post('pireps/{pirep_id}/file', 'PirepController@file');
Route::post('pireps/{pirep_id}/comments', 'PirepController@comments_post');

18
app/Http/Routes/console.php
View File

@@ -1,18 +0,0 @@
<?php
use Illuminate\Foundation\Inspiring;
/*
|--------------------------------------------------------------------------
| Console Routes
|--------------------------------------------------------------------------
|
| This file is where you may define all of your Closure based console
| commands. Each Closure is bound to a command instance allowing a
| simple approach to interacting with each command's IO methods.
|
*/
Artisan::command('inspire', function () {
$this->comment(Inspiring::quote());
});

17
app/Http/Routes/web.php
View File

@@ -4,6 +4,8 @@
* User doesn't need to be logged in for these
*/
use App\Http\Middleware\SetActiveTheme;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route;
Route::group([
'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.',
@@ -11,8 +13,9 @@ Route::group([
], function () {
Route::get('/', 'HomeController@index')->name('home');
Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public');
Route::get('p/{id}', 'ProfileController@show')->name('profile.show.public');
Route::get('pireps/{id}', 'PirepController@show')->name('pireps.show');
Route::get('p/{id}', 'ProfileController@show')->name('profile.show.public');
Route::get('users', 'UserController@index')->name('users.index');
Route::get('pilots', 'UserController@index')->name('pilots.index');
@@ -24,7 +27,7 @@ Route::group([
*/
Route::group([
'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.',
'middleware' => ['role:admin|user', SetActiveTheme::class],
'middleware' => ['auth', SetActiveTheme::class],
], function () {
Route::resource('dashboard', 'DashboardController');
@@ -38,12 +41,16 @@ Route::group([
Route::get('flights/search', 'FlightController@search')->name('flights.search');
Route::resource('flights', 'FlightController');
Route::resource('pireps', 'PirepController', [
'except' => ['show'],
]);
Route::get('pireps/fares', 'PirepController@fares');
Route::resource('pireps', 'PirepController');
Route::post('pireps/{id}/submit', 'PirepController@submit')->name('pireps.submit');
Route::get('profile/regen_apikey', 'ProfileController@regen_apikey')
->name('profile.regen_apikey');
Route::get('profile/acars', 'ProfileController@acars')->name('profile.acars');
Route::get('profile/regen_apikey', 'ProfileController@regen_apikey')->name('profile.regen_apikey');
Route::resource('profile', 'ProfileController');
});