From 050b256052c554c489d647e78917d880ff931112 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 23 Apr 2024 14:34:03 +0000 Subject: [PATCH] Shift cleanup --- app/Achievements/Achievement.php | 2 +- app/City.php | 2 +- app/Country.php | 2 +- app/Event.php | 8 +++--- app/Excellence.php | 2 +- app/Experience.php | 2 +- app/Exports/VotesExport.php | 2 +- app/Filters/EventFilters.php | 2 +- app/Http/Controllers/AdminController.php | 2 +- app/Http/Controllers/AmbassadorController.php | 2 +- .../Api/EventPictureController.php | 2 +- .../Controllers/Api/UserAvatarController.php | 2 +- app/Http/Controllers/Auth/LoginController.php | 2 +- app/Http/Controllers/BadgesController.php | 2 +- .../Controllers/CertificateController.php | 2 +- app/Http/Controllers/ChallengesController.php | 2 +- .../Controllers/Codeweek4AllController.php | 2 +- app/Http/Controllers/EventController.php | 4 +-- app/Http/Controllers/ExcellenceController.php | 4 +-- .../ExcellenceWinnersController.php | 2 +- app/Http/Controllers/HackathonsController.php | 2 +- app/Http/Controllers/HomeController.php | 2 +- .../Controllers/LeadingTeachersSignup.php | 2 +- app/Http/Controllers/LocationController.php | 2 +- app/Http/Controllers/MapController.php | 2 +- .../Controllers/OnlineEventsController.php | 2 +- .../Controllers/ParticipationController.php | 4 +-- app/Http/Controllers/PodcastsController.php | 2 +- app/Http/Controllers/ReportController.php | 2 +- app/Http/Controllers/ResourcesController.php | 2 +- .../Controllers/ResourcesPageController.php | 2 +- app/Http/Controllers/ReviewController.php | 2 +- app/Http/Controllers/SchoolController.php | 2 +- app/Http/Controllers/SearchController.php | 2 +- app/Http/Controllers/StaticPageController.php | 2 +- .../SuggestResourcesController.php | 2 +- .../Controllers/SuperOrganiserController.php | 4 +-- app/Http/Controllers/ToolkitsController.php | 2 +- app/Http/Controllers/UserController.php | 2 +- .../Controllers/UserProfileController.php | 2 +- app/Http/Controllers/VolunteerController.php | 4 +-- app/Http/Middleware/CheckBrowser.php | 4 +-- app/Http/Middleware/Locale.php | 4 +-- .../Middleware/RedirectIfAuthenticated.php | 4 +-- app/Importer.php | 2 +- app/Imports/AppleEventsImport.php | 2 +- app/Imports/BulgariaEventsImport.php | 2 +- app/Imports/CoderDojoEventsImport.php | 2 +- app/Imports/DutchDanceEventsImport.php | 2 +- app/Imports/DutchMoorlagEventsImport.php | 2 +- app/Imports/DutchSimoneEventsImport.php | 2 +- app/Imports/EventsImport.php | 2 +- app/Imports/GenericEventsImport.php | 2 +- app/Imports/HamburgEventsImport.php | 2 +- app/Imports/IrelandEventsImport.php | 2 +- app/Imports/LuxembourgEventsImport.php | 2 +- app/Imports/MagentaEventsImport.php | 2 +- app/Imports/ReportedEventsImport.php | 2 +- app/Imports/ResourcesLearnImport.php | 2 +- app/Imports/ResourcesTeachImport.php | 2 +- app/Imports/TelerikEventsImport.php | 2 +- app/Imports/UKDigitAllCharityEventsImport.php | 2 +- app/Imports/UKDigitAllEventsImport.php | 2 +- app/LeadingTeacherAction.php | 2 +- app/Location.php | 2 +- app/Notification.php | 2 +- app/Nova/Filters/EventCountry.php | 2 +- app/Nova/Filters/UserCountry.php | 2 +- app/Participation.php | 2 +- app/Podcast.php | 2 +- app/PodcastGuest.php | 2 +- app/PodcastResource.php | 2 +- app/Providers/EventServiceProvider.php | 1 - app/ResourceCategory.php | 2 +- app/ResourceItem.php | 2 +- app/ResourceLanguage.php | 2 +- app/ResourceLevel.php | 2 +- app/ResourceProgrammingLanguage.php | 2 +- app/ResourceSubject.php | 2 +- app/ResourceType.php | 2 +- app/School.php | 2 +- app/Tag.php | 2 +- app/User.php | 8 +++--- app/Volunteer.php | 2 +- config/app.php | 2 +- config/filesystems.php | 1 - database/factories/UserFactory.php | 2 +- ...23_000000_rename_password_resets_table.php | 1 - routes/api.php | 2 +- routes/web.php | 28 +++++++++---------- 90 files changed, 114 insertions(+), 117 deletions(-) diff --git a/app/Achievements/Achievement.php b/app/Achievements/Achievement.php index 27d2704e8..57fc6208c 100644 --- a/app/Achievements/Achievement.php +++ b/app/Achievements/Achievement.php @@ -2,9 +2,9 @@ namespace App\Achievements; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use App\User; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Achievement extends Model { diff --git a/app/City.php b/app/City.php index 8a5cc6ce2..1f041f07a 100644 --- a/app/City.php +++ b/app/City.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; class City extends Model { diff --git a/app/Country.php b/app/Country.php index d9a02b5f4..5f657b20e 100755 --- a/app/Country.php +++ b/app/Country.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; diff --git a/app/Event.php b/app/Event.php index e3c6edbaa..6a1b54348 100644 --- a/app/Event.php +++ b/app/Event.php @@ -2,16 +2,16 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Relations\HasOne; use App\Filters\EventFilters; use App\Helpers\EventHelper; use App\Helpers\ImporterHelper; use App\Policies\EventPolicy; use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; diff --git a/app/Excellence.php b/app/Excellence.php index dc79d9e7a..820f1d3fc 100644 --- a/app/Excellence.php +++ b/app/Excellence.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Excellence diff --git a/app/Experience.php b/app/Experience.php index 7488d4319..d47ebaf58 100644 --- a/app/Experience.php +++ b/app/Experience.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use App\Achievements\Events\UserEarnedExperience; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class Experience extends Model { diff --git a/app/Exports/VotesExport.php b/app/Exports/VotesExport.php index f40eaa655..58c7e3b76 100644 --- a/app/Exports/VotesExport.php +++ b/app/Exports/VotesExport.php @@ -2,8 +2,8 @@ namespace App\Exports; -use Illuminate\Support\Collection; use App\Vote; +use Illuminate\Support\Collection; use Maatwebsite\Excel\Concerns\FromCollection; class VotesExport implements FromCollection diff --git a/app/Filters/EventFilters.php b/app/Filters/EventFilters.php index a5cb8bcce..4c91f470b 100755 --- a/app/Filters/EventFilters.php +++ b/app/Filters/EventFilters.php @@ -2,9 +2,9 @@ namespace App\Filters; -use Illuminate\Database\Eloquent\Builder; use App\Tag; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Support\Str; diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 81089d2dc..b886b5992 100755 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Certificate; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; +use Illuminate\View\View; use Spatie\Activitylog\Models\Activity; class AdminController extends Controller diff --git a/app/Http/Controllers/AmbassadorController.php b/app/Http/Controllers/AmbassadorController.php index cb0bd5cd0..6bae6675c 100644 --- a/app/Http/Controllers/AmbassadorController.php +++ b/app/Http/Controllers/AmbassadorController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Country; use App\Filters\UserFilters; use App\Helpers\AmbassadorHelper; use App\User; +use Illuminate\View\View; class AmbassadorController extends Controller { diff --git a/app/Http/Controllers/Api/EventPictureController.php b/app/Http/Controllers/Api/EventPictureController.php index 0f70f9cea..b09fd37f7 100644 --- a/app/Http/Controllers/Api/EventPictureController.php +++ b/app/Http/Controllers/Api/EventPictureController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\Response; use App\Http\Controllers\Controller; +use Illuminate\Http\Response; use Illuminate\Support\Facades\Storage; use Intervention\Image\Facades\Image; diff --git a/app/Http/Controllers/Api/UserAvatarController.php b/app/Http/Controllers/Api/UserAvatarController.php index c8b3dfec5..e87194184 100644 --- a/app/Http/Controllers/Api/UserAvatarController.php +++ b/app/Http/Controllers/Api/UserAvatarController.php @@ -4,8 +4,8 @@ //define("DEFAULT_AVATAR_PATH","avatars/default.png"); -use Illuminate\Http\Response; use App\Http\Controllers\Controller; +use Illuminate\Http\Response; use Illuminate\Support\Facades\Storage; use Intervention\Image\Facades\Image; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 8f123af22..82064e1f6 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\RedirectResponse; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Log; diff --git a/app/Http/Controllers/BadgesController.php b/app/Http/Controllers/BadgesController.php index 3dfab8e0a..e41eb507d 100644 --- a/app/Http/Controllers/BadgesController.php +++ b/app/Http/Controllers/BadgesController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\User; use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Str; +use Illuminate\View\View; class BadgesController extends Controller { diff --git a/app/Http/Controllers/CertificateController.php b/app/Http/Controllers/CertificateController.php index 363bb7c45..8d3527b35 100644 --- a/app/Http/Controllers/CertificateController.php +++ b/app/Http/Controllers/CertificateController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Queries\ExcellenceQuery; use App\Queries\ReportableEventsQuery; use App\Queries\SuperOrganiserQuery; use Illuminate\Support\Facades\Auth; +use Illuminate\View\View; class CertificateController extends Controller { diff --git a/app/Http/Controllers/ChallengesController.php b/app/Http/Controllers/ChallengesController.php index 8693d7758..6d08b2187 100644 --- a/app/Http/Controllers/ChallengesController.php +++ b/app/Http/Controllers/ChallengesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; +use Illuminate\View\View; class ChallengesController extends Controller { diff --git a/app/Http/Controllers/Codeweek4AllController.php b/app/Http/Controllers/Codeweek4AllController.php index 0906c113e..0927ad8f2 100644 --- a/app/Http/Controllers/Codeweek4AllController.php +++ b/app/Http/Controllers/Codeweek4AllController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Helpers\Codeweek4AllHelper; use Carbon\Carbon; +use Illuminate\View\View; class Codeweek4AllController extends Controller { diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 0782508ee..42f0f2956 100755 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\RedirectResponse; use App\Country; use App\Event; use App\Helpers\EventHelper; @@ -13,11 +11,13 @@ use App\User; use Carbon\Carbon; use Illuminate\Auth\Access\AuthorizationException; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Mail; +use Illuminate\View\View; class EventController extends Controller { diff --git a/app/Http/Controllers/ExcellenceController.php b/app/Http/Controllers/ExcellenceController.php index 5c0b826ed..5d025ad75 100644 --- a/app/Http/Controllers/ExcellenceController.php +++ b/app/Http/Controllers/ExcellenceController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\RedirectResponse; use App\CertificateExcellence; use App\Excellence; use App\Queries\ExcellenceQuery; use Gate; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\View\View; class ExcellenceController extends Controller { diff --git a/app/Http/Controllers/ExcellenceWinnersController.php b/app/Http/Controllers/ExcellenceWinnersController.php index 2f34f4617..1222f2770 100644 --- a/app/Http/Controllers/ExcellenceWinnersController.php +++ b/app/Http/Controllers/ExcellenceWinnersController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Excellence; use App\Exports\ExcellenceExport; use App\Helpers\ExcellenceWinnersHelper; @@ -10,6 +9,7 @@ use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; +use Illuminate\View\View; class ExcellenceWinnersController extends Controller { diff --git a/app/Http/Controllers/HackathonsController.php b/app/Http/Controllers/HackathonsController.php index a40c89026..32b69c132 100644 --- a/app/Http/Controllers/HackathonsController.php +++ b/app/Http/Controllers/HackathonsController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; +use Illuminate\View\View; class HackathonsController extends Controller { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 1b1c81ae1..53843c062 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; +use Illuminate\View\View; class HomeController extends Controller { diff --git a/app/Http/Controllers/LeadingTeachersSignup.php b/app/Http/Controllers/LeadingTeachersSignup.php index ecb504de7..d5e6f80b5 100644 --- a/app/Http/Controllers/LeadingTeachersSignup.php +++ b/app/Http/Controllers/LeadingTeachersSignup.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Audience; use App\City; use App\Country; use Illuminate\Http\Request; +use Illuminate\View\View; class LeadingTeachersSignup extends Controller { diff --git a/app/Http/Controllers/LocationController.php b/app/Http/Controllers/LocationController.php index 0112962e6..5b87c064f 100644 --- a/app/Http/Controllers/LocationController.php +++ b/app/Http/Controllers/LocationController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Http\Requests\StoreLocationRequest; use App\Http\Requests\UpdateLocationRequest; use App\Location; +use Illuminate\View\View; class LocationController extends Controller { diff --git a/app/Http/Controllers/MapController.php b/app/Http/Controllers/MapController.php index 85cacec24..849d02147 100644 --- a/app/Http/Controllers/MapController.php +++ b/app/Http/Controllers/MapController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\User; use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\View\View; class MapController extends Controller { diff --git a/app/Http/Controllers/OnlineEventsController.php b/app/Http/Controllers/OnlineEventsController.php index bda4854ad..7dadd0155 100644 --- a/app/Http/Controllers/OnlineEventsController.php +++ b/app/Http/Controllers/OnlineEventsController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Country; use App\Helpers\EventHelper; use App\Queries\CountriesQuery; use App\Queries\OnlineEventsQuery; use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\View\View; class OnlineEventsController extends Controller { diff --git a/app/Http/Controllers/ParticipationController.php b/app/Http/Controllers/ParticipationController.php index dcf5558e2..d9d7261eb 100644 --- a/app/Http/Controllers/ParticipationController.php +++ b/app/Http/Controllers/ParticipationController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\RedirectResponse; use App\CertificateParticipation; use App\Jobs\GenerateCertificatesOfParticipation; use App\Participation; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\View\View; class ParticipationController extends Controller { diff --git a/app/Http/Controllers/PodcastsController.php b/app/Http/Controllers/PodcastsController.php index e612f1fea..f99f7fd13 100644 --- a/app/Http/Controllers/PodcastsController.php +++ b/app/Http/Controllers/PodcastsController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Podcast; use Illuminate\Http\Request; +use Illuminate\View\View; class PodcastsController extends Controller { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index c884de23e..b04412293 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Certificate; use App\Event; use App\Queries\ReportableEventsQuery; use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\View\View; class ReportController extends Controller { diff --git a/app/Http/Controllers/ResourcesController.php b/app/Http/Controllers/ResourcesController.php index b15f70408..4edd8460d 100644 --- a/app/Http/Controllers/ResourcesController.php +++ b/app/Http/Controllers/ResourcesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; +use Illuminate\View\View; class ResourcesController extends Controller { diff --git a/app/Http/Controllers/ResourcesPageController.php b/app/Http/Controllers/ResourcesPageController.php index 2b165f5a2..435e993e6 100644 --- a/app/Http/Controllers/ResourcesPageController.php +++ b/app/Http/Controllers/ResourcesPageController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; +use Illuminate\View\View; class ResourcesPageController extends Controller { diff --git a/app/Http/Controllers/ReviewController.php b/app/Http/Controllers/ReviewController.php index e0b81bba5..2f2621caa 100644 --- a/app/Http/Controllers/ReviewController.php +++ b/app/Http/Controllers/ReviewController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Country; use App\Queries\CountriesQuery; use Illuminate\Http\Request; +use Illuminate\View\View; class ReviewController extends Controller { diff --git a/app/Http/Controllers/SchoolController.php b/app/Http/Controllers/SchoolController.php index f55880cef..c04ef357f 100644 --- a/app/Http/Controllers/SchoolController.php +++ b/app/Http/Controllers/SchoolController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\School; use Illuminate\Http\Request; +use Illuminate\View\View; class SchoolController extends Controller { diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 26667e594..b1d9f5c7f 100755 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Country; use App\Event; use App\Filters\EventFilters; @@ -12,6 +11,7 @@ use Illuminate\Support\Arr; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; +use Illuminate\View\View; class SearchController extends Controller { diff --git a/app/Http/Controllers/StaticPageController.php b/app/Http/Controllers/StaticPageController.php index 9b10930b0..70bd00553 100644 --- a/app/Http/Controllers/StaticPageController.php +++ b/app/Http/Controllers/StaticPageController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; +use Illuminate\View\View; class StaticPageController extends Controller { diff --git a/app/Http/Controllers/SuggestResourcesController.php b/app/Http/Controllers/SuggestResourcesController.php index 31502a72c..eee0f0f58 100644 --- a/app/Http/Controllers/SuggestResourcesController.php +++ b/app/Http/Controllers/SuggestResourcesController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\Http\Requests\ResourceRequest; use App\ResourceItem; use App\User; use Illuminate\Support\Facades\Mail; +use Illuminate\View\View; class SuggestResourcesController extends Controller { diff --git a/app/Http/Controllers/SuperOrganiserController.php b/app/Http/Controllers/SuperOrganiserController.php index e0ef01438..2b68d5859 100644 --- a/app/Http/Controllers/SuperOrganiserController.php +++ b/app/Http/Controllers/SuperOrganiserController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\RedirectResponse; use App\CertificateExcellence; use App\Queries\SuperOrganiserQuery; use Gate; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\View\View; class SuperOrganiserController extends Controller { diff --git a/app/Http/Controllers/ToolkitsController.php b/app/Http/Controllers/ToolkitsController.php index 2096372d4..8150696da 100644 --- a/app/Http/Controllers/ToolkitsController.php +++ b/app/Http/Controllers/ToolkitsController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use Illuminate\Support\Facades\App; +use Illuminate\View\View; class ToolkitsController extends Controller { diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ff6ea6239..497e64e03 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\RedirectResponse; use App\User; +use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/app/Http/Controllers/UserProfileController.php b/app/Http/Controllers/UserProfileController.php index b87413055..21992ebd8 100644 --- a/app/Http/Controllers/UserProfileController.php +++ b/app/Http/Controllers/UserProfileController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\View\View; use App\User; +use Illuminate\View\View; class UserProfileController extends Controller { diff --git a/app/Http/Controllers/VolunteerController.php b/app/Http/Controllers/VolunteerController.php index b3327c424..278ca6b1b 100644 --- a/app/Http/Controllers/VolunteerController.php +++ b/app/Http/Controllers/VolunteerController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\RedirectResponse; use App\Volunteer; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\View\View; class VolunteerController extends Controller { diff --git a/app/Http/Middleware/CheckBrowser.php b/app/Http/Middleware/CheckBrowser.php index a6077ac60..fc6589406 100644 --- a/app/Http/Middleware/CheckBrowser.php +++ b/app/Http/Middleware/CheckBrowser.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; +use Symfony\Component\HttpFoundation\Response; class CheckBrowser { diff --git a/app/Http/Middleware/Locale.php b/app/Http/Middleware/Locale.php index 8f0b0602d..2364288b2 100644 --- a/app/Http/Middleware/Locale.php +++ b/app/Http/Middleware/Locale.php @@ -2,12 +2,12 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Log; +use Symfony\Component\HttpFoundation\Response; class Locale { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 8122b7b9f..20ad09251 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Symfony\Component\HttpFoundation\Response; class RedirectIfAuthenticated { diff --git a/app/Importer.php b/app/Importer.php index f14a42a17..6c2c84502 100644 --- a/app/Importer.php +++ b/app/Importer.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\SoftDeletes; /** diff --git a/app/Imports/AppleEventsImport.php b/app/Imports/AppleEventsImport.php index 77875c21b..229afaa3c 100644 --- a/app/Imports/AppleEventsImport.php +++ b/app/Imports/AppleEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; use Maatwebsite\Excel\Concerns\WithHeadingRow; diff --git a/app/Imports/BulgariaEventsImport.php b/app/Imports/BulgariaEventsImport.php index e6b9ceff9..3f50d5184 100644 --- a/app/Imports/BulgariaEventsImport.php +++ b/app/Imports/BulgariaEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/CoderDojoEventsImport.php b/app/Imports/CoderDojoEventsImport.php index 8faffca3a..f04b85d5e 100644 --- a/app/Imports/CoderDojoEventsImport.php +++ b/app/Imports/CoderDojoEventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/DutchDanceEventsImport.php b/app/Imports/DutchDanceEventsImport.php index 47185c6f5..f0231de4a 100644 --- a/app/Imports/DutchDanceEventsImport.php +++ b/app/Imports/DutchDanceEventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use App\User; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Maatwebsite\Excel\Concerns\ToModel; diff --git a/app/Imports/DutchMoorlagEventsImport.php b/app/Imports/DutchMoorlagEventsImport.php index e12ae1d95..344ea3465 100644 --- a/app/Imports/DutchMoorlagEventsImport.php +++ b/app/Imports/DutchMoorlagEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/DutchSimoneEventsImport.php b/app/Imports/DutchSimoneEventsImport.php index f424acd10..eed2bca19 100644 --- a/app/Imports/DutchSimoneEventsImport.php +++ b/app/Imports/DutchSimoneEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/EventsImport.php b/app/Imports/EventsImport.php index 0b550fbc3..a1c315d08 100644 --- a/app/Imports/EventsImport.php +++ b/app/Imports/EventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/GenericEventsImport.php b/app/Imports/GenericEventsImport.php index db4bc3531..f5e86c8a8 100644 --- a/app/Imports/GenericEventsImport.php +++ b/app/Imports/GenericEventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use App\User; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Maatwebsite\Excel\Concerns\ToModel; diff --git a/app/Imports/HamburgEventsImport.php b/app/Imports/HamburgEventsImport.php index 38ead4ef3..2ef82da0c 100644 --- a/app/Imports/HamburgEventsImport.php +++ b/app/Imports/HamburgEventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use App\Tag; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/IrelandEventsImport.php b/app/Imports/IrelandEventsImport.php index 076320ce6..5cb2b36ef 100644 --- a/app/Imports/IrelandEventsImport.php +++ b/app/Imports/IrelandEventsImport.php @@ -2,10 +2,10 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use App\User; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Maatwebsite\Excel\Concerns\ToModel; diff --git a/app/Imports/LuxembourgEventsImport.php b/app/Imports/LuxembourgEventsImport.php index 20f86927f..faaf2d34e 100644 --- a/app/Imports/LuxembourgEventsImport.php +++ b/app/Imports/LuxembourgEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/MagentaEventsImport.php b/app/Imports/MagentaEventsImport.php index 658a9a1ae..256d0ac59 100644 --- a/app/Imports/MagentaEventsImport.php +++ b/app/Imports/MagentaEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; use Maatwebsite\Excel\Concerns\WithHeadingRow; diff --git a/app/Imports/ReportedEventsImport.php b/app/Imports/ReportedEventsImport.php index 7f03199b1..ee0b29534 100644 --- a/app/Imports/ReportedEventsImport.php +++ b/app/Imports/ReportedEventsImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; use App\User; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Maatwebsite\Excel\Concerns\ToModel; diff --git a/app/Imports/ResourcesLearnImport.php b/app/Imports/ResourcesLearnImport.php index ae2166e29..712a02a72 100644 --- a/app/Imports/ResourcesLearnImport.php +++ b/app/Imports/ResourcesLearnImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\ResourceItem; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/ResourcesTeachImport.php b/app/Imports/ResourcesTeachImport.php index 6613fcc4c..791415a90 100644 --- a/app/Imports/ResourcesTeachImport.php +++ b/app/Imports/ResourcesTeachImport.php @@ -2,9 +2,9 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\ResourceItem; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/TelerikEventsImport.php b/app/Imports/TelerikEventsImport.php index 2f402bea8..58b3bb9ba 100644 --- a/app/Imports/TelerikEventsImport.php +++ b/app/Imports/TelerikEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/UKDigitAllCharityEventsImport.php b/app/Imports/UKDigitAllCharityEventsImport.php index 731e37bd1..cfae5b1c8 100644 --- a/app/Imports/UKDigitAllCharityEventsImport.php +++ b/app/Imports/UKDigitAllCharityEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/Imports/UKDigitAllEventsImport.php b/app/Imports/UKDigitAllEventsImport.php index 30953e1bd..4811180ca 100644 --- a/app/Imports/UKDigitAllEventsImport.php +++ b/app/Imports/UKDigitAllEventsImport.php @@ -2,8 +2,8 @@ namespace App\Imports; -use Illuminate\Database\Eloquent\Model; use App\Event; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomValueBinder; diff --git a/app/LeadingTeacherAction.php b/app/LeadingTeacherAction.php index 2d11794c4..f44d95b3a 100644 --- a/app/LeadingTeacherAction.php +++ b/app/LeadingTeacherAction.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class LeadingTeacherAction extends Model { diff --git a/app/Location.php b/app/Location.php index 4c4bccb18..bc302edf4 100644 --- a/app/Location.php +++ b/app/Location.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; class Location extends Model diff --git a/app/Notification.php b/app/Notification.php index fe16a351a..c4ea1ae24 100644 --- a/app/Notification.php +++ b/app/Notification.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Notification diff --git a/app/Nova/Filters/EventCountry.php b/app/Nova/Filters/EventCountry.php index c6a614f4d..bb2924e01 100644 --- a/app/Nova/Filters/EventCountry.php +++ b/app/Nova/Filters/EventCountry.php @@ -2,8 +2,8 @@ namespace App\Nova\Filters; -use Illuminate\Database\Eloquent\Builder; use App\Country; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Laravel\Nova\Filters\Filter; diff --git a/app/Nova/Filters/UserCountry.php b/app/Nova/Filters/UserCountry.php index a586a8499..7cf9259fd 100644 --- a/app/Nova/Filters/UserCountry.php +++ b/app/Nova/Filters/UserCountry.php @@ -2,8 +2,8 @@ namespace App\Nova\Filters; -use Illuminate\Database\Eloquent\Builder; use App\Country; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Laravel\Nova\Filters\Filter; diff --git a/app/Participation.php b/app/Participation.php index 373ed263b..45ca16493 100644 --- a/app/Participation.php +++ b/app/Participation.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Participation diff --git a/app/Podcast.php b/app/Podcast.php index 35be890e0..00091925a 100644 --- a/app/Podcast.php +++ b/app/Podcast.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Carbon; use Spatie\Feed\Feedable; use Spatie\Feed\FeedItem; diff --git a/app/PodcastGuest.php b/app/PodcastGuest.php index 4c8db02f9..865fb4268 100644 --- a/app/PodcastGuest.php +++ b/app/PodcastGuest.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class PodcastGuest extends Model { diff --git a/app/PodcastResource.php b/app/PodcastResource.php index 8f5d568eb..8bde850bd 100644 --- a/app/PodcastResource.php +++ b/app/PodcastResource.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class PodcastResource extends Model { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index eeb9b2ea0..0ae1c0fc7 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -43,4 +43,3 @@ public function shouldDiscoverEvents(): bool return false; } } - diff --git a/app/ResourceCategory.php b/app/ResourceCategory.php index 46db72ac6..3445d2a74 100644 --- a/app/ResourceCategory.php +++ b/app/ResourceCategory.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceCategory diff --git a/app/ResourceItem.php b/app/ResourceItem.php index 32a698f9b..358ecc9ca 100644 --- a/app/ResourceItem.php +++ b/app/ResourceItem.php @@ -2,10 +2,10 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use App\Filters\ResourceFilters; use Exception; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceItem diff --git a/app/ResourceLanguage.php b/app/ResourceLanguage.php index 4e33f33cf..e02fd8fb3 100644 --- a/app/ResourceLanguage.php +++ b/app/ResourceLanguage.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceLanguage diff --git a/app/ResourceLevel.php b/app/ResourceLevel.php index 17f987c85..6e05cf9b2 100644 --- a/app/ResourceLevel.php +++ b/app/ResourceLevel.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceLevel diff --git a/app/ResourceProgrammingLanguage.php b/app/ResourceProgrammingLanguage.php index 2d006ac01..a04cdd895 100644 --- a/app/ResourceProgrammingLanguage.php +++ b/app/ResourceProgrammingLanguage.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceProgrammingLanguage diff --git a/app/ResourceSubject.php b/app/ResourceSubject.php index 8a69fcc61..61ff0515b 100644 --- a/app/ResourceSubject.php +++ b/app/ResourceSubject.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceSubject diff --git a/app/ResourceType.php b/app/ResourceType.php index f286d3d7f..16b38e3dc 100644 --- a/app/ResourceType.php +++ b/app/ResourceType.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\ResourceType diff --git a/app/School.php b/app/School.php index 30c960c4c..7d21ec019 100644 --- a/app/School.php +++ b/app/School.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Spatie\Activitylog\Traits\LogsActivity; /** diff --git a/app/Tag.php b/app/Tag.php index 96f5424a8..e3ed831fb 100755 --- a/app/Tag.php +++ b/app/Tag.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** * App\Tag diff --git a/app/User.php b/app/User.php index 4a7999e6e..24d06dea0 100644 --- a/app/User.php +++ b/app/User.php @@ -2,10 +2,6 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasOne; -use Illuminate\Database\Eloquent\Relations\HasMany; use App\Achievements\Achievement; use App\Filters\UserFilters; use App\Helpers\EventHelper; @@ -13,6 +9,10 @@ use Cache; use Carbon\Carbon; use DB; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; diff --git a/app/Volunteer.php b/app/Volunteer.php index 957434c3d..0c71216ba 100644 --- a/app/Volunteer.php +++ b/app/Volunteer.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Volunteer diff --git a/config/app.php b/config/app.php index 7601ed92e..88afb3e0b 100644 --- a/config/app.php +++ b/config/app.php @@ -1,7 +1,7 @@ resource_path('excel'), ], - 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index b68c2eec5..f6de362ee 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,8 +1,8 @@ group(function () { - Route::get('/my/badges', [BadgesController::class, 'my'])->name('my-badges')->middleware('auth'); - Route::get('/badges/user/{user}/{year?}', [BadgesController::class, 'user'])->name('badges-user'); - Route::get('/badges/leaderboard/{year?}', [BadgesController::class, 'leaderboard'])->name('badges-leaderboard-year'); - }); + Route::get('/my/badges', [BadgesController::class, 'my'])->name('my-badges')->middleware('auth'); + Route::get('/badges/user/{user}/{year?}', [BadgesController::class, 'user'])->name('badges-user'); + Route::get('/badges/leaderboard/{year?}', [BadgesController::class, 'leaderboard'])->name('badges-leaderboard-year'); +}); Route::get( '/codeweek4all/{code}/detail', @@ -551,18 +551,18 @@ ->middleware('auth'); Route::middleware('role:super admin|leading teacher admin')->group(function () { - Route::get('/leading-teachers/list', [LeadingTeachersList::class, 'index']) - ->name('leading_teachers_list') - ->middleware('auth'); - } + Route::get('/leading-teachers/list', [LeadingTeachersList::class, 'index']) + ->name('leading_teachers_list') + ->middleware('auth'); +} ); Route::middleware('role:leading teacher|super admin|leading teacher admin')->group(function () { - Route::get( - '/leading-teachers/report', - [LeadingTeachersReport::class, 'index'] - )->name('LT.report'); - } + Route::get( + '/leading-teachers/report', + [LeadingTeachersReport::class, 'index'] + )->name('LT.report'); +} ); Route::view('/chatbot', 'static.chatbot')->name('chatbot');