diff --git a/resources/views/system/importer/complete.blade.php b/resources/views/system/importer/complete.blade.php index e57aea499..cf0dc8804 100644 --- a/resources/views/system/importer/complete.blade.php +++ b/resources/views/system/importer/complete.blade.php @@ -2,19 +2,17 @@ @section('title', 'Import Completed!') @section('content') -
- {{ Form::open(['route' => 'importer.complete', 'method' => 'GET']) }} +
+
+ @csrf +

Installer Completed!

-

Installer Completed!

+

Edit the config.php to fill in some additional settings.

+

Click the button to proceed to the login screen!

-

Edit the config.php to fill in some additional settings.

-

Click the button to proceed to the login screen!

- -

- {{ Form::submit('Import Complete! Continue to Log-In >>', - ['class' => 'btn btn-success']) - }} -

- {{ Form::close() }} -
+

+ +

+ +
@endsection diff --git a/resources/views/system/importer/step1-configure.blade.php b/resources/views/system/importer/step1-configure.blade.php index 5260b79b6..db2d615a7 100644 --- a/resources/views/system/importer/step1-configure.blade.php +++ b/resources/views/system/importer/step1-configure.blade.php @@ -2,128 +2,131 @@ @section('title', 'Import Configuration') @section('content') -
- {{ Form::open(['route' => 'importer.config', 'method' => 'POST']) }} - - - - +
+
+ @csrf +
-

IMPORTANT NOTES

-
    -
  • The first user's password (admin) will be "admin". Please change it after logging in
  • -
  • User passwords will be reset and they will need to use "Forgot Password" to reset it
  • -
  • If you have more than 1000 PIREPs or flights, it's best to use the command-line importer! - Click here to - see the documentation of how to use it. -
  • -
  • THIS WILL WIPE OUT YOUR EXISTING DATA - this is required to make sure that things like - pilot IDs match up -
  • -
-
+ + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + -
+

IMPORTANT NOTES

+
    +
  • The first user's password (admin) will be "admin". Please change it after logging in
  • +
  • User passwords will be reset and they will need to use "Forgot Password" to reset it
  • +
  • If you have more than 1000 PIREPs or flights, it's best to use the command-line importer! + Click here to + see the documentation of how to use it. +
  • +
  • THIS WILL WIPE OUT YOUR EXISTING DATA - this is required to make sure that + things like + pilot IDs match up +
  • +
+
-

Database Config

-

Enter the database information for your legacy phpVMS installation

-
+

Database Config

+

Enter the database information for your legacy phpVMS installation

+
Database Host -
- {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }} -
-
Database Host +
+ +
+
Database Port -
- {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }} -
-
Database Port +
+ +
+
Database Name -
- {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }} -
-
Database Name +
+ +
+
Database User -
- {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }} -
-
Database User +
+ +
+
Database Password -
- {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }} -
-
Database Password +
+ +
+
- {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }} -
+ +
Database Prefix -
- {{ Form::input('text', 'db_prefix', 'phpvms_', ['class' => 'form-control']) }} -

Prefix of the tables, if you're using one

-
-
Database Prefix +
+ +

Prefix of the tables, if you're using one

+
+
-
-

- {{ Form::submit('Start Importer >>', ['class' => 'btn btn-success']) }} -

- {{ Form::close() }} -
+ +
+

+ +

+ + @endsection @section('scripts') - + phpvms.request(opts).then(response => { + $("#dbtest").html(response.data); + }); + }); + }); + @endsection diff --git a/resources/views/system/importer/step2-processing.blade.php b/resources/views/system/importer/step2-processing.blade.php index dc86f79e2..46aae642c 100644 --- a/resources/views/system/importer/step2-processing.blade.php +++ b/resources/views/system/importer/step2-processing.blade.php @@ -3,7 +3,8 @@ @section('content')
- {{ Form::open(['route' => 'importer.complete', 'method' => 'POST']) }} +
+ @csrf @@ -24,12 +25,9 @@

