Flight history #807

.editorconfig

@@ -1,10 +1,6 @@
 #
 root = true
 
-[*]
-end_of_line = lf
-insert_final_newline = true
-
 [*.js]
 indent_style = space
 indent_size = 2
@@ -27,4 +23,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

.github/scripts/version.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-if test "$GIT_TAG_NAME"; then
-  export VERSION=$GIT_TAG_NAME
-
-  # Pass in the tag as the version to write out
-  php artisan phpvms:version --write --write-full-version "${VERSION}"
-  export FULL_VERSION=$(php artisan phpvms:version)
-else
-  export BRANCH=${GITHUB_REF##*/}
-  echo "On branch $BRANCH"
-
-  # Write the version out but place the branch ID in there
-  # This is only for the dev branch
-  export BASE_VERSION=$(php artisan phpvms:version --base-only)
-
-  # This now includes the pre-release version, so "-dev" by default
-  export VERSION=${BASE_VERSION}
-
-  # Don't pass in a version here, just write out the latest hash
-  php artisan phpvms:version --write "${VERSION}"
-  export FULL_VERSION=$(php artisan phpvms:version)
-fi
-
-export FILE_NAME="phpvms-${VERSION}"
-export TAR_NAME="$FILE_NAME.tar.gz"
-export ZIP_NAME="$FILE_NAME.zip"
-export BASE_DIR=`pwd`
-
-# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#environment-files
-echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
-echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV
-echo "TAR_NAME=${TAR_NAME}" >> $GITHUB_ENV
-echo "ZIP_NAME=${ZIP_NAME}" >> $GITHUB_ENV
-echo "BASE_DIR=${BASE_DIR}" >> $GITHUB_ENV
-echo "DISCORD_MSG=Version ${FULL_VERSION} is available, download: [zip](http://downloads.phpvms.net/$ZIP_NAME) | [tar](http://downloads.phpvms.net/$TAR_NAME)" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -1,249 +0,0 @@
-name: 'Build'
-on: ['push', 'pull_request', 'workflow_dispatch', 'release']
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-    if: github.repository == 'nabeelio/phpvms'
-    strategy:
-      fail-fast: true
-      matrix:
-        php-versions: ['7.3', '7.4']
-    name: PHP ${{ matrix.php-versions }}
-    env:
-      extensions: intl, pcov, mbstring
-      key: cache-v1
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    # Configure Caching
-    - name: Setup cache environment
-      id: cache-env
-      uses: shivammathur/cache-extensions@v1
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: ${{ env.extensions }}
-        key: ${{ env.key }}
-
-    - name: Cache extensions
-      uses: actions/cache@v1
-      with:
-        path: ${{ steps.cache-env.outputs.dir }}
-        key: ${{ steps.cache-env.outputs.key }}
-        restore-keys: ${{ steps.cache-env.outputs.key }}
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-    - name: Cache dependencies
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: ${{ runner.os }}-composer-
-
-    # Configure PHP
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: ${{ env.extensions }}
-        ini-values: post_max_size=256M, short_open_tag=On
-        coverage: xdebug
-        tools: php-cs-fixer, phpunit
-
-    - name: Shutdown Ubuntu MySQL
-      run: sudo service mysql stop
-
-    - name: Install MariaDB
-      uses: getong/mariadb-action@v1.1
-      with:
-        character set server: 'utf8'
-        collation server: 'utf8_general_ci'
-        mysql database: 'phpvms'
-        mysql root password: ''
-        mysql user: ''
-        mysql password: ''
-
-    - name: Configure Environment
-      run: |
-        php --version
-        mysql --version
-        # Downgrade composer version to 1.x
-        composer install --dev --no-interaction --verbose
-        cp .github/scripts/env.php env.php
-        cp .github/scripts/phpunit.xml phpunit.xml
-        php artisan database:create --reset
-        php artisan migrate:refresh --seed
-
-    - name: Run Tests
-      run: |
-        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
-        vendor/bin/phpunit --debug --verbose
-
-  # This runs after all of the tests, run have run. Creates a cleaned up version of the
-  # distro, and then creates the artifact to push up to S3 or wherever
-  artifacts:
-    name: 'Create dev build'
-    needs: build
-    runs-on: 'ubuntu-18.04'
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-
-      - uses: olegtarasov/get-tag@v2.1
-        id: tagName
-
-      # Configure Caching
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-        # Dependencies
-      - name: 'Install Release Dependencies'
-        run: |
-          rm -rf vendor
-          sudo npm i tar-to-zip -g
-          composer install --no-dev --prefer-dist --no-interaction --verbose
-          sudo chmod +x ./.github/scripts/*
-
-      - name: Get version
-        run: .github/scripts/version.sh
-
-      - name: Build Distro
-        run: .github/scripts/build.sh
-
-      - name: Upload S3
-        uses: shallwefootball/s3-upload-action@v1.1.3
-        with:
-          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
-          source_dir: 'dist'
-          destination_dir: ''
-
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.0
-        with:
-          # DISCORD_MSG is defined in versions.sh
-          args: '{{ DISCORD_MSG }}'
-
-  # This runs after all of the tests, run have run. Creates a cleaned up version of the
-  # distro, and then creates the artifact to push up to S3 or wherever
-   # https://github.com/actions/create-release
-  release:
-    name: 'Create Release'
-    needs: build
-    runs-on: 'ubuntu-18.04'
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-
-      - uses: olegtarasov/get-tag@v2.1
-        id: tagName
-
-      # Configure Caching
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-        # Dependencies
-      - name: 'Install Release Dependencies'
-        run: |
-          rm -rf vendor
-          sudo npm i tar-to-zip -g
-          composer install --no-dev --prefer-dist --no-interaction --verbose
-          sudo chmod +x ./.github/scripts/*
-
-      - name: Get version
-        run: .github/scripts/version.sh
-
-      - name: Build Distro
-        run: .github/scripts/build.sh
-
-      - name: Upload S3
-        uses: shallwefootball/s3-upload-action@v1.1.3
-        with:
-          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
-          source_dir: 'dist'
-          destination_dir: ''
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Get version
-        run: .github/scripts/version.sh
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: true
-          prerelease: false
-
-      # Upload the tar file to the release
-      - name: Upload Tar Asset
-        id: upload-tar-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/{{TAR_NAME}}
-          asset_name: '{{ TAR_NAME }}'
-          asset_content_type: application/gzip
-
-      # upload the zip file to the release
-      - name: Upload Zip Asset
-        id: upload-zip-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/{{ZIP_NAME}}
-          asset_name: '{{ ZIP_NAME }}'
-          asset_content_type: application/zip
-
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.0
-        with:
-          # DISCORD_MSG is defined in versions.sh
-          args: '{{ DISCORD_MSG }}'

.travis.yml

@@ -0,0 +1,160 @@
+#
+# Travis CI config file
+#
+
+language: php
+php:
+  - '7.4'
+  - '7.3'
+
+#env:
+#  - DB=mysql
+#  - DB=mariadb
+
+cache:
+  # Cache lives for 10 min
+  # Default of 3m might not be long enough for all the runs
+  timeout: 600
+  directories:
+  - "$HOME/.composer/cache"
+  - "$HOME/.npm"
+
+services:
+- mysql
+
+#addons:
+#  mariadb: '10.2'
+
+install:
+  - php --version
+  - mysql --version
+  - composer install --dev --no-interaction --verbose
+  - npm i tar-to-zip -g
+  - cp .travis/env.travis.php env.php
+  - cp .travis/phpunit.travis.xml phpunit.xml
+
+before_script:
+  - php artisan database:create --reset
+  - php artisan migrate:refresh --seed
+
+script:
+  - vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
+  - vendor/bin/phpunit --debug --verbose
+
+after_failure:
+  - cat storage/logs/*.log
+
+# Refer to: https://github.com/doctrine/dbal/blob/master/.travis.yml#L39
+jobs:
+  include:
+    # Different test stages
+#    - stage: Test
+#      name: PHP 7.2 + MySQL 5.7
+#      php: 7.2
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.3 + MySQL 5.7
+#      php: 7.3
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.4 + MySQL 5.7
+#      php: 7.4
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.1
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.1
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.1
+#      php: 7.4
+#      env: DB=mariadb MARIADB_VERSION=10.1
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.2
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.2
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.3
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.3
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+
+    # Just packages up a release
+    - stage: package
+      script: skip
+      before_deploy:
+        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
+
+      # Configure the conditional deployment
+      # https://docs.travis-ci.com/user/deployment/#examples-of-conditional-deployment
+      deploy:
+        - provider: script
+          skip_cleanup: true
+          script: ./.travis/deploy_script.sh
+          on:
+            all_branches: true
+            repo: nabeelio/phpvms
+            php: '7.4'
+            tags: false
+
+    # RELEASE STAGE
+    # Only runs when there's a tag applied to this release (tag should be the version)
+    # This uses Github Releases and posts it there (provider: releases)
+    # https://docs.travis-ci.com/user/deployment/releases
+    - stage: release
+      script: skip
+      before_deploy:
+        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
+        - ./.travis/deploy_script.sh
+      deploy:
+        provider: releases
+        skip_cleanup: true
+        api_key: $GITHUB_TOKEN
+        file_glob: true
+        file: build/*
+        on:
+          tags: true
+          repo: nabeelio/phpvms
+          php: '7.4'

.travis/deploy_script.sh

@@ -1,12 +1,52 @@
 #!/usr/bin/env bash
 
+if [ "$TRAVIS" != "true" ]; then
+  exit 0
+fi
+
+cd $TRAVIS_BUILD_DIR
+
+if test "$TRAVIS_TAG"; then
+  VERSION=$TRAVIS_TAG
+
+  # Pass in the tag as the version to write out
+  php artisan phpvms:version --write --write-full-version "${VERSION}"
+  FULL_VERSION=$(php artisan phpvms:version)
+else
+  echo "On branch $TRAVIS_BRANCH"
+
+  if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+    echo "Not on valid branch, exiting"
+    exit 0
+  fi
+
+  # Write the version out but place the branch ID in there
+  # This is only for the dev branch
+  BASE_VERSION=$(php artisan phpvms:version --base-only)
+
+  # This now includes the pre-release version, so "-dev" by default
+  VERSION=${BASE_VERSION}
+
+  # Don't pass in a version here, just write out the latest hash
+  php artisan phpvms:version --write "${VERSION}"
+  FULL_VERSION=$(php artisan phpvms:version)
+fi
+
+FILE_NAME="phpvms-${VERSION}"
+TAR_NAME="$FILE_NAME.tar.gz"
+ZIP_NAME="$FILE_NAME.zip"
+
 echo "Version: ${VERSION}"
 echo "Full Version: ${FULL_VERSION}"
 echo "Package name: ${TAR_NAME}"
-echo "Current directory: ${BASE_DIR}"
+
+echo "==========================="
 
 echo "Cleaning files"
 
+rm -rf vendor
+composer install --no-dev --prefer-dist --no-interaction --verbose
+
 # Leftover individual files to delete
 declare -a remove_files=(
   .git
@@ -67,20 +107,44 @@ mkdir -p storage/framework/cache
 mkdir -p storage/framework/sessions
 mkdir -p storage/framework/views
 
+# Regenerate the autoloader and classes
+composer dump-autoload
+make clean
+
 cd /tmp
+ls -al $TRAVIS_BUILD_DIR/../
 
-ls -al $BASE_DIR/../
-
-tar -czf $TAR_NAME -C $BASE_DIR .
+tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR .
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
 tar2zip $TAR_NAME
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
 
 ls -al /tmp
 
-echo "Moving to dist"
-mkdir -p $BASE_DIR/dist
-cd $BASE_DIR/dist
+echo "Uploading to S3"
+mkdir -p $TRAVIS_BUILD_DIR/build
+cd $TRAVIS_BUILD_DIR/build
 
 mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" "/tmp/$ZIP_NAME.sha256" .
+artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256 $ZIP_NAME.sha256
 
+# Upload the version for a tagged release. Move to a version file in different
+# tags. Within phpVMS, we have an option of which version to track in the admin
+if test "$TRAVIS_TAG"; then
+  echo "Uploading release version file"
+  cp "$TRAVIS_BUILD_DIR/VERSION" release_version
+  artifacts upload --target-paths "/" release_version
+else
+  echo "Uploading ${TRAVIS_BRANCH}_version file"
+  cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
+  artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
+fi
+
+#if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+#  echo "Skipping Discord branch update broadcast"
+#else
+  curl -X POST \
+       --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" \
+       -H "Content-Type: application/json" \
+       $DISCORD_WEBHOOK_URL
+#fi

.travis/env.travis.php

@@ -1,3 +1,7 @@
+<?php
+exit();
+?>
+
 APP_ENV="dev"
 APP_KEY="base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY="
 APP_URL="http://localhost"

README.md

@@ -1,15 +1,18 @@
-# phpVMS <sup>7</sup>
+# phpvms <sup>7</sup>
 
-[![Build](https://github.com/nabeelio/phpvms/workflows/Build/badge.svg?branch=dev)](https://github.com/nabeelio/phpvms/actions) [![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)
+[![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](https://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](http://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.3+, extensions:
   - cURL
@@ -21,22 +24,22 @@ 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](https://docs.phpvms.net/requirements)
+[View more details on requirements](http://docs.phpvms.net/setup/requirements)
 
-### Installer
+## Installer
 
 1. Upload to your server
 1. Visit the site, and follow the link to the installer
 
-[View installation details](https://docs.phpvms.net/installation/installation)
+[View installation details](http://docs.phpvms.net/setup/installation)
 
-## Development Environment
+# development environment
 
 A full development environment can be brought up using Docker:
 
 ```bash
 composer install
-npm install
+yarn install
 docker-compose build
 docker-compose up
 ```
@@ -47,7 +50,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

@@ -92,9 +92,8 @@ class CreateDatabase extends Command
         }
 
         if ($this->option('reset') === true) {
-            if (file_exists($dbPath)) {
-                unlink(config($dbkey.'database'));
-            }
+            $cmd = ['rm', '-rf', config($dbkey.'database')];
+            $this->runCommand($cmd);
         }
 
         if (!file_exists($dbPath)) {

app/Console/Commands/DevInstall.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use App\Services\Installer\ConfigService;
+use Modules\Installer\Services\ConfigService;
 
 /**
  * Create a fresh development install

app/Console/Commands/YamlExport.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use Illuminate\Support\Facades\DB;
+use DB;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -25,20 +25,6 @@ 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/Console/Kernel.php

@@ -13,11 +13,7 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 class Kernel extends ConsoleKernel
 {
     /**
-     * Define the application's command schedule. How this works... according to the command
-     * time, an event gets send out with the appropriate time (e.g, hourly sends an hourly event)
-     *
-     * Then the CronServiceProvider has the list of cronjobs which then run according to the events
-     * and then calls those at the proper times.
+     * Define the application's command schedule.
      *
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
@@ -31,13 +27,10 @@ class Kernel extends ConsoleKernel
         $schedule->command(Hourly::class)->hourly();
 
         // When spatie-backups runs
-        /*if (config('backup.backup.enabled', false) === true) {
-            $schedule->command('backup:clean')->daily()->at('01:00');
-            $schedule->command('backup:run')->daily()->at('02:00');
-        }*/
+        $schedule->command('backup:clean')->daily()->at('01:00');
+        $schedule->command('backup:run')->daily()->at('02:00');
 
         // Update the last time the cron was run
-        /** @var CronService $cronSvc */
         $cronSvc = app(CronService::class);
         $cronSvc->updateLastRunTime();
     }

