fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-1038255

.editorconfig

@@ -1,6 +1,10 @@
 #
 root = true
 
+[*]
+end_of_line = lf
+insert_final_newline = true
+
 [*.js]
 indent_style = space
 indent_size = 2
@@ -23,4 +27,4 @@ indent_style = tab
 # Matches the exact files either package.json or .travis.yml
 [{package.json, .travis.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 2

.travis.yml

@@ -6,7 +6,6 @@ language: php
 php:
   - '7.4'
   - '7.3'
-  - '7.2'
 
 #env:
 #  - DB=mysql
@@ -29,6 +28,8 @@ services:
 install:
   - php --version
   - mysql --version
+  # Downgrade composer version to 1.x
+  - composer self-update --1
   - composer install --dev --no-interaction --verbose
   - npm i tar-to-zip -g
   - cp .travis/env.travis.php env.php

.travis/phpunit.travis.xml

@@ -21,9 +21,9 @@
             <directory suffix=".php">./app</directory>
         </whitelist>
     </filter>
-    <listeners>
+    <!--<listeners>
         <listener class="NunoMaduro\Collision\Adapters\Phpunit\Listener"/>
-    </listeners>
+    </listeners>-->
     <php>
         <ini name="error_reporting" value="E_ALL"/>
         <ini name="display_errors" value="On"/>

Makefile

@@ -43,7 +43,7 @@ build:
 # This is to build all the stylesheets, etc
 .PHONY: build-assets
 build-assets:
-	yarn run production
+	npm run production
 
 .PHONY: install
 install: build
@@ -74,9 +74,9 @@ reload-db:
 tests: test
 
 .PHONY: test
-test: phpcs
-	#php artisan database:create --reset
-	vendor/bin/phpunit --debug --verbose
+test:
+	@#php artisan database:create --reset
+	@vendor/bin/phpunit --verbose
 
 .PHONY: phpcs
 phpcs:

README.md

@@ -1,20 +1,17 @@
-# phpvms <sup>7</sup>
+# phpVMS <sup>7</sup>
 
 [![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)
 
-The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available 
-                                                                          [on the phpVMS documentation](http://docs.phpvms.net/) page.
+The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available [on the phpVMS documentation](https://docs.phpvms.net/) page.
 
-# installation
+## Installation
 
 A full distribution, with all of the composer dependencies, is available at this 
 [GitHub Releases](https://github.com/nabeelio/phpvms/releases) link. 
 
+### Requirements
 
-
-## Requirements
-
-- PHP 7.1+, extensions:
+- PHP 7.3+, extensions:
   - cURL
   - JSON
   - mbstring
@@ -24,16 +21,16 @@ A full distribution, with all of the composer dependencies, is available at this
 - Database:
   - MySQL 5.5+ (or MySQL variant, including MariaDB and Percona)
 
-[View more details on requirements](http://docs.phpvms.net/setup/requirements)
+[View more details on requirements](https://docs.phpvms.net/requirements)
 
-## Installer
+### Installer
 
 1. Upload to your server
 1. Visit the site, and follow the link to the installer
 
-[View installation details](http://docs.phpvms.net/setup/installation)
+[View installation details](https://docs.phpvms.net/installation/installation)
 
-# development environment
+## Development Environment
 
 A full development environment can be brought up using Docker:
 
@@ -50,7 +47,7 @@ Then go to `http://localhost`. If you're using dnsmasq, the `app` container is l
 127.0.0.1   phpvms.test
 ```
 
-## Building JS/CSS assets
+### Building JS/CSS assets
 
 Yarn is required, run:
 

app/Console/Commands/CreateDatabase.php

@@ -79,21 +79,29 @@ class CreateDatabase extends Command
      */
     protected function create_sqlite($dbkey)
     {
+        $dbPath = config($dbkey.'database');
+
+        // Skip if running in memory
+        if ($dbPath === ':memory:') {
+            return;
+        }
+
         $exec = 'sqlite3';
         if ($this->os->isWindowsLike()) {
             $exec = 'sqlite3.exe';
         }
 
         if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey.'database')];
-            $this->runCommand($cmd);
+            if (file_exists($dbPath)) {
+                unlink(config($dbkey.'database'));
+            }
         }
 
-        if (!file_exists(config($dbkey.'database'))) {
+        if (!file_exists($dbPath)) {
             $cmd = [
                 $exec,
-                config($dbkey.'database'),
-                '""',
+                $dbPath,
+                '".exit"',
             ];
 
             $this->runCommand($cmd);

app/Console/Commands/ImportFromClassicCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Importer\Console\Commands;
+namespace App\Console\Commands;
 
 use App\Contracts\Command;
+use App\Services\ImporterService;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\ImporterService;
 
 class ImportFromClassicCommand extends Command
 {

app/Console/Commands/YamlExport.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use DB;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -25,6 +25,20 @@ class YamlExport extends Command
             exit();
         }
 
+        // A "preset" for exporting the base set of data
+        if ($tables[0] === 'base') {
+            $tables = [
+                'airlines',
+                'aircraft',
+                'subfleets',
+                'subfleet_fare',
+                'subfleet_rank',
+                'bids',
+                'fares',
+                'flights',
+            ];
+        }
+
         $export_tables = [];
         foreach ($tables as $table) {
             $export_tables[$table] = [];

app/Contracts/Award.php

@@ -36,7 +36,10 @@ abstract class Award
      * You don't really need to mess with anything below here
      */
 
+    /** @var \App\Models\Award|null */
     protected $award;
+
+    /** @var \App\Models\User|null */
     protected $user;
 
     public function __construct(AwardModel $award = null, User $user = null)

app/Contracts/Command.php

@@ -3,6 +3,7 @@
 namespace App\Contracts;
 
 use Illuminate\Support\Facades\Log;
+use function is_array;
 use Symfony\Component\Process\Process;
 
 /**
@@ -82,9 +83,9 @@ abstract class Command extends \Illuminate\Console\Command
     }
 
     /**
-     * @param       $cmd
-     * @param bool  $return
-     * @param mixed $verbose
+     * @param array|string $cmd
+     * @param bool         $return
+     * @param mixed        $verbose
      *
      * @throws \Symfony\Component\Process\Exception\RuntimeException
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -93,16 +94,16 @@ abstract class Command extends \Illuminate\Console\Command
      */
     public function runCommand($cmd, $return = false, $verbose = true): string
     {
-        if (\is_array($cmd)) {
+        if (is_array($cmd)) {
             $cmd = implode(' ', $cmd);
         }
 
         if ($verbose) {
-            $this->info('Running "'.$cmd.'"');
+            $this->info('Running '.$cmd);
         }
 
         $val = '';
-        $process = new Process($cmd);
+        $process = Process::fromShellCommandline($cmd);
         $process->run(function ($type, $buffer) use ($return, &$val) {
             if ($return) {
                 $val .= $buffer;

app/Contracts/Event.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class Event
+{
+    use Dispatchable;
+    use SerializesModels;
+}

app/Contracts/ImportExport.php

@@ -3,9 +3,9 @@
 namespace App\Contracts;
 
 use App\Models\Airline;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
-use Log;
-use Validator;
 
 /**
  * Common functionality used across all of the importers
@@ -51,9 +51,9 @@ class ImportExport
      *
      * @param $code
      *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return Airline
      */
-    public function getAirline($code)
+    public function getAirline($code): Airline
     {
         $airline = Airline::firstOrCreate([
             'icao' => $code,

app/Contracts/Listener.php

@@ -16,7 +16,7 @@ abstract class Listener
     public function subscribe(Dispatcher $events): void
     {
         foreach (static::$callbacks as $klass => $cb) {
-            $events->listen($klass, get_class($this).'@'.$cb);
+            $events->listen($klass, static::class.'@'.$cb);
         }
     }
 }

app/Contracts/Migration.php

@@ -3,8 +3,11 @@
 namespace App\Contracts;
 
 use App\Support\Database;
-use DB;
+use Exception;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 
 /**
  * Class Migration
@@ -25,6 +28,29 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
     {
     }
 
+    /**
+     * Add a module and enable it
+     *
+     * @param array $attrs
+     */
+    public function addModule(array $attrs)
+    {
+        $module = array_merge([
+            'enabled'    => true,
+            'created_at' => DB::raw('NOW()'),
+            'updated_at' => DB::raw('NOW()'),
+        ], $attrs);
+
+        try {
+            DB::table('modules')->insert($module);
+        } catch (Exception $e) {
+            // setting already exists, just ignore it
+            if ($e->getCode() === 23000) {
+                return;
+            }
+        }
+    }
+
     /**
      * Seed a YAML file into the database
      *
@@ -35,7 +61,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
         try {
             $path = base_path($file);
             Database::seed_from_yaml_file($path, false);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Unable to load '.$file.' file');
             Log::error($e);
         }
@@ -52,7 +78,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
         foreach ($rows as $row) {
             try {
                 DB::table($table)->insert($row);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // setting already exists, just ignore it
                 if ($e->getCode() === 23000) {
                     continue;
@@ -60,4 +86,22 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
             }
         }
     }
+
+    /**
+     * Add an award from the migrations (for example, if you're adding an award module)
+     *
+     * @param array $award See \App\Models\Awardv
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function addAward(array $award)
+    {
+        $validator = Validator::make($award, \App\Models\Award::$rules);
+        if ($validator->fails()) {
+            throw new ValidationException($validator);
+        }
+
+        $awardModel = new \App\Models\Award($award);
+        $awardModel->save();
+    }
 }

app/Contracts/Modules/ServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Contracts\Modules;
+
+/**
+ * Base class for module service providers
+ * Add-on module service providers must extend this class. Docs on Service Providers:
+ * https://laravel.com/docs/7.x/providers
+ *
+ * For a sample service provider, view the sample module one:
+ * https://github.com/nabeelio/phpvms-module/blob/master/Providers/SampleServiceProvider.php
+ */
+abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    /**
+     * A boot method is required, even if it doesn't do anything.
+     * https://laravel.com/docs/7.x/providers#the-boot-method
+     *
+     * This is normally where you'd register the routes or other startup tasks for your module
+     */
+    public function boot(): void
+    {
+    }
+
+    /**
+     * This is required to register the links in either the public or admin toolbar
+     * For example, adding a frontend link:
+     *
+     * $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true);
+     *
+     * Or an admin link:
+     *
+     * $this->moduleSvc->addAdminLink('Sample', '/admin/sample');
+     */
+    public function registerLinks(): void
+    {
+    }
+
+    /**
+     * Deferred providers:
+     * https://laravel.com/docs/7.x/providers#deferred-providers
+     *
+     * @return array
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+}

app/Contracts/Notification.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Contracts;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Log;
 
-class BaseNotification extends Notification implements ShouldQueue
+class Notification extends \Illuminate\Notifications\Notification implements ShouldQueue
 {
     use Queueable;
 
     public $channels = [];
+    public $requires_opt_in = false;
 
     public function __construct()
     {
         // Look in the notifications.channels config and see where this particular
         // notification can go. Map it to $channels
-        $klass = get_class($this);
+        $klass = static::class;
         $notif_config = config('notifications.channels', []);
         if (!array_key_exists($klass, $notif_config)) {
             Log::error('Notification type '.$klass.' missing from notifications config, defaulting to mail');

app/Contracts/Resource.php

@@ -2,10 +2,12 @@
 
 namespace App\Contracts;
 
+use Illuminate\Http\Resources\Json\JsonResource;
+
 /**
  * Base class for a resource/response
  */
-class Resource extends \Illuminate\Http\Resources\Json\Resource
+class Resource extends JsonResource
 {
     /**
      * Iterate through the list of $fields and check if they're a "Unit"

app/Database/factories/AircraftFactory.php

@@ -1,24 +1,30 @@
 <?php
 
+use App\Models\Airport;
+use App\Models\Enums\AircraftState;
+use App\Models\Enums\AircraftStatus;
+use App\Models\Subfleet;
+use App\Support\ICAO;
 use Faker\Generator as Faker;
 
 $factory->define(App\Models\Aircraft::class, function (Faker $faker) {
     return [
         'id'          => null,
         'subfleet_id' => function () {
-            return factory(App\Models\Subfleet::class)->create()->id;
+            return factory(Subfleet::class)->create()->id;
         },
         'airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(Airport::class)->create()->id;
         },
         'iata'         => $faker->unique()->text(5),
         'icao'         => $faker->unique()->text(5),
         'name'         => $faker->text(50),
         'registration' => $faker->unique()->text(10),
-        'hex_code'     => \App\Support\ICAO::createHexCode(),
+        'hex_code'     => ICAO::createHexCode(),
+        'mtow'         => $faker->randomFloat(2, 0, 50000),
         'zfw'          => $faker->randomFloat(2, 0, 50000),
-        'status'       => \App\Models\Enums\AircraftStatus::ACTIVE,
-        'state'        => \App\Models\Enums\AircraftState::PARKED,
+        'status'       => AircraftStatus::ACTIVE,
+        'state'        => AircraftState::PARKED,
         'created_at'   => $faker->dateTimeBetween('-1 week', 'now'),
         'updated_at'   => function (array $pirep) {
             return $pirep['created_at'];

app/Database/factories/AirlineFactory.php

@@ -9,7 +9,7 @@ use Hashids\Hashids;
 $factory->define(App\Models\Airline::class, function (Faker $faker) {
     return [
         'id'   => null,
-        'icao' => function (array $apt) use ($faker) {
+        'icao' => function (array $apt) {
             $hashids = new Hashids(microtime(), 5);
             $mt = str_replace('.', '', microtime(true));
 

app/Database/factories/FlightFactory.php

@@ -8,19 +8,19 @@ $factory->define(App\Models\Flight::class, function (Faker $faker) {
     return [
         'id'         => $faker->unique()->numberBetween(10, 10000000),
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(\App\Models\Airline::class)->create()->id;
         },
         'flight_number'  => $faker->unique()->numberBetween(10, 1000000),
         'route_code'     => $faker->randomElement(['', $faker->text(5)]),
         'route_leg'      => $faker->randomElement(['', $faker->numberBetween(0, 1000)]),
         'dpt_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'arr_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'alt_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'distance'             => $faker->numberBetween(1, 1000),
         'route'                => null,

app/Database/factories/JournalTransactionsFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\JournalTransactions::class, function (Faker $faker)
     return [
         'transaction_group' => \Ramsey\Uuid\Uuid::uuid4()->toString(),
         'journal_id'        => function () {
-            return factory(App\Models\Journal::class)->create()->id;
+            return factory(\App\Models\Journal::class)->create()->id;
         },
         'credit'    => $faker->numberBetween(100, 10000),
         'debit'     => $faker->numberBetween(100, 10000),

app/Database/factories/NewsFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\News::class, function (Faker $faker) {
     return [
         'id'      => null,
         'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
+            return factory(\App\Models\User::class)->create()->id;
         },
         'subject' => $faker->text(),
         'body'    => $faker->sentence,

app/Database/factories/PirepFactory.php

@@ -10,8 +10,8 @@ use Faker\Generator as Faker;
  * Create a new PIREP
  */
 $factory->define(App\Models\Pirep::class, function (Faker $faker) {
-    $airline = factory(App\Models\Airline::class)->create();
-    $flight = factory(App\Models\Flight::class)->create([
+    $airline = factory(\App\Models\Airline::class)->create();
+    $flight = factory(\App\Models\Flight::class)->create([
         'airline_id' => $airline->id,
     ]);
 
@@ -21,10 +21,10 @@ $factory->define(App\Models\Pirep::class, function (Faker $faker) {
             return $airline->id;
         },
         'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
+            return factory(\App\Models\User::class)->create()->id;
         },
         'aircraft_id' => function () {
-            return factory(App\Models\Aircraft::class)->create()->id;
+            return factory(\App\Models\Aircraft::class)->create()->id;
         },
         'flight_id' => function () use ($flight) {
             return $flight->id;

app/Database/factories/SubfleetFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\Subfleet::class, function (Faker $faker) {
     return [
         'id'         => null,
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(\App\Models\Airline::class)->create()->id;
         },
         'name'                       => $faker->unique()->text(50),
         'type'                       => $faker->unique()->text(7),

app/Database/factories/UserFactory.php

@@ -1,7 +1,9 @@
 <?php
 
+use App\Models\Airline;
 use App\Models\Enums\UserState;
 use Faker\Generator as Faker;
+use Illuminate\Support\Facades\Hash;
 
 $factory->define(App\Models\User::class, function (Faker $faker) {
     static $password;
@@ -14,7 +16,7 @@ $factory->define(App\Models\User::class, function (Faker $faker) {
         'password'   => $password ?: $password = Hash::make('secret'),
         'api_key'    => $faker->sha1,
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(Airline::class)->create()->id;
         },
         'rank_id'        => 1,
         'flights'        => $faker->numberBetween(0, 1000),

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class RolesPermissionsTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         // Create table for storing roles
@@ -79,11 +74,6 @@ class RolesPermissionsTables extends Migration
         $this->addData('roles', $roles);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('permission_user');

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('password_resets', function (Blueprint $table) {
@@ -20,11 +15,6 @@ class CreatePasswordResetsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('password_resets');

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateSessionsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('sessions', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateSessionsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('sessions');

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirlinesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('airlines', function (Blueprint $table) {
@@ -32,11 +27,6 @@ class CreateAirlinesTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('airlines');

app/Database/migrations/2017_06_10_040335_create_fares_table.php

@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateFaresTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('fares', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateFaresTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('fares');

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

@@ -7,11 +7,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateFlightTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('flights', function (Blueprint $table) {

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateRanksTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('ranks', function (Blueprint $table) {
@@ -30,11 +25,6 @@ class CreateRanksTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('ranks');

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

@@ -3,9 +3,6 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-/**
- * Class CreateSubfleetTables
- */
 class CreateSubfleetTables extends Migration
 {
     public function up()
@@ -48,11 +45,6 @@ class CreateSubfleetTables extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('subfleets');

app/Database/migrations/2017_12_12_174519_create_bids_table.php

@@ -7,11 +7,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateBidsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('bids', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateBidsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('bids');

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('jobs', function (Blueprint $table) {
@@ -24,11 +19,6 @@ class CreateJobsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('jobs');

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateFailedJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateFailedJobsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('failed_jobs');

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateNavdataTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         /*
@@ -31,11 +26,6 @@ class CreateNavdataTables extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('navdata');

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

@@ -7,11 +7,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateAcarsTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('acars', function (Blueprint $table) {
@@ -44,11 +39,6 @@ class CreateAcarsTables extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('acars');

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateStatsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('stats', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateStatsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('stats');

app/Database/migrations/2018_01_08_142204_create_news_table.php

@@ -17,11 +17,6 @@ class CreateNewsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('news');

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -3,14 +3,10 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Modules\Awards\Awards\PilotFlightAwards;
 
 class CreateAwardsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('awards', function (Blueprint $table) {
@@ -23,7 +19,6 @@ class CreateAwardsTable extends Migration
             // EG, the airports has an internal expense for gate costs
             $table->string('ref_model')->nullable();
             $table->text('ref_model_params')->nullable();
-            //$table->string('ref_model_id', 36)->nullable();
 
             $table->timestamps();
 
@@ -38,13 +33,20 @@ class CreateAwardsTable extends Migration
 
             $table->index(['user_id', 'award_id']);
         });
+
+        /**
+         * Add a default, sample award
+         */
+        $award = [
+            'name'             => 'Pilot 50 flights',
+            'description'      => 'When a pilot has 50 flights, give this award',
+            'ref_model'        => PilotFlightAwards::class,
+            'ref_model_params' => 50,
+        ];
+
+        $this->addAward($award);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('awards');

app/Database/migrations/2018_02_28_231807_create_journal_transactions_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJournalTransactionsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('journal_transactions', function (Blueprint $table) {
@@ -34,11 +29,6 @@ class CreateJournalTransactionsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('journal_transactions');

app/Database/migrations/2018_02_28_231813_create_journals_table.php

@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJournalsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('journals', function (Blueprint $table) {
@@ -24,11 +19,6 @@ class CreateJournalsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('journals');

app/Database/migrations/2018_04_01_193443_create_files_table.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Contracts\Migration;
+use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -14,7 +15,7 @@ class CreateFilesTable extends Migration
     public function up()
     {
         Schema::create('files', function (Blueprint $table) {
-            $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH);
+            $table->string('id', Model::ID_MAX_LENGTH);
             $table->string('name');
             $table->string('description')->nullable();
             $table->string('disk')->nullable();

app/Database/migrations/2019_06_19_220910_add_readonly_to_roles.php

@@ -1,17 +1,12 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 class AddReadonlyToRoles extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up(): void
     {
         Schema::table('roles', static function (Blueprint $table) {
@@ -24,11 +19,6 @@ class AddReadonlyToRoles extends Migration
             ->update(['read_only' => true]);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down(): void
     {
         Schema::table('roles', static function (Blueprint $table) {

app/Database/migrations/2019_07_16_141152_users_add_pilot_id.php

@@ -1,21 +1,19 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Kinda of gross operations to change the pilot ID column
+ * 1. Add an `pilot_id` column, which will get populated with the current ID
+ * 2. Drop the `id` column, and then recreate it as a string field
+ * 3. Iterate through all of the users and set their `id` to the `pilot_id`
+ * 4. Change the other tables column types that reference `user_id`
+ */
 class UsersAddPilotId extends Migration
 {
-    /**
-     * Kinda of gross operations to change the pilot ID column
-     * 1. Add an `pilot_id` column, which will get populated with the current ID
-     * 2. Drop the `id` column, and then recreate it as a string field
-     * 3. Iterate through all of the users and set their `id` to the `pilot_id`
-     * 4. Change the other tables column types that reference `user_id`
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::table('users', static function (Blueprint $table) {
@@ -29,11 +27,6 @@ class UsersAddPilotId extends Migration
         DB::table('users')->update(['pilot_id' => DB::raw('`id`')]);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('users', function (Blueprint $table) {

app/Database/migrations/2019_08_30_132224_create_notifications_table.php

@@ -1,16 +1,11 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 class CreateNotificationsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('notifications', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateNotificationsTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('notifications');

app/Database/migrations/2019_09_16_141152_pireps_change_state_type.php

@@ -1,18 +1,16 @@
 <?php
 
+use App\Contracts\Migration;
 use App\Models\Enums\PirepState;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Change the PIREP state column to be a TINYINT
+ */
 class PirepsChangeStateType extends Migration
 {
-    /**
-     * Change the PIREP state column to be a TINYINT
-     *
-     * @return void
-     */
     public function up()
     {
         // Migrate the old rejected state
@@ -25,13 +23,4 @@ class PirepsChangeStateType extends Migration
             $table->unsignedSmallInteger('state')->change();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2019_10_30_141152_pireps_add_flight_id.php

@@ -5,27 +5,15 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Add a `flight_id` column to the PIREPs table
+ */
 class PirepsAddFlightId extends Migration
 {
-    /**
-     * Add a `flight_id` column to the PIREPs table
-     */
     public function up()
     {
         Schema::table('pireps', function (Blueprint $table) {
             $table->string('flight_id', Model::ID_MAX_LENGTH)->nullable()->after('aircraft_id');
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('pireps', function (Blueprint $table) {
-            $table->dropColumn('flight_id');
-        });
-    }
 }

app/Database/migrations/2020_02_12_141152_expenses_add_flight_type.php

@@ -4,11 +4,11 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Add a `flight_type` column to the expenses table
+ */
 class ExpensesAddFlightType extends Migration
 {
-    /**
-     * Add a `flight_type` column to the expenses table
-     */
     public function up()
     {
         Schema::table('expenses', function (Blueprint $table) {
@@ -18,11 +18,6 @@ class ExpensesAddFlightType extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('expenses', function (Blueprint $table) {

app/Database/migrations/2020_02_26_044305_modify_airports_coordinates.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Support\Facades\Schema;
 
 /**
@@ -25,13 +25,4 @@ class ModifyAirportsCoordinates extends Migration
             $table->decimal('lon', 11, 5)->change()->default(0.0)->nullable();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_04_044305_flight_field_nullable.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Support\Facades\Schema;
 
 /**
@@ -8,24 +8,10 @@ use Illuminate\Support\Facades\Schema;
  */
 class FlightFieldNullable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::table('flight_field_values', function ($table) {
             $table->text('value')->change()->nullable();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_05_141152_flights_add_load_factor.php

@@ -1,14 +1,14 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Add a `load_factor` and `load_factor_variance` columns to the expenses table
+ */
 class FlightsAddLoadFactor extends Migration
 {
-    /**
-     * Add a `load_factor` and `load_factor_variance` columns to the expenses table
-     */
     public function up()
     {
         Schema::table('flights', function (Blueprint $table) {
@@ -22,11 +22,6 @@ class FlightsAddLoadFactor extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('flights', function (Blueprint $table) {

app/Database/migrations/2020_03_06_141152_flights_add_pilot_pay.php

@@ -1,14 +1,14 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+ */
 class FlightsAddPilotPay extends Migration
 {
-    /**
-     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
-     */
     public function up()
     {
         Schema::table('flights', function (Blueprint $table) {
@@ -18,11 +18,6 @@ class FlightsAddPilotPay extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::table('flights', function (Blueprint $table) {

app/Database/migrations/2020_03_06_141153_fares_add_type.php

@@ -1,15 +1,15 @@
 <?php
 
+use App\Contracts\Migration;
 use App\Models\Enums\FareType;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+ */
 class FaresAddType extends Migration
 {
-    /**
-     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
-     */
     public function up()
     {
         Schema::table('fares', function (Blueprint $table) {
@@ -19,16 +19,4 @@ class FaresAddType extends Migration
                 ->after('capacity');
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('fares', function (Blueprint $table) {
-            $table->dropColumn('type');
-        });
-    }
 }

app/Database/migrations/2020_03_09_141152_increase_id_lengths.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -33,13 +33,4 @@ class IncreaseIdLengths extends Migration
             });
         }
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_09_141153_remove_subfleet_type_index.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -15,13 +15,4 @@ class RemoveSubfleetTypeIndex extends Migration
             $table->dropUnique(['type']);
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_11_141153_add_simbrief_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2020_03_27_174238_create_pages.php

@@ -1,6 +1,7 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
+use App\Models\Enums\PageType;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -10,11 +11,6 @@ use Illuminate\Support\Facades\Schema;
  */
 class CreatePages extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('pages', function (Blueprint $table) {
@@ -22,7 +18,7 @@ class CreatePages extends Migration
             $table->string('name');
             $table->string('slug');
             $table->string('icon');
-            $table->unsignedSmallInteger('type');
+            $table->unsignedSmallInteger('type')->default(PageType::PAGE);
             $table->boolean('public');
             $table->boolean('enabled');
             $table->mediumText('body');
@@ -32,11 +28,6 @@ class CreatePages extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::dropIfExists('pages');

app/Database/migrations/2020_03_28_174238_airline_remove_nullable.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -9,11 +9,7 @@ class AirlineRemoveNullable extends Migration
     public function up()
     {
         Schema::table('airlines', function (Blueprint $table) {
-            $table->dropUnique('airlines_iata_unique');
+            $table->dropUnique(['iata']);
         });
     }
-
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_03_28_174238_page_icon_nullable.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -12,8 +12,4 @@ class PageIconNullable extends Migration
             $table->string('icon')->change()->nullable();
         });
     }
-
-    public function down()
-    {
-    }
 }

app/Database/migrations/2020_06_09_141153_pages_add_link.php

@@ -0,0 +1,33 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add a `link` column and make the body optional. Also add a "new_window" bool
+ * which determines if we open this link in a new window or not
+ */
+class PagesAddLink extends Migration
+{
+    public function up()
+    {
+        Schema::table('pages', function (Blueprint $table) {
+            $table->string('body')->change()->nullable();
+            $table->string('link')
+                ->default('')
+                ->nullable()
+                ->after('body');
+
+            $table->boolean('new_window')->default(false);
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('fares', function (Blueprint $table) {
+            $table->dropColumn('link');
+            $table->dropColumn('new_window');
+        });
+    }
+}

app/Database/migrations/2020_07_21_141153_create_user_fields.php

@@ -0,0 +1,42 @@
+<?php
+
+use App\Contracts\Model;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add two tables for holding user fields and the values
+ */
+class CreateUserFields extends Migration
+{
+    public function up()
+    {
+        /*
+         * Hold a master list of fields
+         */
+        Schema::create('user_fields', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name', 200);
+            $table->text('description')->nullable();
+            $table->boolean('show_on_registration')->default(false)->nullable();
+            $table->boolean('required')->default(false)->nullable();
+            $table->boolean('private')->default(false)->nullable();
+            $table->boolean('active')->default(true)->nullable();
+            $table->timestamps();
+        });
+
+        /*
+         * The values for the actual fields
+         */
+        Schema::create('user_field_values', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_field_id');
+            $table->string('user_id', Model::ID_MAX_LENGTH);
+            $table->text('value')->nullable();
+            $table->timestamps();
+
+            $table->index(['user_field_id', 'user_id']);
+        });
+    }
+}

app/Database/migrations/2020_09_03_141152_aircraft_add_mtow.php

@@ -0,0 +1,28 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add a `mtow` column for the max takeoff weight
+ */
+class AircraftAddMtow extends Migration
+{
+    public function up()
+    {
+        Schema::table('aircraft', function (Blueprint $table) {
+            $table->unsignedDecimal('mtow')
+                ->nullable()
+                ->default(0.0)
+                ->after('hex_code');
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('aircraft', function (Blueprint $table) {
+            $table->dropColumn('mtow');
+        });
+    }
+}

app/Database/migrations/2020_09_30_081536_create_modules_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateModulesTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('modules', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('enabled')->default(1);
+            $table->timestamps();
+        });
+
+        $this->addModule(['name' => 'Awards']);
+        $this->addModule(['name' => 'Sample']);
+        $this->addModule(['name' => 'VMSAcars']);
+        $this->addModule(['name' => 'Vacentral']);
+        $this->addModule(['name' => 'TestModule']);
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('modules');
+    }
+}

app/Database/migrations/2020_11_20_044305_modify_pages_size.php

@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Change the pages body column type to a Medium Text, max size of 16MB
+ */
+class ModifyPagesSize extends Migration
+{
+    public function up()
+    {
+        Schema::table('pages', function (Blueprint $table) {
+            $table->mediumText('body')->change()->nullable();
+        });
+    }
+}

app/Database/migrations/2020_11_26_044305_modify_download_link_size.php

@@ -0,0 +1,19 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Change the downloads link size
+ */
+class ModifyDownloadLinkSize extends Migration
+{
+    public function up()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            $table->mediumText('disk')->change()->nullable();
+            $table->mediumText('path')->change()->nullable();
+        });
+    }
+}

app/Database/seeds/DatabaseSeeder.php

@@ -1,15 +1,21 @@
 <?php
 
+use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    private $seederService;
+    /** @var MigrationService */
+    private $migrationSvc;
+
+    /** @var SeederService */
+    private $seederSvc;
 
     public function __construct()
     {
-        $this->seederService = app(SeederService::class);
+        $this->migrationSvc = app(MigrationService::class);
+        $this->seederSvc = app(SeederService::class);
     }
 
     /**
@@ -19,6 +25,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->seederService->syncAllSeeds();
+        // Make sure any migrations that need to be run are run/cleared out
+        if ($this->migrationSvc->migrationsAvailable()) {
+            $this->migrationSvc->runAllMigrations();
+        }
+
+        // Then sync all of the seeds
+        $this->seederSvc->syncAllSeeds();
     }
 }

app/Database/seeds/dev/.gitignore

@@ -1 +1,2 @@
 local.yml
+vmsacars.yml

app/Database/seeds/dev/base.yml

@@ -12,3 +12,11 @@ airlines:
     active: 1
     created_at: now
     updated_at: now
+  - id: 2
+    icao: XXX
+    iata: XX
+    name: inactive airline
+    country: us
+    active: 0
+    created_at: now
+    updated_at: now

app/Database/seeds/dev/sample.yml

@@ -1,30 +1,10 @@
 
-#airlines:
-#  - id: 1
-#    icao: VMS
-#    iata: VM
-#    name: phpvms airlines
-#    country: us
-#    active: 1
-#    created_at: now
-#    updated_at: now
-
 roles:
   id_column: name
   data:
     - name: fleet-only
       display_name: Edit Fleet
 
-awards:
-  - id: 1
-    name: Pilot 50 flights
-    description: When a pilot has 50 flights, give this award
-    image_url:
-    ref_model: Modules\Awards\Awards\PilotFlightAwards
-    ref_model_params: 50
-    created_at: now
-    updated_at: now
-
 news:
   - id: 1
     user_id: 1
@@ -136,34 +116,91 @@ airports:
     ground_handling_cost: 50
 #
 aircraft:
-  - id: 1
+  -
+    id: 1
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KJFK
-    name: Boeing 747-438
+    landing_time: '2020-10-23 07:50:16'
+    name: 'Boeing 747-438'
     registration: 001Z
-    flight_time: 360
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 540
     status: A
-  - id: 2
+    state: 0
+    created_at: null
+    updated_at: '2020-10-23 07:50:16'
+  -
+    id: 2
     subfleet_id: 2
+    icao: null
+    iata: null
     airport_id: LGRP
-    name: Boeing 777-200
+    landing_time: null
+    name: 'Boeing 777-200'
     registration: C202
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
     flight_time: 260
     status: A
-  - id: 3
+    state: 0
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KAUS
-    name: Boeing 747-412
+    landing_time: '2020-10-24 08:50:13'
+    name: 'Boeing 747-412'
     registration: S2333
-    flight_time: 0
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 180
     status: A
-  - id: 4
+    state: 0
+    created_at: null
+    updated_at: '2020-10-24 08:50:13'
+  -
+    id: 4
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KAUS
-    name: Boeing 747-436 RETIRED
-    registration:
+    landing_time: null
+    name: 'Boeing 747-436 RETIRED'
+    registration: null
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
     flight_time: 45
     status: R
+    state: 0
+    created_at: null
+    updated_at: null
+  -
+    id: 5
+    subfleet_id: 4
+    icao: A320
+    iata: '320'
+    airport_id: EGLL
+    landing_time: null
+    name: 'Airbus A320'
+    registration: N786DL
+    hex_code: b47165dd
+    mtow: '78800.00'
+    zfw: '62500.00'
+    flight_time: 0
+    status: A
+    state: 0
+    created_at: '2020-10-22 13:38:50'
+    updated_at: '2020-10-22 13:38:50'
 
 expenses:
   - name: Per-Flight (no muliplier)
@@ -220,68 +257,192 @@ expenses:
     updated_at: now
 
 fares:
-  - id: 1
-    code: Y
+  -
+    id: 1
+    code: 'Y'
     name: Economy
-    price: 100
+    price: '100.00'
+    cost: '0.00'
     capacity: 200
-  - id: 2
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 2
     code: B
     name: Business
-    price: 500
+    price: '500.00'
+    cost: '0.00'
     capacity: 10
-  - id: 3
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     code: F
     name: First-Class
-    price: 800
+    price: '800.00'
+    cost: '0.00'
     capacity: 5
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
 
 subfleets:
-  - id: 1
+  -
+    id: 1
     airline_id: 1
-    name: 747-43X RB211-524G
     type: 744-3X-RB211
-    cost_block_hour: 1000
-    ground_handling_multiplier: 200
-  - id: 2
+    name: '747-43X RB211-524G'
+    cost_block_hour: '1000.00'
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '200.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 2
     airline_id: 1
-    name: 777-222ER GE90-76B
     type: 772-22ER-GE90-76B
-    cost_block_hour: 500
-    ground_handling_multiplier: 150
-  - id: 3
+    name: '777-222ER GE90-76B'
+    cost_block_hour: '500.00'
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '150.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     airline_id: 1
-    name: 777-367 ER GE90-115B
     type: 772-36ER-GE90-115B
-    cost_block_hour: 100
-    ground_handling_multiplier: 150
+    name: '777-367 ER GE90-115B'
+    cost_block_hour: '100.00'
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '150.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 4
+    airline_id: 1
+    type: A320
+    name: A320
+    cost_block_hour: '2300.00'
+    cost_delay_minute: null
+    fuel_type: 1
+    ground_handling_multiplier: '100.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: '2020-10-22 13:36:49'
+    updated_at: '2020-10-22 13:36:49'
 
-# add a few mods to aircraft and fares
 subfleet_fare:
-
-  # Fare classes on the 747
-  - subfleet_id: 1
+  -
+    subfleet_id: 1
     fare_id: 1
-    price: 200
-    capacity: 400
-  - subfleet_id: 1
+    price: '200'
+    cost: null
+    capacity: '400'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 1
     fare_id: 2
     price: 120%
-  - subfleet_id: 1
-    fare_id: 3
-    price: 1000
-    capacity: 110%
-
-  # Fare classes on the 777
-  - subfleet_id: 2
-    fare_id: 1
-  - subfleet_id: 2
-    fare_id: 3
-    capacity: 10
-
-subfleet_rank:
-  - rank_id: 1
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
     subfleet_id: 1
+    fare_id: 3
+    price: '1000'
+    cost: null
+    capacity: 110%
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 2
+    fare_id: 1
+    price: null
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 2
+    fare_id: 3
+    price: null
+    cost: null
+    capacity: '10'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 1
+    price: null
+    cost: null
+    capacity: '123'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 2
+    price: null
+    cost: null
+    capacity: '8'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 3
+    price: null
+    cost: null
+    capacity: '2'
+    created_at: null
+    updated_at: null
+subfleet_rank:
+  -
+    rank_id: 1
+    subfleet_id: 1
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 1
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 2
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 3
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 4
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
 
 flights:
   - id: flightid_1
@@ -359,6 +520,35 @@ flights:
     route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
     created_at: NOW
     updated_at: NOW
+  -
+    id: q8mvZ5vdExoy0mQG
+    airline_id: 1
+    flight_number: 3003
+    route_code: null
+    route_leg: null
+    dpt_airport_id: KSEA
+    arr_airport_id: KPAE
+    alt_airport_id: null
+    dpt_time: '8:00'
+    arr_time: '8:45'
+    level: null
+    distance: '27.51'
+    flight_time: 45
+    flight_type: J
+    load_factor: null
+    load_factor_variance: null
+    route: null
+    pilot_pay: null
+    notes: null
+    scheduled: 0
+    days: null
+    start_date: null
+    end_date: null
+    has_bid: 1
+    active: 1
+    visible: 1
+    created_at: now
+    updated_at: now
 
 flight_fields:
   - name: Departure Terminal
@@ -389,12 +579,24 @@ flight_subfleet:
     flight_id: flightid_4
 
 bids:
-  - id: 100
+  -
+    id: 100
     user_id: 1
     flight_id: flightid_1
-  - id: 101
+    created_at: now
+    updated_at: now
+  -
+    id: 101
     user_id: 1
     flight_id: flightid_3
+    created_at: now
+    updated_at: now
+  -
+    id: 102
+    user_id: 1
+    flight_id: q8mvZ5vdExoy0mQG
+    created_at: now
+    updated_at: now
 
 pireps:
   - id: pirepid_1

app/Database/seeds/dev/users.yml

@@ -69,3 +69,33 @@ role_user:
   - user_id: 3
     role_id: 2
     user_type: App\Models\User
+
+user_fields:
+  - id: 1
+    name: 'VATSIM ID'
+    show_on_registration: true
+    required: false
+    private: false
+  - id: 2
+    name: 'Referral'
+    description: 'Who referred you'
+    show_on_registration: true
+    required: false
+    private: true
+
+user_field_values:
+  - id: 1
+    user_field_id: 1
+    user_id: 1
+    value: 'my vatsim id'
+  - id: 2
+    user_field_id: 2
+    user_id: 1
+    value: 'Nobody did'
+
+user_awards:
+  - id: 1
+    user_id: 1
+    award_id: 1
+    created_at: now
+    updated_at: now

app/Database/seeds/modules.yml

@@ -0,0 +1,10 @@
+- name: 'Awards'
+  enabled: 1
+- name: 'Sample'
+  enabled: 1
+- name: 'VMSAcars'
+  enabled: 1
+- name: 'Vacentral'
+  enabled: 1
+- name: 'TestModule'
+  enabled: 1

app/Database/seeds/permissions.yml

@@ -3,6 +3,9 @@
 - name: admin-access
   display_name: Admin Panel
   description: Access the admin panel
+- name: aircraft
+  display_name: Aircraft
+  description: Create/edit aircraft
 - name: airlines
   display_name: Airlines
   description: Create/edit airlines
@@ -48,3 +51,6 @@
 - name: maintenance
   display_name: Maintenance
   description: Run maintenance tasks
+- name: modules
+  display_name: Modules
+  description: Add/Edit Modules

app/Database/seeds/settings.yml

@@ -26,6 +26,13 @@
   options:
   type: boolean
   description: If an airport isn't added, try to look it up when adding schedules
+- key: general.allow_unadded_airports
+  name: 'Allow unadded airports'
+  group: general
+  value: false
+  options:
+  type: boolean
+  description: If an un-added airport is used, it is looked up and added
 - key: general.check_prerelease_version
   name: 'Pre-release versions in version check'
   group: general
@@ -123,6 +130,20 @@
   options: ''
   type: int
   description: 'Initial zoom level on the map'
+- key: airports.default_ground_handling_cost
+  name: 'Default Ground Handling Cost'
+  group: airports
+  value: 250
+  options:
+  type: int
+  description: If an airport's Ground Handling Cost Cost isn't added, set this value by default
+- key: airports.default_jet_a_fuel_cost
+  name: 'Default Jet A Fuel Cost'
+  group: airports
+  value: 0.7
+  options:
+  type: text
+  description: If an airport's Jet A Fuel Cost isn't added, set this value by default
 - key: bids.disable_flight_on_bid
   name: 'Disable flight on bid'
   group: bids

app/Events/AcarsUpdate.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+use App\Models\Acars;
+use App\Models\Pirep;
+
+class AcarsUpdate extends Event
+{
+    /** @var Pirep */
+    public $pirep;
+
+    /** @var Acars */
+    public $acars;
+
+    public function __construct(Pirep $pirep, Acars $acars)
+    {
+        $this->pirep = $pirep;
+        $this->acars = $acars;
+    }
+}

app/Events/BaseEvent.php

@@ -2,13 +2,11 @@
 
 namespace App\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
+use App\Contracts\Event;
 
-class BaseEvent
+/**
+ * @deprecated Extend App\Contracts\Event directly
+ */
+class BaseEvent extends Event
 {
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
 }

app/Events/CronHourly.php

@@ -2,6 +2,8 @@
 
 namespace App\Events;
 
-class CronHourly extends BaseEvent
+use App\Contracts\Event;
+
+class CronHourly extends Event
 {
 }

app/Events/CronMonthly.php

@@ -2,10 +2,12 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the monthly cron is run
  * It happens after all of the default nightly tasks
  */
-class CronMonthly extends BaseEvent
+class CronMonthly extends Event
 {
 }

app/Events/CronNightly.php

@@ -2,10 +2,12 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the daily cron is run
  * It happens after all of the default nightly tasks
  */
-class CronNightly extends BaseEvent
+class CronNightly extends Event
 {
 }

app/Events/CronWeekly.php

@@ -2,11 +2,13 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the weekly cron is run
  * It happens after all of the default nightly tasks
  */
-class CronWeekly extends BaseEvent
+class CronWeekly extends Event
 {
     public function __construct()
     {

app/Events/Expenses.php

@@ -2,6 +2,7 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
 /**
@@ -25,7 +26,7 @@ use App\Models\Pirep;
  *
  * The event will have a copy of the PIREP model, if it's applicable
  */
-class Expenses extends BaseEvent
+class Expenses extends Event
 {
     public $pirep;
 

app/Events/NewsAdded.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\News;
 
-class NewsAdded extends BaseEvent
+class NewsAdded extends Event
 {
     public $news;
 

app/Events/PirepAccepted.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepAccepted extends BaseEvent
+class PirepAccepted extends Event
 {
     public $pirep;
 

app/Events/PirepCancelled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepCancelled extends BaseEvent
+class PirepCancelled extends Event
 {
     public $pirep;
 

app/Events/PirepFiled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepFiled extends BaseEvent
+class PirepFiled extends Event
 {
     public $pirep;
 

app/Events/PirepPrefiled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepPrefiled extends BaseEvent
+class PirepPrefiled extends Event
 {
     public $pirep;
 

app/Events/PirepRejected.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepRejected extends BaseEvent
+class PirepRejected extends Event
 {
     public $pirep;
 

app/Events/PirepUpdated.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepUpdated extends BaseEvent
+class PirepUpdated extends Event
 {
     public $pirep;
 

app/Events/TestEvent.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class TestEvent extends BaseEvent
+class TestEvent extends Event
 {
     public $user;
 

app/Events/UserAccepted.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserAccepted extends BaseEvent
+class UserAccepted extends Event
 {
     public $user;
 

app/Events/UserRegistered.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserRegistered extends BaseEvent
+class UserRegistered extends Event
 {
     public $user;
 

app/Events/UserStateChanged.php

@@ -2,12 +2,13 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
 /**
  * Event triggered when a user's state changes
  */
-class UserStateChanged extends BaseEvent
+class UserStateChanged extends Event
 {
     public $old_state;
     public $user;

app/Events/UserStatsChanged.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserStatsChanged extends BaseEvent
+class UserStatsChanged extends Event
 {
     public $stat_name;
     public $old_value;

app/Exceptions/AircraftInvalid.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Models\Aircraft;
+
+class AircraftInvalid extends AbstractHttpException
+{
+    public const MESSAGE = 'The supplied aircraft is invalid';
+
+    private $aircraft;
+
+    public function __construct(Aircraft $aircraft)
+    {
+        $this->aircraft = $aircraft;
+        parent::__construct(
+            400,
+            static::MESSAGE
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'aircraft-invalid';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [
+            'aircraft_id' => optional($this->aircraft)->id,
+        ];
+    }
+}

app/Exceptions/Converters/GenericExceptionAbstract.php

@@ -3,13 +3,13 @@
 namespace App\Exceptions\Converters;
 
 use App\Exceptions\AbstractHttpException;
-use Exception;
+use Throwable;
 
 class GenericExceptionAbstract extends AbstractHttpException
 {
     private $exception;
 
-    public function __construct(Exception $exception)
+    public function __construct(Throwable $exception)
     {
         $this->exception = $exception;
         parent::__construct(

app/Exceptions/Converters/ValidationException.php

@@ -18,7 +18,7 @@ class ValidationException extends AbstractHttpException
 
         parent::__construct(
             400,
-            'Validation exception'
+            'Validation Error'
         );
     }
 

app/Exceptions/Handler.php

@@ -5,8 +5,7 @@ namespace App\Exceptions;
 use App\Exceptions\Converters\GenericExceptionAbstract;
 use App\Exceptions\Converters\SymfonyException;
 use App\Exceptions\Converters\ValidationException;
-use Exception;
-use Illuminate\Auth\Access\AuthorizationException;
+use App\Http\Middleware\SetActiveTheme;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -15,10 +14,9 @@ use Illuminate\Http\Request;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException as IlluminateValidationException;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException as SymfonyHttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 use Whoops\Handler\HandlerInterface;
 
 /**
@@ -42,19 +40,19 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param Request   $request
-     * @param Exception $exception
+     * @param Request    $request
+     * @param \Throwable $exception
      *
      * @return mixed
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         if ($request->is('api/*')) {
             return $this->handleApiError($request, $exception);
         }
 
-        if ($exception instanceof AbstractHttpException
-            && $exception->getStatusCode() === 403) {
+        (new SetActiveTheme())->setTheme($request);
+        if ($exception instanceof AbstractHttpException && $exception->getStatusCode() === 403) {
             return redirect()->guest('login');
         }
 
@@ -65,11 +63,11 @@ class Handler extends ExceptionHandler
      * Handle errors in the API
      *
      * @param            $request
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      */
-    private function handleApiError($request, Exception $exception)
+    private function handleApiError($request, Throwable $exception)
     {
         Log::error('API Error', $exception->getTrace());
 
@@ -118,38 +116,13 @@ class Handler extends ExceptionHandler
     {
         if ($request->expectsJson() || $request->is('api/*')) {
             $error = new Unauthenticated();
+
             return $error->getResponse();
         }
 
         return redirect()->guest('login');
     }
 
-    /**
-     * Render the given HttpException.
-     *
-     * @param AbstractHttpException $e
-     *
-     * @return \Illuminate\Http\Response|Response
-     */
-    protected function renderHttpException(HttpExceptionInterface $e)
-    {
-        $status = $e->getStatusCode();
-        view()->replaceNamespace('errors', [
-            resource_path('views/layouts/'.setting('general.theme', 'default').'/errors'),
-            resource_path('views/errors'),
-            __DIR__.'/views',
-        ]);
-
-        if (view()->exists("errors::{$status}")) {
-            return response()->view("errors::{$status}", [
-                'exception' => $e,
-                'SKIN_NAME' => setting('general.theme', 'default'),
-            ], $status, $e->getHeaders());
-        }
-
-        return $this->convertExceptionToResponse($e);
-    }
-
     /**
      * Ignition error page integration
      */

app/Exceptions/ModuleExistsException.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Exceptions;
+
+class ModuleExistsException extends AbstractHttpException
+{
+    private $module_name;
+
+    public function __construct($module_name)
+    {
+        $this->module_name = $module_name;
+        parent::__construct(
+            409,
+            'Module '.$module_name.' Already Exists!'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'module-already-exists';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}

app/Exceptions/ModuleInstallationError.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Exceptions;
+
+class ModuleInstallationError extends AbstractHttpException
+{
+    public function __construct()
+    {
+        parent::__construct(
+            500,
+            'Installation of Module Failed!'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'module-installation-error';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}