From 20221faa3e8d4418ef3226abc7edbafd474c2ca5 Mon Sep 17 00:00:00 2001 From: itsbenny99 Date: Sat, 29 Feb 2020 00:09:46 +0000 Subject: [PATCH] #10 --- app/Http/Controllers/AdminController.php | 46 ++++++++++--------- app/Http/Controllers/AdminDash.php | 46 ++++++++++--------- app/{ => Models/Events}/Calendar.php | 2 +- app/{ => Models/Events}/Event.php | 2 +- app/{ => Models/Events}/EventPosition.php | 2 +- app/{ => Models/Events}/EventRegistration.php | 6 +-- app/{ => Models/Events}/PositionPreset.php | 2 +- app/{ => Models/Events}/PresetPosition.php | 2 +- app/{ => Models/Mship}/Feedback.php | 4 +- app/{ => Models/Mship}/Incident.php | 4 +- app/{ => Models/Mship}/Opt.php | 2 +- app/{ => Models/Mship}/Permission.php | 2 +- app/{ => Models/Mship}/Role.php | 2 +- app/{ => Models/Mship}/Team.php | 2 +- app/{ => Models/Mship}/User.php | 8 ++-- app/{ => Models/Mship}/VisitRej.php | 2 +- app/{ => Models/Mship}/Visitor.php | 2 +- app/{ => Models/Training}/Ots.php | 2 +- app/{ => Models/Training}/SoloCert.php | 2 +- app/{ => Models/Training}/TrainingInfo.php | 2 +- app/{ => Models/Training}/TrainingRequest.php | 2 +- app/{ => Models/Training}/TrainingTicket.php | 4 +- app/{ => Models/VatsimData}/ATC.php | 2 +- app/{ => Models/VatsimData}/Metar.php | 2 +- app/{ => Models/WebData}/Airport.php | 4 +- app/{ => Models/WebData}/Announcement.php | 2 +- app/{ => Models/WebData}/Audit.php | 2 +- app/{ => Models/WebData}/Bronze.php | 4 +- app/{ => Models/WebData}/ControllerLog.php | 4 +- .../WebData}/ControllerLogUpdate.php | 2 +- app/{ => Models/WebData}/File.php | 4 +- app/{ => Models/WebData}/MoodleEnrol.php | 2 +- app/{ => Models/WebData}/Pyrite.php | 2 +- app/{ => Models/WebData}/Scenery.php | 2 +- app/models/mship.php | 0 35 files changed, 94 insertions(+), 86 deletions(-) rename app/{ => Models/Events}/Calendar.php (89%) rename app/{ => Models/Events}/Event.php (93%) rename app/{ => Models/Events}/EventPosition.php (93%) rename app/{ => Models/Events}/EventRegistration.php (89%) rename app/{ => Models/Events}/PositionPreset.php (89%) rename app/{ => Models/Events}/PresetPosition.php (87%) rename app/{ => Models/Mship}/Feedback.php (95%) rename app/{ => Models/Mship}/Incident.php (93%) rename app/{ => Models/Mship}/Opt.php (88%) rename app/{ => Models/Mship}/Permission.php (79%) rename app/{ => Models/Mship}/Role.php (76%) rename app/{ => Models/Mship}/Team.php (76%) rename app/{ => Models/Mship}/User.php (98%) rename app/{ => Models/Mship}/VisitRej.php (88%) rename app/{ => Models/Mship}/Visitor.php (96%) rename app/{ => Models/Training}/Ots.php (99%) rename app/{ => Models/Training}/SoloCert.php (93%) rename app/{ => Models/Training}/TrainingInfo.php (95%) rename app/{ => Models/Training}/TrainingRequest.php (99%) rename app/{ => Models/Training}/TrainingTicket.php (99%) rename app/{ => Models/VatsimData}/ATC.php (95%) rename app/{ => Models/VatsimData}/Metar.php (88%) rename app/{ => Models/WebData}/Airport.php (97%) rename app/{ => Models/WebData}/Announcement.php (95%) rename app/{ => Models/WebData}/Audit.php (92%) rename app/{ => Models/WebData}/Bronze.php (86%) rename app/{ => Models/WebData}/ControllerLog.php (98%) rename app/{ => Models/WebData}/ControllerLogUpdate.php (86%) rename app/{ => Models/WebData}/File.php (91%) rename app/{ => Models/WebData}/MoodleEnrol.php (81%) rename app/{ => Models/WebData}/Pyrite.php (92%) rename app/{ => Models/WebData}/Scenery.php (87%) delete mode 100644 app/models/mship.php diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index f5d7a61f..2f6928ae 100644 --- 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 index 0672f3e3..50bdd100 100644 --- 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 b/app/Models/Events/Calendar.php similarity index 89% rename from app/Calendar.php rename to app/Models/Events/Calendar.php index 7096fc23..fc785a26 100644 --- a/app/Calendar.php +++ b/app/Models/Events/Calendar.php @@ -1,6 +1,6 @@