app/Contracts/Award.php

@@ -36,10 +36,7 @@ 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/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 Airline
+     * @return \Illuminate\Database\Eloquent\Model
      */
-    public function getAirline($code): Airline
+    public function getAirline($code)
     {
         $airline = Airline::firstOrCreate([
             'icao' => $code,

app/Contracts/Metar.php

@@ -12,24 +12,13 @@ abstract class Metar
 {
     /**
      * Implement retrieving the METAR - return the METAR string. Needs to be protected,
-     * since this shouldn't be directly called. Call `metar($icao)`. If not implemented,
-     * return a blank string
+     * since this shouldn't be directly called. Call `get_metar($icao)` instead
      *
      * @param $icao
      *
      * @return mixed
      */
-    abstract protected function get_metar($icao): string;
-
-    /**
-     * Implement retrieving the TAF - return the string. Call `taf($icao)`. If not implemented,
-     * return a blank string
-     *
-     * @param $icao
-     *
-     * @return mixed
-     */
-    abstract protected function get_taf($icao): string;
+    abstract protected function metar($icao): string;
 
     /**
      * Download the METAR, wrap in caching
@@ -38,9 +27,9 @@ abstract class Metar
      *
      * @return string
      */
-    public function metar($icao): string
+    public function get_metar($icao): string
     {
-        $cache = config('cache.keys.METAR_WEATHER_LOOKUP');
+        $cache = config('cache.keys.WEATHER_LOOKUP');
         $key = $cache['key'].$icao;
 
         if (Cache::has($key)) {
@@ -51,7 +40,7 @@ abstract class Metar
         }
 
         try {
-            $raw_metar = $this->get_metar($icao);
+            $raw_metar = $this->metar($icao);
         } catch (\Exception $e) {
             Log::error('Error getting METAR: '.$e->getMessage(), $e->getTrace());
             return '';
@@ -63,37 +52,4 @@ abstract class Metar
 
         return $raw_metar;
     }
-
-    /**
-     * Download the TAF, wrap in caching
-     *
-     * @param $icao
-     *
-     * @return string
-     */
-    public function taf($icao): string
-    {
-        $cache = config('cache.keys.TAF_WEATHER_LOOKUP');
-        $key = $cache['key'].$icao;
-
-        if (Cache::has($key)) {
-            $taf = Cache::get($key);
-            if ($taf !== '') {
-                return $taf;
-            }
-        }
-
-        try {
-            $taf = $this->get_taf($icao);
-        } catch (\Exception $e) {
-            Log::error('Error getting TAF: '.$e->getMessage(), $e->getTrace());
-            return '';
-        }
-
-        if ($taf !== '') {
-            Cache::put($key, $taf, $cache['time']);
-        }
-
-        return $taf;
-    }
 }

app/Contracts/Migration.php

@@ -3,11 +3,8 @@
 namespace App\Contracts;
 
 use App\Support\Database;
-use Exception;
-use Illuminate\Support\Facades\DB;
+use DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
 
 /**
  * Class Migration
@@ -28,29 +25,6 @@ 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
      *
@@ -61,7 +35,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);
         }
@@ -78,7 +52,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;
@@ -86,22 +60,4 @@ 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

@@ -1,49 +0,0 @@
-<?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/Repository.php

@@ -6,7 +6,8 @@ use Illuminate\Validation\Validator;
 use Prettus\Repository\Eloquent\BaseRepository;
 
 /**
- * @mixin \Prettus\Repository\Eloquent\BaseRepository
+ * @mixin Model
+ * @mixin BaseRepository
  */
 abstract class Repository extends BaseRepository
 {

app/Cron/Hourly/DeletePireps.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Cron\Hourly;
-
-use App\Contracts\Listener;
-use App\Events\CronHourly;
-use App\Models\Enums\PirepState;
-use App\Models\Pirep;
-use App\Services\PirepService;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
-
-/**
- * Remove cancelled/deleted PIREPs. Look for PIREPs that were created before the setting time
- * (e.g, 12 hours ago) and are marked with the
- */
-class DeletePireps extends Listener
-{
-    /**
-     * Remove expired bids
-     *
-     * @param CronHourly $event
-     *
-     * @throws \Exception
-     */
-    public function handle(CronHourly $event): void
-    {
-        $this->deletePireps(setting('pireps.delete_rejected_hours'), PirepState::REJECTED);
-        $this->deletePireps(setting('pireps.delete_cancelled_hours'), PirepState::CANCELLED);
-    }
-
-    /**
-     * Look for and delete PIREPs which match the criteria
-     *
-     * @param int $expire_time_hours The time in hours to look for PIREPs
-     * @param int $state             The PirepState enum value
-     */
-    protected function deletePireps(int $expire_time_hours, int $state)
-    {
-        $dt = Carbon::now()->subHours($expire_time_hours);
-        $pireps = Pirep::whereDate('created_at', '<', $dt)->where(['state' => $state])->get();
-
-        /** @var PirepService $pirepSvc */
-        $pirepSvc = app(PirepService::class);
-
-        /** @var Pirep $pirep */
-        foreach ($pireps as $pirep) {
-            Log::info('Cron: Deleting PIREP id='.$pirep->id.', state='.PirepState::label($state));
-            $pirepSvc->delete($pirep);
-        }
-    }
-}

app/Cron/Monthly/ApplyExpenses.php

@@ -6,7 +6,6 @@ use App\Contracts\Listener;
 use App\Events\CronMonthly;
 use App\Models\Enums\ExpenseType;
 use App\Services\Finance\RecurringFinanceService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Go through and apply any finances that are daily
@@ -36,7 +35,6 @@ class ApplyExpenses extends Listener
      */
     public function handle(CronMonthly $event): void
     {
-        Log::info('Monthly: Applying monthly expenses');
         $this->financeSvc->processExpenses(ExpenseType::MONTHLY);
     }
 }

app/Cron/Nightly/ApplyExpenses.php

@@ -6,7 +6,6 @@ use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Models\Enums\ExpenseType;
 use App\Services\Finance\RecurringFinanceService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Go through and apply any finances that are daily
@@ -36,7 +35,6 @@ class ApplyExpenses extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Applying daily expenses');
         $this->financeSvc->processExpenses(ExpenseType::DAILY);
     }
 }

app/Cron/Nightly/ClearExpiredSimbrief.php

@@ -5,7 +5,6 @@ namespace App\Cron\Nightly;
 use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Services\SimBriefService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Clear any expired SimBrief flight briefs that aren't attached to a PIREP
@@ -24,7 +23,6 @@ class ClearExpiredSimbrief extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Removing expired Simbrief entries');
         $this->simbriefSvc->removeExpiredEntries();
     }
 }

