#10

ZTL-ARTCC · Feb 29, 2020 · 20221fa · 20221fa
1 parent 8f364af
commit 20221fa
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 86 deletions.
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -2,27 +2,31 @@
 
 namespace App\Http\Controllers;
 
-use App\Airport;
-use App\Audit;
-use App\Announcement;
-use App\Bronze;
-use App\Calendar;
-use App\ControllerLog;
-use App\Event;
-use App\EventPosition;
-use App\EventRegistration;
-use App\Feedback;
-use App\File;
-use App\Incident;
-use App\Metar;
-use App\PositionPreset;
-use App\PresetPosition;
-use App\Pyrite;
-use App\Scenery;
-use App\SoloCert;
-use App\User;
-use App\Visitor;
-use App\VisitRej;
+use App\Models\WebData\Airport;
+use App\Models\WebData\Audit;
+use App\Models\WebData\File;
+use App\Models\WebData\Announcement;
+use App\Models\WebData\Bronze;
+use App\Models\WebData\ControllerLog;
+use App\Models\WebData\Pyrite;
+use App\Modles\WebData\Scenery;
+
+use App\Models\Events\Calendar;
+use App\Models\Events\Event;
+use App\Models\Events\EventPosition;
+use App\Models\Events\EventRegistration;
+use App\Models\Events\PositionPreset;
+use App\Models\Events\PresetPosition;
+
+use App\Models\Mship\Feedback;
+use App\Models\Mship\Incident;
+use App\Models\Mship\User;
+use App\Models\Mship\Visitor;
+use App\Models\Mship\VisitRej;
+
+use App\Models\VatsimData\Metar;
+use App\Models\Training\SoloCert;
+
 use Artisan;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;

diff --git a/app/Http/Controllers/AdminDash.php b/app/Http/Controllers/AdminDash.php
@@ -2,27 +2,31 @@
 
 namespace App\Http\Controllers;
 
-use App\Airport;
-use App\Audit;
-use App\Announcement;
-use App\Bronze;
-use App\Calendar;
-use App\ControllerLog;
-use App\Event;
-use App\EventPosition;
-use App\EventRegistration;
-use App\Feedback;
-use App\File;
-use App\Incident;
-use App\Metar;
-use App\PositionPreset;
-use App\PresetPosition;
-use App\Pyrite;
-use App\Scenery;
-use App\SoloCert;
-use App\User;
-use App\Visitor;
-use App\VisitRej;
+use App\Models\WebData\Airport;
+use App\Models\WebData\Audit;
+use App\Models\WebData\File;
+use App\Models\WebData\Announcement;
+use App\Models\WebData\Bronze;
+use App\Models\WebData\ControllerLog;
+use App\Models\WebData\Pyrite;
+use App\Modles\WebData\Scenery;
+
+use App\Models\Events\Calendar;
+use App\Models\Events\Event;
+use App\Models\Events\EventPosition;
+use App\Models\Events\EventRegistration;
+use App\Models\Events\PositionPreset;
+use App\Models\Events\PresetPosition;
+
+use App\Models\Mship\Feedback;
+use App\Models\Mship\Incident;
+use App\Models\Mship\User;
+use App\Models\Mship\Visitor;
+use App\Models\Mship\VisitRej;
+
+use App\Models\VatsimData\Metar;
+use App\Models\Training\SoloCert;
+
 use Artisan;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;

diff --git a/app/Calendar.php → app/Models/Events/Calendar.php b/app/Calendar.php → app/Models/Events/Calendar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Event.php → app/Models/Events/Event.php b/app/Event.php → app/Models/Events/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;

diff --git a/app/EventPosition.php → app/Models/Events/EventPosition.php b/app/EventPosition.php → app/Models/Events/EventPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
 use App\EventRegistration;
 use Illuminate\Database\Eloquent\Model;

diff --git a/app/EventRegistration.php → app/Models/Events/EventRegistration.php b/app/EventRegistration.php → app/Models/Events/EventRegistration.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
-use App\EventPosition;
-use App\User;
+use App\Models\Events\EventPosition;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class EventRegistration extends Model

diff --git a/app/PositionPreset.php → app/Models/Events/PositionPreset.php b/app/PositionPreset.php → app/Models/Events/PositionPreset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/PresetPosition.php → app/Models/Events/PresetPosition.php b/app/PresetPosition.php → app/Models/Events/PresetPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Feedback.php → app/Models/Mship/Feedback.php b/app/Feedback.php → app/Models/Mship/Feedback.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
-use App\User;
+use App\Modles\Mship\User;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 use SimpleXMLElement;

