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

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

app/Http/Controllers/Admin/AwardController.php

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

app/Http/Controllers/Frontend/ProfileController.php

@@ -52,7 +52,7 @@ class ProfileController extends Controller
     {
         // Is the ACARS module enabled?
         $acars_enabled = false;
-        $acars = Module::find('VMSACARS');
+        $acars = Module::find('VMSAcars');
         if ($acars) {
             $acars_enabled = $acars->isEnabled();
         }
@@ -95,6 +95,7 @@ class ProfileController extends Controller
             'user'       => $user,
             'userFields' => $userFields,
             'airports'   => $airports,
+            'acars'      => $this->acarsEnabled(),
         ]);
     }
 
@@ -121,7 +122,7 @@ class ProfileController extends Controller
 
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
-        $userFields = $this->userRepo->getUserFields($user, false);
+        $userFields = $this->userRepo->getUserFields($user, true);
 
         return view('profile.edit', [
             'user'       => $user,

app/Http/Controllers/Frontend/SimBriefController.php

@@ -109,6 +109,11 @@ class SimBriefController
 
         $loadmax = $lfactor + $lfactorv;
         $loadmax = $loadmax > 100 ? 100 : $loadmax;
+        // Failsafe for admins not defining load values for their flights
+        // and also leave the general settings empty, set loadmax to 100
+        if ($loadmax === 0) {
+            $loadmax = 100;
+        }
 
         // Show the main simbrief form
         return view('flights.simbrief_form', [

app/Http/Resources/Pirep.php

@@ -27,6 +27,7 @@ class Pirep extends Resource
     {
         $res = parent::toArray($request);
         $res['ident'] = $this->ident;
+        $res['phase'] = $this->status;
         $res['status_text'] = PirepStatus::label($this->status);
 
         // Set these to the response units

app/Widgets/Weather.php

@@ -11,7 +11,8 @@ use App\Services\AirportService;
 class Weather extends Widget
 {
     protected $config = [
-        'icao' => null,
+        'icao'     => null,
+        'raw_only' => null,
     ];
 
     /**

modules/Awards/Awards/PilotHoursAwards.php

@@ -42,7 +42,7 @@ class PilotHoursAwards extends Award
      */
     public function check($flight_minutes = null): bool
     {
-        if (!is_int($flight_minutes)) {
+        if (!is_numeric($flight_minutes)) {
             Log::error('PilotHourAwards: Flight time "'.$flight_minutes.'" is not a valid flight time');
             return false;
         }

package-lock.json

@@ -1983,11 +1983,6 @@
       "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz",
       "integrity": "sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA=="
     },
-    "bootstrap3": {
-      "version": "npm:bootstrap@3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5881,9 +5876,9 @@
       }
     },
     "marked": {
-      "version": "1.2.2",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.0.tgz",
-      "integrity": "sha512-5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="
+      "integrity": "sha512-NqRSh2+LlN2NInpqTQnS614Y/3NkVMFFU6sJlRFEpxJ/LHuK/qJECH7/fXZjk4VZstPW/Pevjil/VtSONsLc7Q=="
     },
     "md5": {
       "version": "2.3.0",

package.json

@@ -34,7 +34,7 @@
     "leaflet-rotatedmarker": "^0.2.0",
     "leaflet.geodesic": "^2.5.2",
     "lodash": ">=4.17.19",
-    "marked": "^1.2.2",
+    "marked": "^2.0.0",
     "minimist": "^1.2.2",
     "moment": "^2.29.1",
     "paper-dashboard": "^1.1.0",

public/assets/frontend/css/styles.css

@@ -130,3 +130,11 @@
     border-radius: 5px;
     width: 250px;
 }
+
+/*
+*   fix the dropdown menu on mobile view
+*/
+.dropdown-menu:not(.show) {
+    display: none;
+}
+

resources/views/layouts/default/profile/index.blade.php

@@ -133,11 +133,11 @@
         <div class="text-right">
           @if (isset($acars) && $acars === true)
           <a href="{{ route('frontend.profile.acars') }}" class="btn btn-primary"
-             onclick="alert('Save to \'My Documents/phpVMS\'')">ACARS Config</a>
+             onclick="alert('Copy or Save to \'My Documents/phpVMS\'')">ACARS Config</a>
           &nbsp;
           @endif
           <a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
-             onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('profile.newapikey')</a>
+             onclick="return confirm('Are you sure? This will reset your API key!')">@lang('profile.newapikey')</a>
           &nbsp;
           <a href="{{ route('frontend.profile.edit', [$user->id]) }}"
              class="btn btn-primary">@lang('common.edit')</a>
@@ -171,7 +171,7 @@
     <div class="col-sm-12">
       <table class="table table-full-width">
         @foreach($userFields as $field)
-          @if($field->public === true)
+          @if(!$field->private)
             <tr>
               <td>{{ $field->name }}</td>
               <td>{{ $field->value }}</td>