app/Cron/Nightly/NewVersionCheck.php

@@ -5,7 +5,6 @@ namespace App\Cron\Nightly;
 use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Services\VersionService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Determine if any pilots should be set to ON LEAVE status
@@ -29,7 +28,6 @@ class NewVersionCheck extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Checking for new version');
         $this->versionSvc->isNewVersionAvailable();
     }
 }

app/Cron/Nightly/PilotLeave.php

@@ -4,8 +4,10 @@ namespace App\Cron\Nightly;
 
 use App\Contracts\Listener;
 use App\Events\CronNightly;
+use App\Models\Enums\UserState;
+use App\Models\User;
 use App\Services\UserService;
-use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
 
 /**
  * Determine if any pilots should be set to ON LEAVE status
@@ -16,8 +18,6 @@ class PilotLeave extends Listener
 
     /**
      * PilotLeave constructor.
-     *
-     * @param UserService $userSvc
      */
     public function __construct(UserService $userSvc)
     {
@@ -34,9 +34,13 @@ class PilotLeave extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Cron: Running pilot leave check');
-        $users = $this->userSvc->findUsersOnLeave();
-        Log::info('Found '.count($users).' users on leave');
+        if (setting('pilots.auto_leave_days') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subDay(setting('pilots.auto_leave_days'));
+        $users = User::where('status', UserState::ACTIVE)
+           ->whereDate('updated_at', '<', $date);
 
         foreach ($users as $user) {
             Log::info('Setting user '.$user->ident.' to ON LEAVE status');

app/Cron/Nightly/RecalculateBalances.php

@@ -35,7 +35,7 @@ class RecalculateBalances extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Recalculating balances');
+        Log::info('Recalculating balances');
 
         $journals = Journal::all();
         foreach ($journals as $journal) {

app/Cron/Nightly/RecalculateStats.php

@@ -32,10 +32,10 @@ class RecalculateStats extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Recalculating user stats');
+        Log::info('Recalculating user stats');
         $this->userSvc->recalculateAllUserStats();
 
-        Log::info('Nightly: Recalcuating aircraft status');
+        Log::info('Recalcuating aircraft status');
         $this->aircraftSvc->recalculateStats();
     }
 }

app/Cron/Nightly/SetActiveFlights.php

@@ -19,8 +19,6 @@ class SetActiveFlights extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Setting active flights');
-
         $this->checkFlights();
     }
 
@@ -44,18 +42,23 @@ class SetActiveFlights extends Listener
                 continue;
             }
 