- {{ Form::submit('Complete Import', [ - 'id' => 'completebutton', - 'class' => 'btn btn-success' - ]) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/installer/install/index-start.blade.php b/resources/views/system/installer/install/index-start.blade.php index 944755170..a77061b98 100644 --- a/resources/views/system/installer/install/index-start.blade.php +++ b/resources/views/system/installer/install/index-start.blade.php @@ -3,9 +3,10 @@ @section('content')

Click on Start to Continue

- {{ Form::open(['route' => 'installer.step1post', 'method' => 'post']) }} -

- {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }} -

- {{ Form::close() }} +
+ @csrf +

+ +

+
@endsection diff --git a/resources/views/system/installer/install/steps/step1-requirements.blade.php b/resources/views/system/installer/install/steps/step1-requirements.blade.php index e74738889..19ca837d1 100644 --- a/resources/views/system/installer/install/steps/step1-requirements.blade.php +++ b/resources/views/system/installer/install/steps/step1-requirements.blade.php @@ -3,7 +3,8 @@ @section('content')
- {{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }} +
+ @csrf @@ -56,9 +57,9 @@

php version

@if($passed === true)

- {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }} +

@endif - {{ Form::close() }} +
@endsection diff --git a/resources/views/system/installer/install/steps/step2-db.blade.php b/resources/views/system/installer/install/steps/step2-db.blade.php index ff28c5676..f955a0596 100644 --- a/resources/views/system/installer/install/steps/step2-db.blade.php +++ b/resources/views/system/installer/install/steps/step2-db.blade.php @@ -1,161 +1,171 @@ @extends('system.installer.app') @section('title', 'Database Setup') @section('content') -
- {{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Site Config

Site Name -
- {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }} -
-
Site URL -
- {{ Form::input('text', 'app_url', Request::root(), ['class' => 'form-control']) }} -
-
-

Database Config

-

Enter the target database information

-

Database Type

-
- {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }} -
-
Database Host -
- {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }} -
-
Database Port -
- {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }} -
-
Database Name -
- {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }} -
-
Database User -
- {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }} -
-
Database Password -
- {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }} -
-
- {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }} -
Database Prefix -
- {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }} -

Set this if you're sharing the database with another application.

-
-
-
-

- {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }} -

- {{ Form::close() }} -
+
+
+ @csrf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Site Config

+
Site Name +
+ +
+
Site URL +
+ +
+
+

Database Config

+

Enter the target database information

+
+

Database Type

+
+
+ +
+
Database Host +
+ +
+
Database Port +
+ +
+
Database Name +
+ +
+
Database User +
+ +
+
Database Password +
+ +
+
+ +
Database Prefix +
+ +

Set this if you're sharing the database with another application.

+
+
+
+

+ +

+
+
@endsection @section('scripts') - + @endsection diff --git a/resources/views/system/installer/install/steps/step2a-db_output.blade.php b/resources/views/system/installer/install/steps/step2a-db_output.blade.php index 9aa9db802..b3ed384d7 100644 --- a/resources/views/system/installer/install/steps/step2a-db_output.blade.php +++ b/resources/views/system/installer/install/steps/step2a-db_output.blade.php @@ -2,7 +2,8 @@ @section('title', 'Database Setup Completed') @section('content')
- {{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }} +
+ @csrf
         
@@ -12,8 +13,8 @@
     

- {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/installer/install/steps/step3-user.blade.php b/resources/views/system/installer/install/steps/step3-user.blade.php index e9a4e8f9b..9c279c8f5 100644 --- a/resources/views/system/installer/install/steps/step3-user.blade.php +++ b/resources/views/system/installer/install/steps/step3-user.blade.php @@ -2,118 +2,154 @@ @section('title', 'User Setup') @section('content') -
-
-
- {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }} - +
+
+
+
+ @csrf +
- - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - -
- Importing from a legacy install? -
+ Importing from a legacy install? +

Airline Information

+

Airline Information

+

Airline ICAO

-
- {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'airline_icao']) -
-
+

Airline ICAO

+
+
+ + @include('system.installer.flash/check_error', [ + 'field' => 'airline_icao', + ]) +
+

Airline Name

-
- {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'airline_name']) -
-
+

Airline Name

+
+
+ + @include('system.installer.flash/check_error', [ + 'field' => 'airline_name', + ]) +
+

Airline Country

-
- {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }} - @include('system.installer.flash/check_error', ['field' => 'airline_country']) -
-
+

Airline Country

+
+
+ + @include('system.installer.flash/check_error', [ + 'field' => 'airline_country', + ]) +
+

First User

+

First User

+

Name

