Merge remote-tracking branch 'origin/development' into move-datalink-…

…authorities-to-db # Conflicts: # app/Models/DatalinkAuthority.php
rffuret · Oct 23, 2024 · dd313ff · dd313ff
2 parents a0a3732 + d96feab
commit dd313ff
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 428 deletions.
diff --git a/app/Http/Controllers/DatalinkAuthorityController.php b/app/Http/Controllers/DatalinkAuthorityController.php
diff --git a/app/Http/Livewire/Administration/CreateDatalinkAuthority.php b/app/Http/Livewire/Administration/CreateDatalinkAuthority.php
diff --git a/app/Http/Livewire/Administration/DatalinkAuthoritiesTable.php b/app/Http/Livewire/Administration/DatalinkAuthoritiesTable.php
diff --git a/app/Http/Requests/DatalinkAuthorityRequest.php b/app/Http/Requests/DatalinkAuthorityRequest.php
diff --git a/app/Policies/DatalinkAuthorityPolicy.php b/app/Policies/DatalinkAuthorityPolicy.php
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -4,11 +4,9 @@
 
 use App\Enums\AccessLevelEnum;
 use App\Models\ClxMessage;
-use App\Models\DatalinkAuthority;
 use App\Models\RclMessage;
 use App\Models\VatsimAccount;
 use App\Policies\ClxMessagePolicy;
-use App\Policies\DatalinkAuthorityPolicy;
 use App\Policies\RclMessagePolicy;
 use App\Services\VatsimDataService;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -25,7 +23,6 @@ class AuthServiceProvider extends ServiceProvider
         // 'App\Models\Model' => 'App\Policies\ModelPolicy',
         RclMessage::class => RclMessagePolicy::class,
         ClxMessage::class => ClxMessagePolicy::class,
-        DatalinkAuthority::class => DatalinkAuthorityPolicy::class,
     ];
 
     /**

diff --git a/database/migrations/2024_10_20_124639_create_datalink_authorities_table.php b/database/migrations/2024_10_20_124639_create_datalink_authorities_table.php
diff --git a/database/seeders/DatalinkAuthoritiesSeeder.php b/database/seeders/DatalinkAuthoritiesSeeder.php