-            // Set to visible by default
-            $flight->visible = true;
-
             // dates aren't set, so just save if there were any changes above
             // and move onto the next one
             if ($flight->start_date === null || $flight->end_date === null) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $flight->visible = Days::isToday($flight->days);
-                    if (!$flight->visible) {
-                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
-                            .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
+                    $visible = Days::isToday($flight->days);
+                    if ($flight->visible !== $visible) {
+                        Log::info('Flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden'));
+
+                        $flight->visible = $visible;
+                        if ($visible === false) {
+                            Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
+                                .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
+                        }
                     }
+                } else {
+                    Log::info('Toggling flight '.$flight->ident.' to visible');
+                    $flight->visible = true;
                 }
 
                 $flight->save();
@@ -68,11 +71,20 @@ class SetActiveFlights extends Listener
             // and then make sure if days of the week are specified, check that too
             if ($today->gte($flight->start_date) && $today->lte($flight->end_date)) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $flight->visible = Days::isToday($flight->days);
-                    if (!$flight->visible) {
-                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
+                    $visible = Days::isToday($flight->days);
+                    if ($flight->visible !== $visible) {
+                        Log::info('Toggling flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden').'');
+
+                        $flight->visible = $visible;
+                        if ($visible === false) {
+                            Log::info('Today='.date('N').', start='.$flight->start_date
+                                .', end='.$flight->end_date.', mask='.$flight->days.', in='
                                 .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
+                        }
                     }
+                } else {
+                    Log::info('Toggling flight '.$flight->ident.' to visible');
+                    $flight->visible = true;
                 }
             } else {
                 $flight->visible = false;

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -5,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;
 
 class RolesPermissionsTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         // Create table for storing roles
@@ -74,6 +79,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('password_resets', function (Blueprint $table) {
@@ -15,6 +20,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateSessionsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('sessions', function (Blueprint $table) {
@@ -18,6 +23,11 @@ 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,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirlinesTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('airlines', function (Blueprint $table) {
@@ -27,6 +32,11 @@ 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,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateFaresTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('fares', function (Blueprint $table) {
@@ -20,6 +25,11 @@ 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,6 +7,11 @@ 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,6 +5,11 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateRanksTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('ranks', function (Blueprint $table) {
@@ -25,6 +30,11 @@ 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,6 +3,9 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
+/**
+ * Class CreateSubfleetTables
+ */
 class CreateSubfleetTables extends Migration
 {
     public function up()
@@ -45,6 +48,11 @@ 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,6 +7,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateBidsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('bids', function (Blueprint $table) {
@@ -20,6 +25,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJobsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('jobs', function (Blueprint $table) {
@@ -19,6 +24,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateFailedJobsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
@@ -18,6 +23,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateNavdataTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         /*
@@ -26,6 +31,11 @@ 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,6 +7,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateAcarsTables extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('acars', function (Blueprint $table) {
@@ -39,6 +44,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateStatsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('stats', function (Blueprint $table) {
@@ -20,6 +25,11 @@ 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,6 +17,11 @@ 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,10 +3,14 @@
 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) {
@@ -19,6 +23,7 @@ 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();
 
@@ -33,20 +38,13 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJournalTransactionsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('journal_transactions', function (Blueprint $table) {
@@ -29,6 +34,11 @@ 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,6 +6,11 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateJournalsTable extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('journals', function (Blueprint $table) {
@@ -19,6 +24,11 @@ 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,7 +1,6 @@
 <?php
 
 use App\Contracts\Migration;
-use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -15,7 +14,7 @@ class CreateFilesTable extends Migration
     public function up()
     {
         Schema::create('files', function (Blueprint $table) {
-            $table->string('id', Model::ID_MAX_LENGTH);
+            $table->string('id', \App\Contracts\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,12 +1,17 @@
 <?php
 
-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\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) {
@@ -19,6 +24,11 @@ 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,19 +1,21 @@
 <?php
 
-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\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) {
@@ -27,6 +29,11 @@ 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,11 +1,16 @@
 <?php
 
-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\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) {
@@ -18,6 +23,11 @@ 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,16 +1,18 @@
 <?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
@@ -23,4 +25,13 @@ 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,15 +5,27 @@ 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,6 +18,11 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
 /**
@@ -25,4 +25,13 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
 /**
@@ -8,10 +8,24 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\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,6 +22,11 @@ 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 App\Contracts\Migration;
+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 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,6 +18,11 @@ 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,4 +19,16 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -33,4 +33,13 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -15,4 +15,13 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2020_03_27_174238_create_pages.php

@@ -1,7 +1,7 @@
 <?php
 
-use App\Contracts\Migration;
 use App\Models\Enums\PageType;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -11,6 +11,11 @@ use Illuminate\Support\Facades\Schema;
  */
 class CreatePages extends Migration
 {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
     public function up()
     {
         Schema::create('pages', function (Blueprint $table) {
@@ -28,6 +33,11 @@ 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 App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -9,7 +9,11 @@ class AirlineRemoveNullable extends Migration
     public function up()
     {
         Schema::table('airlines', function (Blueprint $table) {
-            $table->dropUnique(['iata']);
+            $table->dropUnique('airlines_iata_unique');
         });
     }
+
+    public function down()
+    {
+    }
 }

app/Database/migrations/2020_03_28_174238_page_icon_nullable.php

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

app/Database/migrations/2020_06_09_141153_pages_add_link.php

@@ -1,15 +1,15 @@
 <?php
 
-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\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
 {
+    /**
+     * 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
+     */
     public function up()
     {
         Schema::table('pages', function (Blueprint $table) {
@@ -23,6 +23,9 @@ class PagesAddLink extends Migration
         });
     }
 
+    /**
+     * @return void
+     */
     public function down()
     {
         Schema::table('fares', function (Blueprint $table) {

app/Database/migrations/2020_07_21_141153_create_user_fields.php

@@ -5,11 +5,11 @@ 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
 {
+    /**
+     * Add two tables for holding user fields and the values
+     */
     public function up()
     {
         /*
@@ -39,4 +39,11 @@ class CreateUserFields extends Migration
             $table->index(['user_field_id', 'user_id']);
         });
     }
+
+    /**
+     * @return void
+     */
+    public function down()
+    {
+    }
 }

app/Database/migrations/2020_09_03_141152_aircraft_add_mtow.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Contracts\Migration;
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -19,6 +19,11 @@ class AircraftAddMtow extends Migration
         });
     }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
     public function down()
     {
         Schema::table('aircraft', function (Blueprint $table) {

app/Database/migrations/2020_09_30_081536_create_modules_table.php

@@ -1,29 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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

@@ -1,19 +0,0 @@
-<?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/migrations/2021_01_17_044305_add_hub_to_subfleets.php

@@ -1,20 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Add a hub to the subfleet is
- */
-class AddHubToSubfleets extends Migration
-{
-    public function up()
-    {
-        Schema::table('subfleets', function (Blueprint $table) {
-            $table->string('hub_id', 4)
-                ->nullable()
-                ->after('airline_id');
-        });
-    }
-}

app/Database/migrations/2021_02_10_044305_change_acars_vs_type.php

@@ -1,18 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Change the vertical speed for the acars table to a double
- */
-class ChangeAcarsVsType extends Migration
-{
-    public function up()
-    {
-        Schema::table('acars', function (Blueprint $table) {
-            $table->float('vs')->change()->default(0.0)->nullable();
-        });
-    }
-}

app/Database/migrations/2021_02_11_044305_update_sessions_table.php

@@ -1,19 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Bring the sessions table in line with the latest
- */
-class UpdateSessionsTable extends Migration
-{
-    public function up()
-    {
-        Schema::table('sessions', function (Blueprint $table) {
-            $table->index('user_id');
-            $table->index('last_activity');
-        });
-    }
-}

app/Database/migrations/2021_02_23_150601_aircraft_add_fuelonboard.php

@@ -1,21 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Add a `fuel_onboard` column for recording what is left in tanks
- */
-class AircraftAddFuelonboard extends Migration
-{
-    public function up()
-    {
-        Schema::table('aircraft', function (Blueprint $table) {
-            $table->unsignedDecimal('fuel_onboard')
-                ->nullable()
-                ->default(0.0)
-                ->after('zfw');
-        });
-    }
-}

app/Database/migrations/2021_02_23_205630_add_sbtype_to_subfleets.php

@@ -1,20 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Add a SimBrief Type to subfleet
- */
-class AddSbtypeToSubfleets extends Migration
-{
-    public function up()
-    {
-        Schema::table('subfleets', function (Blueprint $table) {
-            $table->string('simbrief_type', 20)
-                ->nullable()
-                ->after('type');
-        });
-    }
-}

app/Database/migrations/2021_03_01_044305_add_aircraft_to_simbrief.php

@@ -1,24 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Add a hub to the subfleet is
- */
-class AddAircraftToSimbrief extends Migration
-{
-    public function up()
-    {
-        Schema::table('simbrief', function (Blueprint $table) {
-            $table->unsignedInteger('aircraft_id')
-                ->nullable()
-                ->after('pirep_id');
-
-            // Temp column to hold the calculated fare data for the API
-            // Remove this once the prefile to acars feature is completed
-            $table->mediumText('fare_data')->nullable()->after('ofp_xml');
-        });
-    }
-}

app/Database/migrations/2021_03_05_044305_add_kvp_table.php

@@ -1,19 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-/**
- * Add a hub to the subfleet is
- */
-class AddKvpTable extends Migration
-{
-    public function up()
-    {
-        Schema::create('kvp', function (Blueprint $table) {
-            $table->string('key')->index();
-            $table->string('value');
-        });
-    }
-}

app/Database/seeds/DatabaseSeeder.php

@@ -1,21 +1,15 @@
 <?php
 
-use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    /** @var MigrationService */
-    private $migrationSvc;
-
-    /** @var SeederService */
-    private $seederSvc;
+    private $seederService;
 
     public function __construct()
     {
-        $this->migrationSvc = app(MigrationService::class);
-        $this->seederSvc = app(SeederService::class);
+        $this->seederService = app(SeederService::class);
     }
 
     /**
@@ -25,12 +19,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // 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();
+        $this->seederService->syncAllSeeds();
     }
 }

app/Database/seeds/dev/.gitignore

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

app/Database/seeds/dev/sample.yml

@@ -1,10 +1,30 @@
 
+#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
@@ -116,91 +136,34 @@ airports:
     ground_handling_cost: 50
 #
 aircraft:
-  -
-    id: 1
+  - id: 1
     subfleet_id: 1
-    icao: B744
-    iata: 744
     airport_id: KJFK
-    landing_time: '2020-10-23 07:50:16'
-    name: 'Boeing 747-438'
+    name: Boeing 747-438
     registration: 001Z
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
-    flight_time: 540
+    flight_time: 360
     status: A
-    state: 0
-    created_at: null
-    updated_at: '2020-10-23 07:50:16'
-  -
-    id: 2
+  - id: 2
     subfleet_id: 2
-    icao: B777
-    iata: 777
     airport_id: LGRP
-    landing_time: null
-    name: 'Boeing 777-200'
+    name: Boeing 777-200
     registration: C202
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
     flight_time: 260
     status: A
-    state: 0
-    created_at: null
-    updated_at: null
-  -
-    id: 3
+  - id: 3
     subfleet_id: 1
-    icao: B744
-    iata: 744
     airport_id: KAUS
-    landing_time: '2020-10-24 08:50:13'
-    name: 'Boeing 747-412'
+    name: Boeing 747-412
     registration: S2333
-    hex_code: null
-    mtow: '0.00'
-    zfw: '0.00'
-    flight_time: 180
-    status: A
-    state: 0
-    created_at: null
-    updated_at: '2020-10-24 08:50:13'
-  -
-    id: 4
-    subfleet_id: 1
-    icao: B744
-    iata: 744
-    airport_id: KAUS
-    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'
+  - id: 4
+    subfleet_id: 1
+    airport_id: KAUS
+    name: Boeing 747-436 RETIRED
+    registration:
+    flight_time: 45
+    status: R
 
 expenses:
   - name: Per-Flight (no muliplier)
@@ -257,192 +220,68 @@ expenses:
     updated_at: now
 
 fares:
-  -
-    id: 1
-    code: 'Y'
+  - id: 1
+    code: Y
     name: Economy
-    price: '100.00'
-    cost: '0.00'
+    price: 100
     capacity: 200
-    type: 0
-    notes: null
-    active: 1
-    created_at: null
-    updated_at: null
-  -
-    id: 2
+  - id: 2
     code: B
     name: Business
-    price: '500.00'
-    cost: '0.00'
+    price: 500
     capacity: 10
-    type: 0
-    notes: null
-    active: 1
-    created_at: null
-    updated_at: null
-  -
-    id: 3
+  - id: 3
     code: F
     name: First-Class
-    price: '800.00'
-    cost: '0.00'
+    price: 800
     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
-    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
+    cost_block_hour: 1000
+    ground_handling_multiplier: 200
+  - id: 2
     airline_id: 1
+    name: 777-222ER GE90-76B
     type: 772-22ER-GE90-76B
-    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
+    cost_block_hour: 500
+    ground_handling_multiplier: 150
+  - id: 3
     airline_id: 1
+    name: 777-367 ER GE90-115B
     type: 772-36ER-GE90-115B
-    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'
+    cost_block_hour: 100
+    ground_handling_multiplier: 150
 
+# add a few mods to aircraft and fares
 subfleet_fare:
-  -
-    subfleet_id: 1
+
+  # Fare classes on the 747
+  - subfleet_id: 1
     fare_id: 1
-    price: '200'
-    cost: null
-    capacity: '400'
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 1
+    price: 200
+    capacity: 400
+  - subfleet_id: 1
     fare_id: 2
     price: 120%
-    cost: null
-    capacity: null
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 1
+  - subfleet_id: 1
     fare_id: 3
-    price: '1000'
-    cost: null
+    price: 1000
     capacity: 110%
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 2
+
+  # Fare classes on the 777
+  - subfleet_id: 2
     fare_id: 1
-    price: null
-    cost: null
-    capacity: null
-    created_at: null
-    updated_at: null
-  -
-    subfleet_id: 2
+  - 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
+    capacity: 10
+
 subfleet_rank:
-  -
-    rank_id: 1
+  - 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
@@ -520,35 +359,6 @@ 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
@@ -579,24 +389,12 @@ flight_subfleet:
     flight_id: flightid_4
 
 bids:
-  -
-    id: 100
+  - id: 100
     user_id: 1
     flight_id: flightid_1
-    created_at: now
-    updated_at: now
-  -
-    id: 101
+  - 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

@@ -92,10 +92,3 @@ user_field_values:
     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

@@ -1,10 +0,0 @@
-- 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

@@ -51,6 +51,3 @@
 - name: maintenance
   display_name: Maintenance
   description: Run maintenance tasks
-- name: modules
-  display_name: Modules
-  description: Add/Edit Modules

app/Database/seeds/settings.yml

@@ -130,20 +130,6 @@
   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
@@ -180,12 +166,12 @@
   type: number
   description: 'How much the load factor can vary per-flight'
 - key: simbrief.api_key
-  name: 'Simbrief API Key'
+  name: 'SimBrief API Key'
   group: simbrief
   value: ''
   options: ''
   type: string
-  description: 'Your Simbrief API key'
+  description: 'Your SimBrief API key'
 - key: simbrief.only_bids
   name: 'Only allow for bids'
   group: simbrief
@@ -194,47 +180,12 @@
   type: boolean
   description: 'Only allow briefs to be created for bidded flights'
 - key: simbrief.expire_days
-  name: 'Simbrief Expire Time'
+  name: 'SimBrief Expire Time'
   group: simbrief
   value: 5
   options: ''
   type: number
   description: 'Days after how long to remove unused briefs'
-- key: simbrief.noncharter_pax_weight
-  name: 'Non-Charter Passenger Weight'
-  group: simbrief
-  value: 185
-  options: ''
-  type: number
-  description: 'Passenger weight for non-charter flights excluding baggage (lbs)'
-- key: simbrief.noncharter_baggage_weight
-  name: 'Non-Charter Baggage Weight'
-  group: simbrief
-  value: 35
-  options: ''
-  type: number
-  description: 'Passenger baggage weight for non-charter flights (lbs)'
-- key: simbrief.charter_pax_weight
-  name: 'Charter Passenger Weight'
-  group: simbrief
-  value: 168
-  options: ''
-  type: number
-  description: 'Passenger weight for charter flights excluding baggage (lbs)'
-- key: simbrief.charter_baggage_weight
-  name: 'Charter Baggage Weight'
-  group: simbrief
-  value: 28
-  options: ''
-  type: number
-  description: 'Passenger baggage weight for charter flights (lbs)'
-- key: simbrief.callsign
-  name: 'Use ATC Callsign'
-  group: simbrief
-  value: false
-  options: ''
-  type: boolean
-  description: 'Use pilot ident as Simbrief ATC Callsign'
 - key: pireps.duplicate_check_time
   name: 'PIREP duplicate time check'
   group: pireps
@@ -263,27 +214,6 @@
   options: ''
   type: boolean
   description: 'When a PIREP is accepted, remove the bid, if it exists'
-- key: pireps.advanced_fuel
-  name: 'Advanced Fuel Calculations'
-  group: pireps
-  value: false
-  options: ''
-  type: boolean
-  description: 'Enables remaining fuel amounts to be considered for fuel expenses'
-- key: pireps.delete_cancelled_hours
-  name: 'Delete cancelled PIREPs'
-  group: pireps
-  value: 12
-  options: ''
-  type: int
-  description: 'The time in hours to delete a cancelled PIREP'
-- key: pireps.delete_rejected_hours
-  name: 'Delete rejected PIREPs'
-  group: pireps
-  value: 12
-  options: ''
-  type: int
-  description: 'The time in hours to delete a rejected PIREP'
 - key: pilots.id_length
   name: 'Pilot ID Length'
   group: pilots
@@ -361,9 +291,3 @@
   options: ''
   type: 'text'
   description: 'Discord public channel ID for broadcasat notifications'
-- key: 'cron.random_id'
-  name: 'Cron Randomized ID'
-  group: 'cron'
-  value: ''
-  type: 'hidden'
-  description: ''

app/Exceptions/Converters/ValidationException.php

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

app/Exceptions/CronInvalid.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class CronInvalid extends AbstractHttpException
-{
-    public const MESSAGE = 'Cron ID is disabled or invalid';
-
-    public function __construct()
-    {
-        parent::__construct(400, static::MESSAGE);
-    }
-
-    /**
-     * Return the RFC 7807 error type (without the URL root)
-     */
-    public function getErrorType(): string
-    {
-        return 'cron-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 [];
-    }
-}

app/Exceptions/ModuleExistsException.php

@@ -1,41 +0,0 @@
-<?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

@@ -1,38 +0,0 @@
-<?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 [];
-    }
-}

app/Exceptions/ModuleInvalidFileType.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class ModuleInvalidFileType extends AbstractHttpException
-{
-    public function __construct()
-    {
-        parent::__construct(
-            415,
-            'The Module File Type is Invalid!'
-        );
-    }
-
-    /**
-     * Return the RFC 7807 error type (without the URL root)
-     */
-    public function getErrorType(): string
-    {
-        return 'module-file-type-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 [];
-    }
-}

app/Http/Controllers/Admin/AircraftController.php

@@ -160,7 +160,6 @@ class AircraftController extends Controller
      */
     public function update($id, UpdateAircraftRequest $request)
     {
-        /** @var \App\Models\Aircraft $aircraft */
         $aircraft = $this->aircraftRepo->findWithoutFail($id);
 
         if (empty($aircraft)) {
@@ -172,7 +171,7 @@ class AircraftController extends Controller
         $this->aircraftRepo->update($attrs, $id);
 
         Flash::success('Aircraft updated successfully.');
-        return redirect(route('admin.aircraft.index').'?subfleet='.$aircraft->subfleet_id);
+        return redirect(route('admin.aircraft.index'));
     }
 
     /**
@@ -184,7 +183,6 @@ class AircraftController extends Controller
      */
     public function destroy($id)
     {
-        /** @var \App\Models\Aircraft $aircraft */
         $aircraft = $this->aircraftRepo->findWithoutFail($id);
 
         if (empty($aircraft)) {

app/Http/Controllers/Admin/AwardController.php

@@ -186,13 +186,13 @@ class AwardController extends Controller
     {
         $award = $this->awardRepository->findWithoutFail($id);
         if (empty($award)) {
-            Flash::error('Award not found');
+            Flash::error('Fare not found');
 
             return redirect(route('admin.awards.index'));
         }
 
         $this->awardRepository->delete($id);
-        Flash::success('Award deleted successfully.');
+        Flash::success('Fare deleted successfully.');
 
         return redirect(route('admin.awards.index'));
     }

app/Http/Controllers/Admin/FareController.php

@@ -12,7 +12,6 @@ use App\Repositories\FareRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
 
@@ -163,8 +162,6 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
-        Log::info('Deleting fare "'.$fare->name.'", id='.$fare->id);
-
         $this->fareRepo->delete($id);
 
         Flash::success('Fare deleted successfully.');

app/Http/Controllers/Admin/MaintenanceController.php

@@ -6,7 +6,6 @@ use App\Contracts\Controller;
 use App\Repositories\KvpRepository;
 use App\Services\CronService;
 use App\Services\VersionService;
-use App\Support\Utils;
 use Codedge\Updater\UpdaterManager;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
@@ -35,12 +34,7 @@ class MaintenanceController extends Controller
 
     public function index()
     {
-        // Get the cron URL
-        $cron_id = setting('cron.random_id');
-        $cron_url = empty($cron_id) ? 'Not enabled' : url(route('api.maintenance.cron', $cron_id));
-
         return view('admin.maintenance.index', [
-            'cron_url'            => $cron_url,
             'cron_path'           => $this->cronSvc->getCronExecString(),
             'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
             'new_version'         => $this->kvpRepo->get('new_version_available', false),
@@ -123,33 +117,4 @@ class MaintenanceController extends Controller
 
         return redirect('/update/downloader');
     }
-
-    /**
-     * Enable the cron, or if it's enabled, change the ID that is used
-     *
-     * @param Request $request
-     */
-    public function cron_enable(Request $request)
-    {
-        $id = Utils::generateNewId(24);
-        setting_save('cron.random_id', $id);
-
-        Flash::success('Web cron refreshed!');
-        return redirect(route('admin.maintenance.index'));
-    }
-
-    /**
-     * Disable the web cron
-     *
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function cron_disable(Request $request)
-    {
-        setting_save('cron.random_id', '');
-
-        Flash::success('Web cron disabled!');
-        return redirect(route('admin.maintenance.index'));
-    }
 }

app/Http/Controllers/Admin/ModulesController.php

@@ -1,122 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Contracts\Controller;
-use App\Services\ModuleService;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Redirector;
-use Illuminate\View\View;
-
-class ModulesController extends Controller
-{
-    private $moduleSvc;
-
-    public function __construct(ModuleService $moduleSvc)
-    {
-        $this->moduleSvc = $moduleSvc;
-    }
-
-    /**
-     * Display a listing of the Module.
-     *
-     * @return mixed
-     */
-    public function index()
-    {
-        $modules = $this->moduleSvc->getAllModules();
-        $new_modules = $this->moduleSvc->scan();
-        return view('admin.modules.index', [
-            'modules'     => $modules,
-            'new_modules' => $new_modules,
-        ]);
-    }
-
-    /**
-     * Show the form for creating a new Module.
-     *
-     * @return Application|Factory|View
-     */
-    public function create()
-    {
-        return view('admin.modules.create');
-    }
-
-    /**
-     * Store a newly Uploaded Module in the Storage.
-     *
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function store(Request $request)
-    {
-        $this->moduleSvc->installModule($request->file('module_file'));
-        return $this->index();
-    }
-
-    /**
-     * Show the form for editing the specified Module.
-     *
-     * @param $id
-     *
-     * @return Application|Factory|View
-     */
-    public function edit($id)
-    {
-        $module = $this->moduleSvc->getModule($id);
-        return view('admin.modules.edit', [
-            'module' => $module,
-        ]);
-    }
-
-    /**
-     * Update the specified Module in storage.
-     *
-     * @param $id
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function update($id, Request $request)
-    {
-        $this->moduleSvc->updateModule($id, $request->has('enabled'));
-        flash()->success('Module Status Changed!');
-        return redirect(route('admin.modules.index'));
-    }
-
-    /**
-     * Enabling Module Present in the Modules Folder
-     *
-     * @param Request $request
-     *
-     * @return Application|RedirectResponse|Redirector
-     */
-    public function enable(Request $request)
-    {
-        $this->moduleSvc->addModule($request->input('name'));
-        return redirect(route('admin.modules.index'));
-    }
-
-    /**
-     * Verify and Remove the specified Module from storage.
-     *
-     * @param mixed   $id
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function destroy($id, Request $request)
-    {
-        $delete = $this->moduleSvc->deleteModule($id, $request->all());
-        if ($delete == true) {
-            flash()->success('Module Deleted Successfully!');
-            return redirect(route('admin.modules.index'));
-        }
-        flash()->error('Verification Failed!');
-        return redirect(route('admin.modules.edit', $id));
-    }
-}

app/Http/Controllers/Admin/PirepController.php

@@ -394,10 +394,10 @@ class PirepController extends Controller
             return redirect(route('admin.pireps.index'));
         }
 
-        $this->pirepSvc->delete($pirep);
+        $this->pirepRepo->delete($id);
 
         Flash::success('Pirep deleted successfully.');
-        return redirect()->back();
+        return redirect(route('admin.pireps.index'));
     }
 
     /**

app/Http/Controllers/Admin/SettingsController.php

@@ -62,7 +62,7 @@ class SettingsController extends Controller
      */
     public function index()
     {
-        $settings = Setting::where('type', '!=', 'hidden')->orderBy('order')->get();
+        $settings = Setting::orderBy('order', 'asc')->get();
         $settings = $settings->groupBy('group');
 
         return view('admin.settings.index', [

app/Http/Controllers/Admin/SubfleetController.php

@@ -7,7 +7,6 @@ use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
 use App\Models\Airline;
-use App\Models\Airport;
 use App\Models\Enums\FareType;
 use App\Models\Enums\FuelType;
 use App\Models\Enums\ImportExportType;
@@ -134,7 +133,6 @@ class SubfleetController extends Controller
     {
         return view('admin.subfleets.create', [
             'airlines'   => Airline::all()->pluck('name', 'id'),
-            'hubs'       => Airport::where('hub', 1)->pluck('name', 'id'),
             'fuel_types' => FuelType::labels(),
         ]);
     }
@@ -205,7 +203,6 @@ class SubfleetController extends Controller
 
         return view('admin.subfleets.edit', [
             'airlines'    => Airline::all()->pluck('name', 'id'),
-            'hubs'        => Airport::where('hub', 1)->pluck('name', 'id'),
             'fuel_types'  => FuelType::labels(),
             'avail_fares' => $avail_fares,
             'avail_ranks' => $avail_ranks,

app/Http/Controllers/Admin/UserController.php

@@ -8,7 +8,6 @@ use App\Http\Requests\UpdateUserRequest;
 use App\Models\Rank;
 use App\Models\Role;
 use App\Models\User;
-use App\Models\UserAward;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
@@ -21,7 +20,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
-use League\ISO3166\ISO3166;
 use Prettus\Repository\Exceptions\RepositoryException;
 
 class UserController extends Controller
@@ -71,7 +69,7 @@ class UserController extends Controller
 
         return view('admin.users.index', [
             'users'   => $users,
-            'country' => new ISO3166(),
+            'country' => new \League\ISO3166\ISO3166(),
         ]);
     }
 
@@ -84,18 +82,13 @@ class UserController extends Controller
     {
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
-        $countries = collect((new ISO3166())->all())
-            ->mapWithKeys(function ($item, $key) {
-                return [strtolower($item['alpha2']) => $item['name']];
-            });
 
         return view('admin.users.create', [
             'user'      => null,
             'pireps'    => null,
             'airlines'  => $airlines,
             'timezones' => Timezonelist::toArray(),
-            'country'   => new ISO3166(),
-            'countries' => $countries,
+            'country'   => new \League\ISO3166\ISO3166(),
             'airports'  => $airports,
             'ranks'     => Rank::all()->pluck('name', 'id'),
             'roles'     => Role::all()->pluck('name', 'id'),
@@ -129,7 +122,31 @@ class UserController extends Controller
      */
     public function show($id)
     {
-        return $this->edit($id);
+        $user = $this->userRepo->findWithoutFail($id);
+
+        if (empty($user)) {
+            Flash::error('User not found');
+
+            return redirect(route('admin.users.index'));
+        }
+
+        $pireps = $this->pirepRepo
+            ->whereOrder(['user_id' => $id], 'created_at', 'desc')
+            ->paginate();
+
+        $airlines = $this->airlineRepo->selectBoxList();
+        $airports = $this->airportRepo->selectBoxList(false);
+
+        return view('admin.users.show', [
+            'user'      => $user,
+            'pireps'    => $pireps,
+            'airlines'  => $airlines,
+            'timezones' => Timezonelist::toArray(),
+            'country'   => new \League\ISO3166\ISO3166(),
+            'airports'  => $airports,
+            'ranks'     => Rank::all()->pluck('name', 'id'),
+            'roles'     => Role::all()->pluck('name', 'id'),
+        ]);
     }
 
     /**
@@ -137,14 +154,12 @@ class UserController extends Controller
      *
      * @param int $id
      *
-     * @throws RepositoryException
-     *
      * @return mixed
      */
     public function edit($id)
     {
         $user = $this->userRepo
-            ->with(['awards', 'fields', 'rank'])
+            ->with(['fields', 'rank'])
             ->findWithoutFail($id);
 
         if (empty($user)) {
@@ -156,7 +171,7 @@ class UserController extends Controller
             ->whereOrder(['user_id' => $id], 'created_at', 'desc')
             ->paginate();
 
-        $countries = collect((new ISO3166())->all())
+        $countries = collect((new \League\ISO3166\ISO3166())->all())
             ->mapWithKeys(function ($item, $key) {
                 return [strtolower($item['alpha2']) => $item['name']];
             });
@@ -167,7 +182,6 @@ class UserController extends Controller
         return view('admin.users.edit', [
             'user'      => $user,
             'pireps'    => $pireps,
-            'country'   => new ISO3166(),
             'countries' => $countries,
             'timezones' => Timezonelist::toArray(),
             'airports'  => $airports,
@@ -266,28 +280,6 @@ class UserController extends Controller
         return redirect(route('admin.users.index'));
     }
 
-    /**
-     * Remove the award from a user
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param mixed                    $id
-     * @param mixed                    $award_id
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy_user_award($id, $award_id, Request $request)
-    {
-        $userAward = UserAward::where(['user_id' => $id, 'award_id' => $award_id]);
-        if (empty($userAward)) {
-            Flash::error('The user award could not be found');
-            return redirect()->back();
-        }
-
-        $userAward->delete();
-
-        return redirect()->back();
-    }
-
     /**
      * Regenerate the user's API key
      *

app/Http/Controllers/Api/FlightController.php

@@ -7,10 +7,8 @@ use App\Exceptions\AssetNotFound;
 use App\Http\Resources\Flight as FlightResource;
 use App\Http\Resources\Navdata as NavdataResource;
 use App\Models\SimBrief;
-use App\Models\User;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
-use App\Services\FareService;
 use App\Services\FlightService;
 use Exception;
 use Illuminate\Http\Request;
@@ -20,26 +18,19 @@ use Prettus\Repository\Exceptions\RepositoryException;
 
 class FlightController extends Controller
 {
-    /** @var \App\Services\FareService */
-    private $fareSvc;
-
-    /** @var \App\Repositories\FlightRepository */
     private $flightRepo;
-
-    /** @var \App\Services\FlightService */
     private $flightSvc;
 
     /**
-     * @param FareService      $fareSvc
+     * FlightController constructor.
+     *
      * @param FlightRepository $flightRepo
      * @param FlightService    $flightSvc
      */
     public function __construct(
-        FareService $fareSvc,
         FlightRepository $flightRepo,
         FlightService $flightSvc
     ) {
-        $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
         $this->flightSvc = $flightSvc;
     }
@@ -63,13 +54,9 @@ class FlightController extends Controller
      */
     public function get($id)
     {
-        /** @var \App\Models\User $user */
         $user = Auth::user();
-
-        /** @var \App\Models\Flight $flight */
         $flight = $this->flightRepo->with([
             'airline',
-            'fares',
             'subfleets',
             'subfleets.aircraft',
             'subfleets.fares',
@@ -79,8 +66,7 @@ class FlightController extends Controller
             },
         ])->find($id);
 
-        $flight = $this->flightSvc->filterSubfleets($user, $flight);
-        $flight = $this->fareSvc->getReconciledFaresForFlight($flight);
+        $this->flightSvc->filterSubfleets(Auth::user(), $flight);
 
         return new FlightResource($flight);
     }
@@ -123,7 +109,6 @@ class FlightController extends Controller
             $flights = $this->flightRepo
                 ->with([
                     'airline',
-                    'fares',
                     'subfleets',
                     'subfleets.aircraft',
                     'subfleets.fares',
@@ -139,8 +124,7 @@ class FlightController extends Controller
 
         // TODO: Remove any flights here that a user doesn't have permissions to
         foreach ($flights as $flight) {
-            $this->flightSvc->filterSubfleets($user, $flight);
-            $this->fareSvc->getReconciledFaresForFlight($flight);
+            $this->flightSvc->filterSubfleets(Auth::user(), $flight);
         }
 
         return FlightResource::collection($flights);
@@ -153,25 +137,20 @@ class FlightController extends Controller
      *
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function briefing(string $id)
+    public function briefing($id)
     {
-        /** @var User $user */
         $user = Auth::user();
         $w = [
-            'id' => $id,
+            'user_id'   => $user->id,
+            'flight_id' => $id,
         ];
 
-        /** @var SimBrief $simbrief */
         $simbrief = SimBrief::where($w)->first();
 
         if ($simbrief === null) {
             throw new AssetNotFound(new Exception('Flight briefing not found'));
         }
 
-        /*if ($simbrief->user_id !== $user->id) {
-            throw new Unauthorized(new Exception('User cannot access another user\'s simbrief'));
-        }*/
-
         return response($simbrief->acars_xml, 200, [
             'Content-Type' => 'application/xml',
         ]);