-
- {{ Form::input('text', 'name', null, ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'name']) -
-
+

Name

+
+
+ + @include('system.installer.flash/check_error', ['field' => 'name']) +
+

Email

-
- {{ Form::input('text', 'email', null, ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'email']) -
-
+

Email

+
+
+ + @include('system.installer.flash/check_error', ['field' => 'email']) +
+

Password

- {{ Form::password('password', ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'password']) -
+

Password

+
+ + @include('system.installer.flash/check_error', ['field' => 'password']) +

Password Confirm

- {{ Form::password('password_confirmation', ['class' => 'form-control']) }} - @include('system.installer.flash/check_error', ['field' => 'password_confirmation']) -
+

Password Confirm

+
+ + @include('system.installer.flash/check_error', [ + 'field' => 'password_confirmation', + ]) +

Options

+

Options

+

Analytics

-
- {{ Form::hidden('telemetry', 0) }} - {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }} -
-

- Allows collection of analytics. They won't identify you, and helps us to track - the PHP and database versions that are used, and help to figure out problems - and slowdowns when vaCentral integration is enabled. -

-
-
-
-

- {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }} -

- {{ Form::close() }} -
+ + +

Analytics

+ + +
+ + +
+

+ Allows collection of analytics. They won't identify you, and helps us to track + the PHP and database versions that are used, and help to figure out problems + and slowdowns when vaCentral integration is enabled. +

+
+ + + +
+

+ +

+ +
+
- @endsection diff --git a/resources/views/system/installer/install/steps/step3a-completed.blade.php b/resources/views/system/installer/install/steps/step3a-completed.blade.php index aec7d77e4..5339d070e 100644 --- a/resources/views/system/installer/install/steps/step3a-completed.blade.php +++ b/resources/views/system/installer/install/steps/step3a-completed.blade.php @@ -2,19 +2,18 @@ @section('title', 'Installation Completed!') @section('content') -
- {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }} +
+
+ @csrf -

Installer Completed!

+

Installer Completed!

-

Edit the .env file to fill in some additional settings.

-

Click the button to proceed to the login screen!

+

Edit the .env to fill in some additional settings.

+

Click the button to proceed to the login screen!

-

- {{ Form::submit('Install Complete! Continue to Log-In >>', - ['class' => 'btn btn-success']) - }} -

- {{ Form::close() }} -
+

+ +

+ +
@endsection diff --git a/resources/views/system/updater/index-start.blade.php b/resources/views/system/updater/index-start.blade.php index bee3d08e0..e94519505 100644 --- a/resources/views/system/updater/index-start.blade.php +++ b/resources/views/system/updater/index-start.blade.php @@ -4,9 +4,10 @@ @section('content')

phpvms updater

Press continue to check if there are any updates available.

- {{ Form::open(['route' => 'update.step1post', 'method' => 'post']) }} +
+ @csrf

- {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/updater/steps/step1-no-update.blade.php b/resources/views/system/updater/steps/step1-no-update.blade.php index d39f91c05..75ecb008f 100644 --- a/resources/views/system/updater/steps/step1-no-update.blade.php +++ b/resources/views/system/updater/steps/step1-no-update.blade.php @@ -4,10 +4,11 @@ @section('content')

phpvms updater

It seems like you're up to date!

- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }} +
+ @csrf

- {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/updater/steps/step1-update-available.blade.php b/resources/views/system/updater/steps/step1-update-available.blade.php index c1ad986a6..22a0a0747 100644 --- a/resources/views/system/updater/steps/step1-update-available.blade.php +++ b/resources/views/system/updater/steps/step1-update-available.blade.php @@ -4,9 +4,10 @@ @section('content')

phpvms updater

Click run to complete the update!.

- {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }} +
+ @csrf

- {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/updater/steps/step2-migrations-done.blade.php b/resources/views/system/updater/steps/step2-migrations-done.blade.php index 8aefd8f08..290742322 100644 --- a/resources/views/system/updater/steps/step2-migrations-done.blade.php +++ b/resources/views/system/updater/steps/step2-migrations-done.blade.php @@ -2,7 +2,8 @@ @section('title', 'Update Completed') @section('content')
- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }} +
+ @csrf
         
@@ -11,8 +12,8 @@
     

- {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection diff --git a/resources/views/system/updater/steps/step3-update-complete.blade.php b/resources/views/system/updater/steps/step3-update-complete.blade.php index d7329f559..0c859b5ec 100644 --- a/resources/views/system/updater/steps/step3-update-complete.blade.php +++ b/resources/views/system/updater/steps/step3-update-complete.blade.php @@ -5,9 +5,10 @@

phpvms updater

Update completed!.

- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }} +
+ @csrf

- {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }} +

- {{ Form::close() }} +
@endsection