7.0.0-beta3 Release (#541)

* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
2020-02-08 13:29:34 -05:00
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
--- a/modules/Importer/Resources/views/app.blade.php
+++ b/modules/Importer/Resources/views/app.blade.php
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="csrf-token" content="{{ csrf_token() }}">
+
+  <title>@yield('title') - importer</title>
+
+  <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <meta name="base-url" content="{!! url('') !!}">
+  <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+  <meta name="csrf-token" content="{!! csrf_token() !!}">
+
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+    @yield('css')
+  </style>
+</head>
+
+<body>
+<!-- Navbar -->
+<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
+    </div>
+    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
+</nav>
+<!-- End Navbar -->
+{{--<div class="clearfix" style="height: 25px;"></div>--}}
+<div class="wrapper">
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        @include('importer::flash.message')
+        @yield('content')
+      </div>
+    </div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
+</div>
+
+{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
+
+<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
+<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+
+<script>
+  hljs.configure({languages: ['sh']});
+
+  $(document).ready(function () {
+
+    $(".select2").select2();
+
+    $('pre code').each(function (i, block) {
+      hljs.fixMarkup(block);
+      hljs.highlightBlock(block);
+    });
+  });
+</script>
+
+@yield('scripts')
+
+</body>
+</html>
--- a/modules/Importer/Resources/views/complete.blade.php
+++ b/modules/Importer/Resources/views/complete.blade.php
@@ -0,0 +1,20 @@
+@extends('importer::app')
+@section('title', 'Import Completed!')
+
+@section('content')
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'importer.complete', 'method' => 'GET']) }}
+
+    <h4>Installer Completed!</h4>
+
+    <p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
+    <p>Click the button to proceed to the login screen!</p>
+
+    <p style="text-align: right">
+      {{ Form::submit('Import Complete! Continue to Log-In >>',
+                       ['class' => 'btn btn-success'])
+      }}
+    </p>
+    {{ Form::close() }}
+  </div>
+@endsection
--- a/modules/Importer/Resources/views/dbtest.blade.php
+++ b/modules/Importer/Resources/views/dbtest.blade.php
@@ -0,0 +1,8 @@
+<div class="alert alert-{{ $status }}" role="alert">
+  <div class="container">
+    <div class="alert-icon">
+      <i class="now-ui-icons ui-1_bell-53"></i>
+    </div>
+    {{ $message }}
+  </div>
+</div>
--- a/modules/Importer/Resources/views/error.blade.php
+++ b/modules/Importer/Resources/views/error.blade.php
@@ -0,0 +1,9 @@
+@extends('importer::app')
+@section('title', 'Import Error!')
+
+@section('content')
+  <div style="align-content: center;">
+    <h4>Error!</h4>
+    <p class="text-danger">{{ $error }}</p>
+  </div>
+@endsection
--- a/modules/Importer/Resources/views/flash/check_error.blade.php
+++ b/modules/Importer/Resources/views/flash/check_error.blade.php
@@ -0,0 +1,6 @@
+@if($errors->has($field))
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
+@endif
--- a/modules/Importer/Resources/views/flash/message.blade.php
+++ b/modules/Importer/Resources/views/flash/message.blade.php
@@ -0,0 +1,11 @@
+@foreach (session('flash_notification', collect())->toArray() as $message)
+  <div class="alert alert-danger" role="alert">
+    <div class="container">
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      {{ $message['message'] }}
+    </div>
+  </div>
+@endforeach
+{{ session()->forget('flash_notification') }}
--- a/modules/Importer/Resources/views/step1-configure.blade.php
+++ b/modules/Importer/Resources/views/step1-configure.blade.php
@@ -0,0 +1,136 @@
+@extends('importer::app')
+@section('title', 'Import Configuration')
+
+@section('content')
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'importer.config', 'method' => 'POST']) }}
+    <table class="table" width="25%">
+
+      <tr>
+        <td colspan="2">
+          <h4>IMPORTANT NOTES</h4>
+          <ul>
+            <li>If you have more than 1000 PIREPs or flights, it's best to use the command-line importer!
+              <a href="http://docs.phpvms.net/setup/importing-from-v2-v5" target="_blank">Click here</a> to
+              see the documentation of how to use it.
+            </li>
+            <li><strong>THIS WILL WIPE OUT YOUR EXISTING DATA</strong> - this is required to make sure that things like
+              pilot IDs match up
+            </li>
+          </ul>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2"><h4>Site Config</h4></td>
+      </tr>
+
+      <tr>
+        <td>Admin Email</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'email', '', ['class' => 'form-control']) }}
+            <p>The admin's email address, the password for this will be reset</p>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2"><h4>Database Config</h4></td>
+      </tr>
+
+      <tbody id="mysql_settings">
+      <tr>
+        <td>Database Host</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Database Port</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Database Name</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Database User</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Database Password</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: right;">
+          {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
+        </td>
+      </tr>
+      </tbody>
+
+      <tr>
+        <td>Database Prefix</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_prefix', 'phpvms_', ['class' => 'form-control']) }}
+            <p>Prefix of the tables, if you're using one</p>
+          </div>
+        </td>
+      </tr>
+
+    </table>
+    <div id="dbtest"></div>
+    <p style="text-align: right">
+      {{ Form::submit('Start Importer >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+  </div>
+@endsection
+
+@section('scripts')
+  <script>
+    $(document).ready(() => {
+
+      $("#dbtest_button").click((e) => {
+        e.preventDefault();
+        const opts = {
+          _token: "{{ csrf_token() }}",
+          db_conn: 'mysql',
+          db_host: $("input[name=db_host]").val(),
+          db_port: $("input[name=db_port]").val(),
+          db_name: $("input[name=db_name]").val(),
+          db_user: $("input[name=db_user]").val(),
+          db_pass: $("input[name=db_pass]").val(),
+        };
+
+        $.post("{{ route('importer.dbtest') }}", opts, (data) => {
+          $("#dbtest").html(data);
+        })
+      })
+    });
+  </script>
+@endsection
--- a/modules/Importer/Resources/views/step2-processing.blade.php
+++ b/modules/Importer/Resources/views/step2-processing.blade.php
@@ -0,0 +1,156 @@
+@extends('importer::app')
+@section('title', 'Import Configuration')
+
+@section('content')
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'importer.complete', 'method' => 'POST']) }}
+    <table class="table" width="25%">
+
+      <tr>
+        <td colspan="2"><h4>Running Importer</h4></td>
+      </tr>
+
+      <tr>
+        <td colspan="2">
+          <div class="progress">
+            <div id="progress" class="progress-bar" style="width: 0%"></div>
+          </div>
+          <div>
+            <p id="message" style="margin-top: 7px;"></p>
+            <p id="error" class="text-danger" style="margin-top: 7px;"></p>
+          </div>
+        </td>
+      </tr>
+
+    </table>
+    <p style="text-align: right">
+      {{ Form::submit('Complete Import', [
+          'id' => 'completebutton',
+          'class' => 'btn btn-success'
+          ]) }}
+    </p>
+    {{ Form::close() }}
+  </div>
+@endsection
+
+@section('scripts')
+  <script>
+    const manifest = {!!json_encode($manifest) !!};
+
+    /**
+     * Run each step of the importer
+     */
+    async function startImporter() {
+      let current = 1;
+      const total_steps = manifest.length;
+
+      /**
+       * Update the progress bar
+       */
+      const setProgress = (current, message) => {
+        const percent = Math.round(current / total_steps * 100);
+        $("#progress").css("width", `${percent}%`);
+        $("#message").text(message);
+      };
+
+      /**
+       * Sleep for a given interval
+       */
+      const sleep = (timeout) => {
+        return new Promise((resolve, reject) => {
+          setTimeout(() => {
+            resolve();
+          }, timeout);
+        });
+      };
+
+      const setError = (error) => {
+        let message = '';
+        if (error.response) {
+          // The request was made and the server responded with a status code
+          // that falls out of the range of 2xx
+          console.log(error.response.data);
+          console.log(error.response.status);
+          console.log(error.response.headers);
+
+          message = error.response.data.message;
+
+        } else if (error.request) {
+          // The request was made but no response was received
+          // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+          // http.ClientRequest in node.js
+          console.log(error.request);
+          message = error.request;
+        } else {
+          // Something happened in setting up the request that triggered an Error
+          console.log('Error', error.message);
+          message = error.message;
+        }
+
+        $("#error").text(`Error processing, check the logs: ${message}`);
+        console.log(error.config);
+      };
+
+      /**
+       * Call the endpoint as a POST
+       */
+      const runStep = async function (stage) {
+        setProgress(current, stage.message);
+
+        try {
+          return await phpvms.request({
+            method: 'post',
+            url: '/importer/run',
+            data: {
+              importer: stage.importer,
+              start: stage.start,
+            }
+          });
+        } catch (e) {
+
+          if (e.response.status === 504) {
+            const err = $("#error");
+
+            console.log('got timeout, retrying');
+            err.text(`Timed out, attempting to retry`);
+
+            // await sleep(5000);
+            const val = await runStep(stage);
+
+            err.text('');
+
+            return val;
+          }
+
+          setError(e);
+          throw e;
+        }
+      };
+
+      let errors = false;
+      const complete_button = $("#completebutton");
+      complete_button.hide();
+
+      for (let stage of manifest) {
+        console.log(`Running ${stage.importer} step ${stage.start}`);
+        try {
+          await runStep(stage);
+        } catch (e) {
+          errors = true;
+          break;
+        }
+
+        current++;
+      }
+
+      if (!errors) {
+        $("#message").text('Done!');
+        complete_button.show();
+      }
+    }
+
+    $(document).ready(() => {
+      startImporter();
+    });
+  </script>
+@endsection