Merge pull request #147 from vatsimnetwork/development

vatsimnetwork · Oct 17, 2024 · d22b5e2 · d22b5e2
2 parents 281d6f5 + 8885ba8
commit d22b5e2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/app/Console/Commands/PopulateTracksCommand.php b/app/Console/Commands/PopulateTracksCommand.php
@@ -6,6 +6,7 @@
 use App\Services\TracksService;
 use Exception;
 use Illuminate\Console\Command;
+use function Sentry\captureException;
 
 class PopulateTracksCommand extends Command
 {
@@ -21,6 +22,7 @@ public function handle(TracksService $tracksService): void
             $tracks = $tracksService->getTracks();
             $this->line('Downloaded tracks.');
         } catch (Exception $e) {
+            captureException($e);
             $this->error('Could not download tracks.');
 
             return;

diff --git a/app/Http/Livewire/Controllers/ConflictChecker.php b/app/Http/Livewire/Controllers/ConflictChecker.php
@@ -10,22 +10,27 @@
 use Carbon\CarbonPeriod;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Reactive;
 use Livewire\Component;
 
 class ConflictChecker extends Component
 {
+    #[Reactive]
     public $callsign;
 
     public $originalLevel;
 
+    #[Reactive]
     public $level;
 
     public $originalEntry;
 
+    #[Reactive]
     public $entry;
 
     public $originalTime;
 
+    #[Reactive]
     public $time;
 
     public $conflicts = [];

diff --git a/app/Http/Livewire/Controllers/LtNewPending.php b/app/Http/Livewire/Controllers/LtNewPending.php
@@ -36,6 +36,7 @@ public function configure(): void
         // })
         $this->setDefaultSort('request_time', 'asc');
         $this->setTrimSearchStringEnabled();
+        $this->setRefreshTime(10000);
     }
 
     public function columns(): array

diff --git a/app/Http/Livewire/Controllers/LtNewProcessed.php b/app/Http/Livewire/Controllers/LtNewProcessed.php
@@ -34,6 +34,7 @@ public function configure(): void
         // })
         $this->setDefaultSort('request_time', 'asc');
         $this->setTrimSearchStringEnabled();
+        $this->setRefreshTime(10000);
     }
 
     public function columns(): array

diff --git a/resources/views/controllers/clx/rcl-messages/show.blade.php b/resources/views/controllers/clx/rcl-messages/show.blade.php
@@ -274,19 +274,19 @@
     </div>
     <script type="module">
         $("#atc_fl").change(function () {
-            $wire.dispatch('levelChanged', { newLevel: this.value });
+            Livewire.dispatch('levelChanged', { newLevel: this.value });
         });
 
         $('#entry_time_requirement').blur(function () {
-            $wire.dispatch('timeChanged', { newTime: this.value });
+            Livewire.dispatch('timeChanged', { newTime: this.value });
         });
 
         $('#new_track_id').change(function () {
-            $wire.dispatch('trackChanged', { newTrackId: this.track });
+            Livewire.dispatch('trackChanged', { newTrackId: this.track });
         });
 
         $('#new_random_routeing').blur(function () {
-            $wire.dispatch('rrChanged', {newRouteing: this.value });
+            Livewire.dispatch('rrChanged', { newRouteing: this.value });
         });
     </script>
 @endsection
diff --git a/resources/views/livewire/controllers/create-manual-clx.blade.php b/resources/views/livewire/controllers/create-manual-clx.blade.php
@@ -151,21 +151,4 @@
             </div>
         </form>
     </div>
-    <script type="module">
-        $("#atc_fl").change(function () {
-            $wire.dispatch('levelChanged', { newLevel: this.value });
-        });
-
-        $('#entry_time_requirement').blur(function () {
-            $wire.dispatch('timeChanged', { newTime: this.value });
-        });
-
-        $('#new_track_id').change(function () {
-            $wire.dispatch('trackChanged', { newTrackId: this.track });
-        });
-
-        $('#new_random_routeing').blur(function () {
-            $wire.dispatch('rrChanged', {newRouteing: this.value });
-        });
-    </script>
 </div>
diff --git a/resources/views/tracks/index.blade.php b/resources/views/tracks/index.blade.php
@@ -3,7 +3,11 @@
     <div class="container">
         <h2 class="fs-2 font-display text-primary-emphasis mb-4">Tracks</h2>
         <div class="alert alert-info">
-            <span>This page shows the tracks in use on natTrak. These tracks are sourced from the VATSIM Gander Oceanic tracks API. Active tracks are in use and valid for requesting clearances. Inactive tracks are no longer valid and cannot be requested, but remain visible for clearances that were on that track. Concorde tracks are based off historical data and are request-able by aircraft detected as Concorde only.</span>
+            This page shows the tracks in use on natTrak.
+            Active tracks are in use and valid for requesting clearances.
+            Inactive tracks are no longer valid and cannot be requested,
+            but remain visible for clearances that were on that track.
+            Concorde tracks are based off historical data and are only available to aircraft detected as Concorde.
         </div>
         <div class="vstack gap-4">
             <div>