diff --git a/app/Incident.php → app/Models/Mship/Incident.php b/app/Incident.php → app/Models/Mship/Incident.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
-use App\User;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Incident extends Model

diff --git a/app/Opt.php → app/Models/Mship/Opt.php b/app/Opt.php → app/Models/Mship/Opt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Permission.php → app/Models/Mship/Permission.php b/app/Permission.php → app/Models/Mship/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustPermission;
 

diff --git a/app/Role.php → app/Models/Mship/Role.php b/app/Role.php → app/Models/Mship/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustRole;
 

diff --git a/app/Team.php → app/Models/Mship/Team.php b/app/Team.php → app/Models/Mship/Team.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustTeam;
 

diff --git a/app/User.php → app/Models/Mship/User.php b/app/User.php → app/Models/Mship/User.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Carbon\Carbon;
-use App\CotrollerLog;
-use App\MoodleEnrol;
-use App\User;
+use App\Models\WebData\CotrollerLog;
+use App\Models\WebData\MoodleEnrol;
+use App\User\Models\Mship;
 use Config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\User as Authenticatable;

diff --git a/app/VisitRej.php → app/Models/Mship/VisitRej.php b/app/VisitRej.php → app/Models/Mship/VisitRej.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Visitor.php → app/Models/Mship/Visitor.php b/app/Visitor.php → app/Models/Mship/Visitor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Ots.php → app/Models/Training/Ots.php b/app/Ots.php → app/Models/Training/Ots.php
@@ -3,7 +3,7 @@
 namespace App;
 
 
-use App\User;
+use App\Models\Mship\User;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 use SimpleXMLElement;

diff --git a/app/SoloCert.php → app/Models/Training/SoloCert.php b/app/SoloCert.php → app/Models/Training/SoloCert.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/TrainingInfo.php → app/Models/Training/TrainingInfo.php b/app/TrainingInfo.php → app/Models/Training/TrainingInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/TrainingRequest.php → app/Models/Training/TrainingRequest.php b/app/TrainingRequest.php → app/Models/Training/TrainingRequest.php
@@ -1,5 +1,5 @@
 <?php
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 use Carbon\Carbon;

diff --git a/app/TrainingTicket.php → app/Models/Training/TrainingTicket.php b/app/TrainingTicket.php → app/Models/Training/TrainingTicket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;

diff --git a/app/ATC.php → app/Models/VatsimData/ATC.php b/app/ATC.php → app/Models/VatsimData/ATC.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\VatsimData;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;

diff --git a/app/Metar.php → app/Models/VatsimData/Metar.php b/app/Metar.php → app/Models/VatsimData/Metar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\VatsimData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Airport.php → app/Models/WebData/Airport.php b/app/Airport.php → app/Models/WebData/Airport.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use App\deserialization;
-use App\Metar;
+use App\Models\VatsimData\Metar;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Announcement.php → app/Models/WebData/Announcement.php b/app/Announcement.php → app/Models/WebData/Announcement.php
@@ -2,7 +2,7 @@
 
 namespace App;
 
-use App\User;
+use App\Models\Mship\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Audit.php → app/Models/WebData/Audit.php b/app/Audit.php → app/Models/WebData/Audit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Bronze.php → app/Models/WebData/Bronze.php b/app/Bronze.php → app/Models/WebData/Bronze.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\User;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Bronze extends Model

diff --git a/app/ControllerLog.php → app/Models/WebData/ControllerLog.php b/app/ControllerLog.php → app/Models/WebData/ControllerLog.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\User;
+use App\Models\Mship\User;
 use DB;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;

diff --git a/app/ControllerLogUpdate.php → app/Models/WebData/ControllerLogUpdate.php b/app/ControllerLogUpdate.php → app/Models/WebData/ControllerLogUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/File.php → app/Models/WebData/File.php b/app/File.php → app/Models/WebData/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\File;
+use App\Models\WebData\File;
 use Illuminate\Database\Eloquent\Model;
 
 class File extends Model

diff --git a/app/MoodleEnrol.php → app/Models/WebData/MoodleEnrol.php b/app/MoodleEnrol.php → app/Models/WebData/MoodleEnrol.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Pyrite.php → app/Models/WebData/Pyrite.php b/app/Pyrite.php → app/Models/WebData/Pyrite.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/Scenery.php → app/Models/WebData/Scenery.php b/app/Scenery.php → app/Models/WebData/Scenery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/app/models/mship.php b/app/models/mship.php