From 8fe83d9ac90c7cf820fe8575d5a0acb115bd07f2 Mon Sep 17 00:00:00 2001 From: Wouter Koppenol Date: Sat, 6 Jan 2024 23:41:25 +0100 Subject: [PATCH 01/30] #2173 Fixed horizontal card layout for routes having a broken layout --- resources/views/common/dungeonroute/cardhorizontal.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/common/dungeonroute/cardhorizontal.blade.php b/resources/views/common/dungeonroute/cardhorizontal.blade.php index d1c61a605..2cd4d0b87 100644 --- a/resources/views/common/dungeonroute/cardhorizontal.blade.php +++ b/resources/views/common/dungeonroute/cardhorizontal.blade.php @@ -41,12 +41,12 @@ $enemyForcesPercentage = $dungeonroute->getEnemyForcesPercentage(); $enemyForcesWarning = $dungeonroute->enemy_forces < $dungeonroute->mappingVersion->enemy_forces_required || $enemyForcesPercentage >= 105; - $activeFloors = $dungeonroute->dungeon->floors()->active()->get(); + $activeFloors = $dungeonroute->dungeon->floorsForMapFacade(true)->get(); $owlClass = $dungeonroute->has_thumbnail && $activeFloors->count() > 1 ? 'multiple' : 'single'; ob_start(); ?>
-
+
    @if( $dungeonroute->has_thumbnail ) From 26dcba4a959eec6a0032295a6bcf573e674cbb86 Mon Sep 17 00:00:00 2001 From: Wotuu Date: Mon, 15 Jan 2024 23:23:46 +0100 Subject: [PATCH 02/30] #2178 Fixed (albeit temporarily) brushlines/paths not having proper polylines linked and causing a crash when attempting to visit the route since adding floor facades --- app/Models/DungeonRoute.php | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/app/Models/DungeonRoute.php b/app/Models/DungeonRoute.php index d2d1350df..37e635d35 100644 --- a/app/Models/DungeonRoute.php +++ b/app/Models/DungeonRoute.php @@ -573,13 +573,17 @@ public function mapContextBrushlines(CoordinatesServiceInterface $coordinatesSer $brushlines = $this->brushlines()->with(['floor'])->get(); if ($useFacade) { - $brushlines = $brushlines->map(function (Brushline $brushline) use ($coordinatesService) { - $newFloor = $this->convertVerticesForFacade($coordinatesService, $brushline->polyline, $brushline->floor); - $brushline->setRelation('floor', $newFloor); - $brushline->floor_id = $newFloor->id; - - return $brushline; - }); + $brushlines = $brushlines + // #2177 Sometimes brushlines don't have a polyline + ->filter(function (Brushline $brushline) { + return $brushline->polyline !== null; + })->map(function (Brushline $brushline) use ($coordinatesService) { + $newFloor = $this->convertVerticesForFacade($coordinatesService, $brushline->polyline, $brushline->floor); + $brushline->setRelation('floor', $newFloor); + $brushline->floor_id = $newFloor->id; + + return $brushline; + }); } return $brushlines; @@ -597,13 +601,18 @@ public function mapContextPaths(CoordinatesServiceInterface $coordinatesService, $paths = $this->paths()->with(['floor'])->get(); if ($useFacade) { - $paths = $paths->map(function (Path $path) use ($coordinatesService) { - $newFloor = $this->convertVerticesForFacade($coordinatesService, $path->polyline, $path->floor); - $path->setRelation('floor', $newFloor); - $path->floor_id = $newFloor->id; - - return $path; - }); + $paths = $paths + // #2177 Sometimes paths don't have a polyline + ->filter(function (Path $path) { + return $path->polyline !== null; + }) + ->map(function (Path $path) use ($coordinatesService) { + $newFloor = $this->convertVerticesForFacade($coordinatesService, $path->polyline, $path->floor); + $path->setRelation('floor', $newFloor); + $path->floor_id = $newFloor->id; + + return $path; + }); } return $paths; From 6ada0c0d1ae21d74d81587feee2005bd15d395af Mon Sep 17 00:00:00 2001 From: Wouter Koppenol Date: Sat, 20 Jan 2024 15:19:33 +0100 Subject: [PATCH 03/30] #2179 Minor changes related to admin pages for viewing dungeon route contents --- resources/lang/en-US/views/admin.php | 2 +- resources/views/admin/tools/dungeonroute/viewcontents.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en-US/views/admin.php b/resources/lang/en-US/views/admin.php index 5b9174301..3a6dc274f 100644 --- a/resources/lang/en-US/views/admin.php +++ b/resources/lang/en-US/views/admin.php @@ -301,7 +301,7 @@ ], 'viewcontents' => [ 'title' => 'View contents for :dungeonRouteTitle', - 'header' => 'View contents for %s', + 'header' => 'View contents for :dungeonRouteTitle', ], 'mappingversions' => [ 'title' => 'View mapping version usage', diff --git a/resources/views/admin/tools/dungeonroute/viewcontents.blade.php b/resources/views/admin/tools/dungeonroute/viewcontents.blade.php index cc7484ae0..4a9f8f29d 100644 --- a/resources/views/admin/tools/dungeonroute/viewcontents.blade.php +++ b/resources/views/admin/tools/dungeonroute/viewcontents.blade.php @@ -16,7 +16,7 @@
From a48902296d46ae9dea0326c3d89e144950d88546 Mon Sep 17 00:00:00 2001 From: Wouter Koppenol Date: Sat, 20 Jan 2024 22:09:56 +0100 Subject: [PATCH 04/30] #2180 Moved DungeonRoute relationship classes to its own namespace. --- .../Controllers/Ajax/AjaxDungeonRouteController.php | 4 ++-- app/Http/Controllers/Ajax/AjaxEnemyController.php | 2 +- app/Logic/MapContext/DungeonRouteProperties.php | 2 +- app/Models/CharacterClass.php | 2 ++ app/Models/CharacterRace.php | 1 + app/Models/DungeonRoute.php | 8 ++++++++ .../{ => DungeonRoute}/DungeonRouteAffixGroup.php | 3 ++- .../{ => DungeonRoute}/DungeonRouteAttribute.php | 2 +- .../DungeonRouteEnemyRaidMarker.php | 5 ++++- .../{ => DungeonRoute}/DungeonRouteFavorite.php | 3 ++- .../{ => DungeonRoute}/DungeonRoutePlayerClass.php | 4 +++- .../{ => DungeonRoute}/DungeonRoutePlayerRace.php | 5 +++-- .../DungeonRoutePlayerSpecialization.php | 4 +++- .../{ => DungeonRoute}/DungeonRouteRating.php | 3 ++- .../DungeonRoute/DungeonRouteThumbnailJob.php | 13 +++++++++++++ .../DungeonRouteAffixGroupRelationParser.php | 2 +- .../DungeonRouteAttributesRelationParser.php | 2 +- .../DungeonRouteEnemyRaidMarkersRelationParser.php | 2 +- .../DungeonRoutePlayerClassRelationParser.php | 2 +- .../DungeonRoutePlayerRaceRelationParser.php | 2 +- ...ngeonRoutePlayerSpecializationRelationParser.php | 2 +- .../Builders/CreateRouteBodyDungeonRouteBuilder.php | 2 +- .../Filters/DungeonRoute/DungeonRouteFilter.php | 2 +- app/Service/DungeonRoute/DiscoverService.php | 2 +- app/Service/MDT/MDTImportStringService.php | 2 +- 25 files changed, 58 insertions(+), 23 deletions(-) rename app/Models/{ => DungeonRoute}/DungeonRouteAffixGroup.php (92%) rename app/Models/{ => DungeonRoute}/DungeonRouteAttribute.php (91%) rename app/Models/{ => DungeonRoute}/DungeonRouteEnemyRaidMarker.php (90%) rename app/Models/{ => DungeonRoute}/DungeonRouteFavorite.php (91%) rename app/Models/{ => DungeonRoute}/DungeonRoutePlayerClass.php (88%) rename app/Models/{ => DungeonRoute}/DungeonRoutePlayerRace.php (92%) rename app/Models/{ => DungeonRoute}/DungeonRoutePlayerSpecialization.php (91%) rename app/Models/{ => DungeonRoute}/DungeonRouteRating.php (92%) create mode 100644 app/Models/DungeonRoute/DungeonRouteThumbnailJob.php diff --git a/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php b/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php index b114a691a..c91174b35 100644 --- a/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php +++ b/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php @@ -28,8 +28,8 @@ use App\Logic\MDT\Exception\ImportWarning; use App\Models\Dungeon; use App\Models\DungeonRoute; -use App\Models\DungeonRouteFavorite; -use App\Models\DungeonRouteRating; +use App\Models\DungeonRoute\DungeonRouteFavorite; +use App\Models\DungeonRoute\DungeonRouteRating; use App\Models\Expansion; use App\Models\GameServerRegion; use App\Models\PublishedState; diff --git a/app/Http/Controllers/Ajax/AjaxEnemyController.php b/app/Http/Controllers/Ajax/AjaxEnemyController.php index 0f7b75b3e..cb70c8446 100644 --- a/app/Http/Controllers/Ajax/AjaxEnemyController.php +++ b/app/Http/Controllers/Ajax/AjaxEnemyController.php @@ -6,7 +6,7 @@ use App\Http\Controllers\Traits\PublicKeyDungeonRoute; use App\Http\Requests\Enemy\APIEnemyFormRequest; use App\Models\DungeonRoute; -use App\Models\DungeonRouteEnemyRaidMarker; +use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; use App\Models\Enemy; use App\Models\EnemyActiveAura; use App\Models\RaidMarker; diff --git a/app/Logic/MapContext/DungeonRouteProperties.php b/app/Logic/MapContext/DungeonRouteProperties.php index c2b9dcceb..339ce00d8 100644 --- a/app/Logic/MapContext/DungeonRouteProperties.php +++ b/app/Logic/MapContext/DungeonRouteProperties.php @@ -5,7 +5,7 @@ use App\Models\AffixGroup\AffixGroup; use App\Models\DungeonRoute; -use App\Models\DungeonRouteEnemyRaidMarker; +use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; use App\Service\Coordinates\CoordinatesServiceInterface; use Illuminate\Support\Collection; diff --git a/app/Models/CharacterClass.php b/app/Models/CharacterClass.php index 2b7e166a5..86cd7250a 100644 --- a/app/Models/CharacterClass.php +++ b/app/Models/CharacterClass.php @@ -2,6 +2,8 @@ namespace App\Models; +use App\Models\DungeonRoute\DungeonRoutePlayerClass; +use App\Models\DungeonRoute\DungeonRoutePlayerRace; use App\Models\Traits\HasIconFile; use Eloquent; use Illuminate\Database\Eloquent\Relations\BelongsToMany; diff --git a/app/Models/CharacterRace.php b/app/Models/CharacterRace.php index 078760781..cd8847dad 100644 --- a/app/Models/CharacterRace.php +++ b/app/Models/CharacterRace.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Models\DungeonRoute\DungeonRoutePlayerRace; use Eloquent; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; diff --git a/app/Models/DungeonRoute.php b/app/Models/DungeonRoute.php index 37e635d35..7880e49dd 100644 --- a/app/Models/DungeonRoute.php +++ b/app/Models/DungeonRoute.php @@ -6,6 +6,14 @@ use App\Logic\Structs\LatLng; use App\Models\AffixGroup\AffixGroup; use App\Models\CombatLog\ChallengeModeRun; +use App\Models\DungeonRoute\DungeonRouteAffixGroup; +use App\Models\DungeonRoute\DungeonRouteAttribute; +use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; +use App\Models\DungeonRoute\DungeonRouteFavorite; +use App\Models\DungeonRoute\DungeonRoutePlayerClass; +use App\Models\DungeonRoute\DungeonRoutePlayerRace; +use App\Models\DungeonRoute\DungeonRoutePlayerSpecialization; +use App\Models\DungeonRoute\DungeonRouteRating; use App\Models\Enemies\OverpulledEnemy; use App\Models\Enemies\PridefulEnemy; use App\Models\Floor\Floor; diff --git a/app/Models/DungeonRouteAffixGroup.php b/app/Models/DungeonRoute/DungeonRouteAffixGroup.php similarity index 92% rename from app/Models/DungeonRouteAffixGroup.php rename to app/Models/DungeonRoute/DungeonRouteAffixGroup.php index e2bd5132f..15aea944e 100644 --- a/app/Models/DungeonRouteAffixGroup.php +++ b/app/Models/DungeonRoute/DungeonRouteAffixGroup.php @@ -1,8 +1,9 @@ Date: Sat, 20 Jan 2024 22:28:18 +0100 Subject: [PATCH 05/30] #2180 Moved DungeonRoute class to its own namespace. --- app/Console/Commands/Mapping/Save.php | 2 +- .../Scheduler/DeleteExpiredDungeonRoutes.php | 2 +- .../Scheduler/RefreshOutdatedThumbnails.php | 2 +- .../Measurement/DungeonRouteCount.php | 2 +- app/Events/ContextEvent.php | 2 +- app/Http/Controllers/AdminToolsController.php | 2 +- .../Ajax/AjaxBrushlineController.php | 2 +- .../Ajax/AjaxDungeonRouteController.php | 2 +- .../Controllers/Ajax/AjaxEchoController.php | 2 +- .../Controllers/Ajax/AjaxEnemyController.php | 2 +- .../Ajax/AjaxKillZoneController.php | 2 +- .../Ajax/AjaxLiveSessionController.php | 2 +- .../Ajax/AjaxMapIconController.php | 2 +- .../Controllers/Ajax/AjaxMetricController.php | 2 +- .../Ajax/AjaxOverpulledEnemyController.php | 2 +- .../Controllers/Ajax/AjaxPathController.php | 2 +- .../Ajax/AjaxPridefulEnemyController.php | 2 +- .../Controllers/Ajax/AjaxTagController.php | 2 +- .../Controllers/Ajax/AjaxTeamController.php | 2 +- .../Ajax/AjaxUserReportController.php | 2 +- .../Controllers/DungeonRouteController.php | 2 +- .../DungeonRouteLegacyController.php | 3 +- .../Controllers/LiveSessionController.php | 2 +- .../LiveSessionLegacyController.php | 2 +- app/Http/Controllers/ProfileController.php | 2 +- app/Http/Controllers/SiteController.php | 2 +- .../Controllers/Traits/ListsBrushlines.php | 4 +-- .../Controllers/Traits/ListsKillzones.php | 2 +- app/Http/Controllers/Traits/ListsMapIcons.php | 2 +- app/Http/Controllers/Traits/ListsPaths.php | 4 +-- .../Traits/PublicKeyDungeonRoute.php | 2 +- .../Middleware/DebugInfoContextLogger.php | 3 +- .../Requests/MapIcon/MapIconFormRequest.php | 2 +- .../AffixGroupCollectionResource.php | 2 -- .../Dungeon/DungeonCollectionResource.php | 2 -- .../DungeonRouteCollectionResource.php | 2 +- .../DungeonRoute/DungeonRouteResource.php | 2 +- app/Jobs/ProcessRouteFloorThumbnail.php | 2 +- app/Jobs/RefreshEnemyForces.php | 2 +- .../MapContext/DungeonRouteProperties.php | 2 +- .../MapContext/MapContextDungeonRoute.php | 2 +- .../UpdateDungeonRoutePopularity.php | 2 +- .../Scheduler/UpdateDungeonRouteRating.php | 1 - app/Models/Brushline.php | 1 + app/Models/CombatLog/ChallengeModeRun.php | 2 +- app/Models/Dungeon.php | 1 + .../{ => DungeonRoute}/DungeonRoute.php | 29 +++++++++++----- .../DungeonRoute/DungeonRouteAffixGroup.php | 1 - .../DungeonRouteEnemyRaidMarker.php | 1 - .../DungeonRoute/DungeonRouteFavorite.php | 1 - .../DungeonRoute/DungeonRoutePlayerClass.php | 1 - .../DungeonRoute/DungeonRoutePlayerRace.php | 1 - .../DungeonRoutePlayerSpecialization.php | 1 - .../DungeonRoute/DungeonRouteRating.php | 1 - app/Models/Enemies/PridefulEnemy.php | 2 +- app/Models/Faction.php | 1 + app/Models/KillZone/KillZone.php | 2 +- app/Models/LiveSession.php | 1 + app/Models/MDTImport.php | 1 + app/Models/MapIcon.php | 1 + app/Models/Mapping/MappingVersion.php | 2 +- app/Models/Path.php | 1 + app/Models/PublishedState.php | 1 + .../SimulationCraftRaidEventsOptions.php | 2 +- app/Models/Tags/Tag.php | 2 +- app/Models/Team.php | 1 + app/Policies/DungeonRoutePolicy.php | 2 +- app/Policies/TagCategoryPolicy.php | 2 +- app/Policies/TagPolicy.php | 2 +- app/Providers/AuthServiceProvider.php | 33 ++++++++++++++----- .../Mapping/DungeonRouteRelationMapping.php | 2 +- .../DungeonRouteAffixGroupRelationParser.php | 2 +- .../DungeonRouteAttributesRelationParser.php | 2 +- .../DungeonRouteBrushlinesRelationParser.php | 2 +- ...eonRouteEnemyRaidMarkersRelationParser.php | 2 +- .../DungeonRouteKillZoneRelationParser.php | 2 +- .../DungeonRouteMapIconsRelationParser.php | 2 +- .../DungeonRoutePathsRelationParser.php | 2 +- .../DungeonRoutePlayerClassRelationParser.php | 2 +- .../DungeonRoutePlayerRaceRelationParser.php | 2 +- ...outePlayerSpecializationRelationParser.php | 2 +- ...geonRoutePridefulEnemiesRelationParser.php | 2 +- app/Service/Cache/CacheService.php | 2 +- .../CreateRouteBodyDungeonRouteBuilder.php | 2 +- .../Builders/DungeonRouteBuilder.php | 2 +- .../ResultEventDungeonRouteBuilder.php | 2 +- app/Service/CombatLog/CombatLogService.php | 2 +- .../CreateRouteDungeonRouteService.php | 2 +- ...reateRouteDungeonRouteServiceInterface.php | 4 +-- .../CombatLogDungeonRouteFilter.php | 2 +- .../DungeonRoute/DungeonRouteFilter.php | 2 +- .../ResultEventDungeonRouteService.php | 4 +-- ...esultEventDungeonRouteServiceInterface.php | 2 +- app/Service/DungeonRoute/CoverageService.php | 2 +- .../DungeonRoute/DevDiscoverService.php | 2 +- app/Service/DungeonRoute/DiscoverService.php | 2 +- app/Service/DungeonRoute/ThumbnailService.php | 2 +- .../ThumbnailServiceInterface.php | 2 +- app/Service/MDT/MDTExportStringService.php | 2 +- .../MDT/MDTExportStringServiceInterface.php | 2 +- app/Service/MDT/MDTImportStringService.php | 2 +- .../MDT/MDTImportStringServiceInterface.php | 2 +- app/Service/MapContext/MapContextService.php | 2 +- .../MapContext/MapContextServiceInterface.php | 2 +- app/Service/View/ViewService.php | 2 +- app/User.php | 2 +- ...140_fix_team_id_on_dungeon_route_table.php | 2 +- ...correct_titles_in_dungeon_routes_table.php | 2 +- ...nail_refresh_for_facade_dungeon_routes.php | 2 +- ...t_titles_again_in_dungeon_routes_table.php | 2 +- database/seeders/DungeonDataSeeder.php | 2 +- database/seeders/MappingVersionSeeder.php | 2 +- database/seeders/TagCategorySeeder.php | 2 +- .../tools/dungeonroute/viewcontents.blade.php | 2 +- .../common/dungeonroute/attributes.blade.php | 4 +-- .../dungeonroute/cardhorizontal.blade.php | 4 +-- .../common/dungeonroute/cardlist.blade.php | 2 +- .../dungeonroute/cardvertical.blade.php | 6 ++-- .../coverage/affixgroup.blade.php | 6 ++-- ...onspeedrunrequirednpcsdifficulty.blade.php | 2 +- .../common/dungeonroute/publish.blade.php | 2 +- .../views/common/dungeonroute/table.blade.php | 6 ++-- .../views/common/forms/createroute.blade.php | 2 +- .../views/common/forms/pullsettings.blade.php | 2 +- .../views/common/group/affixes.blade.php | 2 +- .../views/common/group/composition.blade.php | 4 +-- .../common/group/presets/awakened.blade.php | 2 +- .../common/group/presets/tormented.blade.php | 2 +- .../handlebars/affixgroupsselect.blade.php | 2 +- .../views/common/maps/controls/draw.blade.php | 2 +- .../elements/dungeonroute/clone.blade.php | 4 +-- .../elements/dungeonroute/edit.blade.php | 4 +-- .../elements/dungeonroute/info.blade.php | 2 +- .../elements/dungeonroute/report.blade.php | 4 +-- .../maps/controls/elements/rating.blade.php | 2 +- .../common/maps/controls/header.blade.php | 2 +- .../common/maps/controls/present.blade.php | 7 ++-- .../common/maps/controls/pulls.blade.php | 20 +++++------ .../views/common/maps/controls/view.blade.php | 26 +++++++-------- resources/views/common/maps/map.blade.php | 28 ++++++++-------- .../views/common/modal/mapsettings.blade.php | 4 +-- .../common/modal/routeadminsettings.blade.php | 2 +- .../common/modal/routesettings.blade.php | 2 +- resources/views/common/modal/share.blade.php | 2 +- .../views/common/modal/simulate.blade.php | 2 +- .../modal/userreport/dungeonroute.blade.php | 2 +- .../dungeonroute/discover/category.blade.php | 2 +- .../discover/dungeon/category.blade.php | 2 +- .../dungeonroute/discover/panel.blade.php | 2 +- .../discover/season/category.blade.php | 2 +- resources/views/dungeonroute/edit.blade.php | 2 +- resources/views/dungeonroute/embed.blade.php | 2 +- .../embedheaderstyle/compact.blade.php | 2 +- .../embedheaderstyle/regular.blade.php | 2 +- .../dungeonroute/livesession/view.blade.php | 2 +- .../views/dungeonroute/present.blade.php | 2 +- .../views/dungeonroute/preview.blade.php | 2 +- resources/views/dungeonroute/view.blade.php | 2 +- resources/views/home.blade.php | 2 +- resources/views/misc/embed.blade.php | 10 +++--- resources/views/profile/overview.blade.php | 2 +- routes/channels.php | 2 +- 162 files changed, 251 insertions(+), 231 deletions(-) rename app/Models/{ => DungeonRoute}/DungeonRoute.php (99%) diff --git a/app/Console/Commands/Mapping/Save.php b/app/Console/Commands/Mapping/Save.php index 4762c80ec..4ec5b0e5b 100644 --- a/app/Console/Commands/Mapping/Save.php +++ b/app/Console/Commands/Mapping/Save.php @@ -5,7 +5,7 @@ use App\Console\Commands\Traits\ExecutesShellCommands; use App\Models\Dungeon; use App\Models\DungeonFloorSwitchMarker; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\Mapping\MappingCommitLog; use App\Models\Mapping\MappingVersion; diff --git a/app/Console/Commands/Scheduler/DeleteExpiredDungeonRoutes.php b/app/Console/Commands/Scheduler/DeleteExpiredDungeonRoutes.php index 11452341c..1ca069982 100644 --- a/app/Console/Commands/Scheduler/DeleteExpiredDungeonRoutes.php +++ b/app/Console/Commands/Scheduler/DeleteExpiredDungeonRoutes.php @@ -2,7 +2,7 @@ namespace App\Console\Commands\Scheduler; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Exception; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; diff --git a/app/Console/Commands/Scheduler/RefreshOutdatedThumbnails.php b/app/Console/Commands/Scheduler/RefreshOutdatedThumbnails.php index e1f542f27..0ab6db881 100644 --- a/app/Console/Commands/Scheduler/RefreshOutdatedThumbnails.php +++ b/app/Console/Commands/Scheduler/RefreshOutdatedThumbnails.php @@ -2,7 +2,7 @@ namespace App\Console\Commands\Scheduler; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\DungeonRoute\ThumbnailServiceInterface; use Exception; use Illuminate\Console\Command; diff --git a/app/Console/Commands/Scheduler/Telemetry/Measurement/DungeonRouteCount.php b/app/Console/Commands/Scheduler/Telemetry/Measurement/DungeonRouteCount.php index f643594b9..807f147b7 100644 --- a/app/Console/Commands/Scheduler/Telemetry/Measurement/DungeonRouteCount.php +++ b/app/Console/Commands/Scheduler/Telemetry/Measurement/DungeonRouteCount.php @@ -3,7 +3,7 @@ namespace App\Console\Commands\Scheduler\Telemetry\Measurement; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\PublishedState; use Illuminate\Support\Collection; use InfluxDB\Point; diff --git a/app/Events/ContextEvent.php b/app/Events/ContextEvent.php index 3d4565af1..ecd71fdc5 100644 --- a/app/Events/ContextEvent.php +++ b/app/Events/ContextEvent.php @@ -3,7 +3,7 @@ namespace App\Events; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\LiveSession; use App\User; use Illuminate\Broadcasting\Channel; diff --git a/app/Http/Controllers/AdminToolsController.php b/app/Http/Controllers/AdminToolsController.php index 43a4c5b81..5301a7ec6 100644 --- a/app/Http/Controllers/AdminToolsController.php +++ b/app/Http/Controllers/AdminToolsController.php @@ -9,7 +9,7 @@ use App\Logic\MDT\Exception\ImportWarning; use App\Logic\MDT\Exception\InvalidMDTStringException; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\Mapping\MappingVersion; use App\Models\Npc; diff --git a/app/Http/Controllers/Ajax/AjaxBrushlineController.php b/app/Http/Controllers/Ajax/AjaxBrushlineController.php index 9643fa184..eb622aa1b 100644 --- a/app/Http/Controllers/Ajax/AjaxBrushlineController.php +++ b/app/Http/Controllers/Ajax/AjaxBrushlineController.php @@ -8,7 +8,7 @@ use App\Http\Controllers\Traits\SavesPolylines; use App\Http\Requests\Brushline\APIBrushlineFormRequest; use App\Models\Brushline; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Polyline; use App\Service\Coordinates\CoordinatesServiceInterface; use Exception; diff --git a/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php b/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php index c91174b35..2e60d58bc 100644 --- a/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php +++ b/app/Http/Controllers/Ajax/AjaxDungeonRouteController.php @@ -27,7 +27,7 @@ use App\Logic\MapContext\DungeonRouteProperties; use App\Logic\MDT\Exception\ImportWarning; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteFavorite; use App\Models\DungeonRoute\DungeonRouteRating; use App\Models\Expansion; diff --git a/app/Http/Controllers/Ajax/AjaxEchoController.php b/app/Http/Controllers/Ajax/AjaxEchoController.php index a8e973fc8..a5397fe5d 100644 --- a/app/Http/Controllers/Ajax/AjaxEchoController.php +++ b/app/Http/Controllers/Ajax/AjaxEchoController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Ajax; use App\Http\Controllers\Controller; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Http\Request; class AjaxEchoController extends Controller diff --git a/app/Http/Controllers/Ajax/AjaxEnemyController.php b/app/Http/Controllers/Ajax/AjaxEnemyController.php index cb70c8446..358a0c413 100644 --- a/app/Http/Controllers/Ajax/AjaxEnemyController.php +++ b/app/Http/Controllers/Ajax/AjaxEnemyController.php @@ -5,7 +5,7 @@ use App\Events\Model\ModelDeletedEvent; use App\Http\Controllers\Traits\PublicKeyDungeonRoute; use App\Http\Requests\Enemy\APIEnemyFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; use App\Models\Enemy; use App\Models\EnemyActiveAura; diff --git a/app/Http/Controllers/Ajax/AjaxKillZoneController.php b/app/Http/Controllers/Ajax/AjaxKillZoneController.php index c5ce2d2e7..11742e406 100644 --- a/app/Http/Controllers/Ajax/AjaxKillZoneController.php +++ b/app/Http/Controllers/Ajax/AjaxKillZoneController.php @@ -9,7 +9,7 @@ use App\Http\Requests\KillZone\APIKillZoneFormRequest; use App\Http\Requests\KillZone\APIKillZoneMassFormRequest; use App\Jobs\RefreshEnemyForces; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemy; use App\Models\KillZone\KillZone; use App\Models\KillZone\KillZoneEnemy; diff --git a/app/Http/Controllers/Ajax/AjaxLiveSessionController.php b/app/Http/Controllers/Ajax/AjaxLiveSessionController.php index 83aab21de..363eca4b0 100644 --- a/app/Http/Controllers/Ajax/AjaxLiveSessionController.php +++ b/app/Http/Controllers/Ajax/AjaxLiveSessionController.php @@ -4,7 +4,7 @@ use App\Events\LiveSession\StopEvent; use App\Http\Controllers\Controller; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\LiveSession; use Exception; use Illuminate\Contracts\Routing\ResponseFactory; diff --git a/app/Http/Controllers/Ajax/AjaxMapIconController.php b/app/Http/Controllers/Ajax/AjaxMapIconController.php index d833463d9..eaa56725d 100644 --- a/app/Http/Controllers/Ajax/AjaxMapIconController.php +++ b/app/Http/Controllers/Ajax/AjaxMapIconController.php @@ -5,7 +5,7 @@ use App\Events\Model\ModelDeletedEvent; use App\Http\Controllers\Traits\PublicKeyDungeonRoute; use App\Http\Requests\MapIcon\MapIconFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\MapIcon; use App\Models\MapIconType; use App\Models\Mapping\MappingModelInterface; diff --git a/app/Http/Controllers/Ajax/AjaxMetricController.php b/app/Http/Controllers/Ajax/AjaxMetricController.php index 469b1bac6..e6730d9f7 100644 --- a/app/Http/Controllers/Ajax/AjaxMetricController.php +++ b/app/Http/Controllers/Ajax/AjaxMetricController.php @@ -5,7 +5,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Metric\APIDungeonRouteMetricFormRequest; use App\Http\Requests\Metric\APIMetricFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\Metric\MetricServiceInterface; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Http\Response; diff --git a/app/Http/Controllers/Ajax/AjaxOverpulledEnemyController.php b/app/Http/Controllers/Ajax/AjaxOverpulledEnemyController.php index d17630d05..6fe49c816 100644 --- a/app/Http/Controllers/Ajax/AjaxOverpulledEnemyController.php +++ b/app/Http/Controllers/Ajax/AjaxOverpulledEnemyController.php @@ -6,7 +6,7 @@ use App\Events\OverpulledEnemy\OverpulledEnemyDeletedEvent; use App\Http\Controllers\Controller; use App\Http\Requests\OverpulledEnemy\OverpulledEnemyFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemies\OverpulledEnemy; use App\Models\Enemy; use App\Models\LiveSession; diff --git a/app/Http/Controllers/Ajax/AjaxPathController.php b/app/Http/Controllers/Ajax/AjaxPathController.php index 2e241882a..2d473d0e8 100644 --- a/app/Http/Controllers/Ajax/AjaxPathController.php +++ b/app/Http/Controllers/Ajax/AjaxPathController.php @@ -7,7 +7,7 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\SavesPolylines; use App\Http\Requests\Path\APIPathFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Path; use App\Models\Polyline; use App\Service\Coordinates\CoordinatesServiceInterface; diff --git a/app/Http/Controllers/Ajax/AjaxPridefulEnemyController.php b/app/Http/Controllers/Ajax/AjaxPridefulEnemyController.php index d3413b518..2f6240c4c 100644 --- a/app/Http/Controllers/Ajax/AjaxPridefulEnemyController.php +++ b/app/Http/Controllers/Ajax/AjaxPridefulEnemyController.php @@ -5,7 +5,7 @@ use App\Events\Model\ModelChangedEvent; use App\Events\Model\ModelDeletedEvent; use App\Http\Controllers\Controller; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemies\PridefulEnemy; use App\Models\Enemy; use Exception; diff --git a/app/Http/Controllers/Ajax/AjaxTagController.php b/app/Http/Controllers/Ajax/AjaxTagController.php index a56f7bfb0..a7893e4c9 100644 --- a/app/Http/Controllers/Ajax/AjaxTagController.php +++ b/app/Http/Controllers/Ajax/AjaxTagController.php @@ -5,7 +5,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Tag\APITagFormRequest; use App\Http\Requests\Tag\APITagUpdateFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Tags\Tag; use App\Models\Tags\TagCategory; use App\Models\Traits\HasTags; diff --git a/app/Http/Controllers/Ajax/AjaxTeamController.php b/app/Http/Controllers/Ajax/AjaxTeamController.php index 3c77a85fb..aac5972df 100644 --- a/app/Http/Controllers/Ajax/AjaxTeamController.php +++ b/app/Http/Controllers/Ajax/AjaxTeamController.php @@ -4,7 +4,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Team\TeamDefaultRoleFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Patreon\PatreonAdFreeGiveaway; use App\Models\Patreon\PatreonBenefit; use App\Models\Team; diff --git a/app/Http/Controllers/Ajax/AjaxUserReportController.php b/app/Http/Controllers/Ajax/AjaxUserReportController.php index e99972789..eec8fac5b 100644 --- a/app/Http/Controllers/Ajax/AjaxUserReportController.php +++ b/app/Http/Controllers/Ajax/AjaxUserReportController.php @@ -4,7 +4,7 @@ use App\Http\Requests\UserReportFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemy; use App\Models\UserReport; use Illuminate\Database\Eloquent\Model; diff --git a/app/Http/Controllers/DungeonRouteController.php b/app/Http/Controllers/DungeonRouteController.php index 3c7f4b10a..e2b8464f1 100644 --- a/app/Http/Controllers/DungeonRouteController.php +++ b/app/Http/Controllers/DungeonRouteController.php @@ -9,7 +9,7 @@ use App\Jobs\RefreshEnemyForces; use App\Models\CombatLog\ChallengeModeRun; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\UserReport; use App\Service\DungeonRoute\ThumbnailServiceInterface; diff --git a/app/Http/Controllers/DungeonRouteLegacyController.php b/app/Http/Controllers/DungeonRouteLegacyController.php index cb1f1db8d..33810414f 100644 --- a/app/Http/Controllers/DungeonRouteLegacyController.php +++ b/app/Http/Controllers/DungeonRouteLegacyController.php @@ -2,10 +2,9 @@ namespace App\Http\Controllers; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Support\Str; /** * Class DungeonRouteLegacyController - contains all deprecated endpoints for dungeonroutes to keep the OG file clean diff --git a/app/Http/Controllers/LiveSessionController.php b/app/Http/Controllers/LiveSessionController.php index c2ef8fe7e..d9732e67a 100644 --- a/app/Http/Controllers/LiveSessionController.php +++ b/app/Http/Controllers/LiveSessionController.php @@ -4,7 +4,7 @@ use App\Events\LiveSession\InviteEvent; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\LiveSession; use App\Models\Team; diff --git a/app/Http/Controllers/LiveSessionLegacyController.php b/app/Http/Controllers/LiveSessionLegacyController.php index 11aef7e51..fd8832e1d 100644 --- a/app/Http/Controllers/LiveSessionLegacyController.php +++ b/app/Http/Controllers/LiveSessionLegacyController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\LiveSession; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 5977c9ad0..913382f10 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -4,7 +4,7 @@ use App\Events\UserColorChangedEvent; use App\Http\Requests\Tag\TagFormRequest; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\LiveSession; use App\Models\Tags\Tag; use App\Models\Tags\TagCategory; diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index b2d0f1fe9..8b7ce6c7e 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\GameServerRegion; use App\Models\Release; use App\Models\Season; diff --git a/app/Http/Controllers/Traits/ListsBrushlines.php b/app/Http/Controllers/Traits/ListsBrushlines.php index ec5659ad0..c21cb466f 100644 --- a/app/Http/Controllers/Traits/ListsBrushlines.php +++ b/app/Http/Controllers/Traits/ListsBrushlines.php @@ -9,7 +9,7 @@ namespace App\Http\Controllers\Traits; use App\Models\Brushline; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Support\Collection; use Mockery\Exception; use Teapot\StatusCode\Http; @@ -36,4 +36,4 @@ function listBrushlines($floorId, ?DungeonRoute $dungeonRoute = null): Collectio return $result; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Traits/ListsKillzones.php b/app/Http/Controllers/Traits/ListsKillzones.php index f5152b97b..64e90fd92 100644 --- a/app/Http/Controllers/Traits/ListsKillzones.php +++ b/app/Http/Controllers/Traits/ListsKillzones.php @@ -8,7 +8,7 @@ namespace App\Http\Controllers\Traits; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\KillZone\KillZone; use Illuminate\Support\Collection; diff --git a/app/Http/Controllers/Traits/ListsMapIcons.php b/app/Http/Controllers/Traits/ListsMapIcons.php index 54d01270a..ae4c1bd79 100644 --- a/app/Http/Controllers/Traits/ListsMapIcons.php +++ b/app/Http/Controllers/Traits/ListsMapIcons.php @@ -8,7 +8,7 @@ namespace App\Http\Controllers\Traits; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\MapIcon; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; diff --git a/app/Http/Controllers/Traits/ListsPaths.php b/app/Http/Controllers/Traits/ListsPaths.php index b8c11fdfa..831a3a7d9 100644 --- a/app/Http/Controllers/Traits/ListsPaths.php +++ b/app/Http/Controllers/Traits/ListsPaths.php @@ -8,7 +8,7 @@ namespace App\Http\Controllers\Traits; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Path; use Illuminate\Support\Collection; @@ -28,4 +28,4 @@ function listPaths($floorId, ?DungeonRoute $dungeonRoute): Collection ->where('floor_id', $floorId) ->get(); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Traits/PublicKeyDungeonRoute.php b/app/Http/Controllers/Traits/PublicKeyDungeonRoute.php index 97f1d1707..26abc4c03 100644 --- a/app/Http/Controllers/Traits/PublicKeyDungeonRoute.php +++ b/app/Http/Controllers/Traits/PublicKeyDungeonRoute.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Traits; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Support\Facades\Auth; use Mockery\Exception; diff --git a/app/Http/Middleware/DebugInfoContextLogger.php b/app/Http/Middleware/DebugInfoContextLogger.php index 54def9443..951f8b8de 100644 --- a/app/Http/Middleware/DebugInfoContextLogger.php +++ b/app/Http/Middleware/DebugInfoContextLogger.php @@ -2,12 +2,11 @@ namespace App\Http\Middleware; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Closure; use Illuminate\Http\Request; use Illuminate\Http\Response; use Log; -use Ramsey\Uuid\Uuid; class DebugInfoContextLogger { diff --git a/app/Http/Requests/MapIcon/MapIconFormRequest.php b/app/Http/Requests/MapIcon/MapIconFormRequest.php index 412222f66..80c69ad82 100644 --- a/app/Http/Requests/MapIcon/MapIconFormRequest.php +++ b/app/Http/Requests/MapIcon/MapIconFormRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\MapIcon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\MapIconType; use App\Models\Mapping\MappingVersion; diff --git a/app/Http/Resources/AffixGroup/AffixGroupCollectionResource.php b/app/Http/Resources/AffixGroup/AffixGroupCollectionResource.php index 288ec4b56..6e29287f9 100644 --- a/app/Http/Resources/AffixGroup/AffixGroupCollectionResource.php +++ b/app/Http/Resources/AffixGroup/AffixGroupCollectionResource.php @@ -2,9 +2,7 @@ namespace App\Http\Resources\AffixGroup; -use App\Http\Resources\DungeonRoute\DungeonRouteResource; use App\Models\AffixGroup\AffixGroup; -use App\Models\DungeonRoute; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; diff --git a/app/Http/Resources/Dungeon/DungeonCollectionResource.php b/app/Http/Resources/Dungeon/DungeonCollectionResource.php index 1c47945da..9f8ca9411 100644 --- a/app/Http/Resources/Dungeon/DungeonCollectionResource.php +++ b/app/Http/Resources/Dungeon/DungeonCollectionResource.php @@ -2,9 +2,7 @@ namespace App\Http\Resources\Dungeon; -use App\Http\Resources\DungeonRoute\DungeonRouteResource; use App\Models\Dungeon; -use App\Models\DungeonRoute; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; diff --git a/app/Http/Resources/DungeonRoute/DungeonRouteCollectionResource.php b/app/Http/Resources/DungeonRoute/DungeonRouteCollectionResource.php index 3aa4527c0..61b2ebfd9 100644 --- a/app/Http/Resources/DungeonRoute/DungeonRouteCollectionResource.php +++ b/app/Http/Resources/DungeonRoute/DungeonRouteCollectionResource.php @@ -2,7 +2,7 @@ namespace App\Http\Resources\DungeonRoute; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; diff --git a/app/Http/Resources/DungeonRoute/DungeonRouteResource.php b/app/Http/Resources/DungeonRoute/DungeonRouteResource.php index b1ff6bed0..cb6eab909 100644 --- a/app/Http/Resources/DungeonRoute/DungeonRouteResource.php +++ b/app/Http/Resources/DungeonRoute/DungeonRouteResource.php @@ -4,7 +4,7 @@ use App\Http\Resources\AffixGroup\AffixGroupCollectionResource; use App\Http\Resources\UserResource; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; diff --git a/app/Jobs/ProcessRouteFloorThumbnail.php b/app/Jobs/ProcessRouteFloorThumbnail.php index 10c7a5621..ed4afe821 100644 --- a/app/Jobs/ProcessRouteFloorThumbnail.php +++ b/app/Jobs/ProcessRouteFloorThumbnail.php @@ -2,7 +2,7 @@ namespace App\Jobs; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\DungeonRoute\ThumbnailServiceInterface; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Jobs/RefreshEnemyForces.php b/app/Jobs/RefreshEnemyForces.php index f45e6372b..f0a72b08d 100644 --- a/app/Jobs/RefreshEnemyForces.php +++ b/app/Jobs/RefreshEnemyForces.php @@ -2,7 +2,7 @@ namespace App\Jobs; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Exception; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Logic/MapContext/DungeonRouteProperties.php b/app/Logic/MapContext/DungeonRouteProperties.php index 339ce00d8..c007f25d0 100644 --- a/app/Logic/MapContext/DungeonRouteProperties.php +++ b/app/Logic/MapContext/DungeonRouteProperties.php @@ -4,7 +4,7 @@ namespace App\Logic\MapContext; use App\Models\AffixGroup\AffixGroup; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; use App\Service\Coordinates\CoordinatesServiceInterface; use Illuminate\Support\Collection; diff --git a/app/Logic/MapContext/MapContextDungeonRoute.php b/app/Logic/MapContext/MapContextDungeonRoute.php index 1e98d4f98..975d0ed7e 100644 --- a/app/Logic/MapContext/MapContextDungeonRoute.php +++ b/app/Logic/MapContext/MapContextDungeonRoute.php @@ -3,7 +3,7 @@ namespace App\Logic\MapContext; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Service\Cache\CacheServiceInterface; use App\Service\Coordinates\CoordinatesServiceInterface; diff --git a/app/Logic/Scheduler/UpdateDungeonRoutePopularity.php b/app/Logic/Scheduler/UpdateDungeonRoutePopularity.php index 78b0f0a40..5b6d28941 100644 --- a/app/Logic/Scheduler/UpdateDungeonRoutePopularity.php +++ b/app/Logic/Scheduler/UpdateDungeonRoutePopularity.php @@ -8,7 +8,7 @@ namespace App\Logic\Scheduler; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/app/Logic/Scheduler/UpdateDungeonRouteRating.php b/app/Logic/Scheduler/UpdateDungeonRouteRating.php index 4f39af6bc..fe33c7372 100644 --- a/app/Logic/Scheduler/UpdateDungeonRouteRating.php +++ b/app/Logic/Scheduler/UpdateDungeonRouteRating.php @@ -8,7 +8,6 @@ namespace App\Logic\Scheduler; -use App\Models\DungeonRoute; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/app/Models/Brushline.php b/app/Models/Brushline.php index f104b15bc..8ef8577e5 100644 --- a/app/Models/Brushline.php +++ b/app/Models/Brushline.php @@ -8,6 +8,7 @@ namespace App\Models; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use Eloquent; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/CombatLog/ChallengeModeRun.php b/app/Models/CombatLog/ChallengeModeRun.php index b20935d6c..fafc3d6d1 100644 --- a/app/Models/CombatLog/ChallengeModeRun.php +++ b/app/Models/CombatLog/ChallengeModeRun.php @@ -3,7 +3,7 @@ namespace App\Models\CombatLog; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Carbon\Carbon; use Eloquent; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/Dungeon.php b/app/Models/Dungeon.php index bdce9f8a6..747054c06 100644 --- a/app/Models/Dungeon.php +++ b/app/Models/Dungeon.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\GameVersion\GameVersion; use App\Models\Mapping\MappingModelInterface; diff --git a/app/Models/DungeonRoute.php b/app/Models/DungeonRoute/DungeonRoute.php similarity index 99% rename from app/Models/DungeonRoute.php rename to app/Models/DungeonRoute/DungeonRoute.php index 7880e49dd..4d3e6c2a6 100644 --- a/app/Models/DungeonRoute.php +++ b/app/Models/DungeonRoute/DungeonRoute.php @@ -1,28 +1,39 @@ 'App\Policies\ModelPolicy', - 'App\Models\Dungeon' => 'App\Policies\DungeonRouteDiscoverDungeonPolicy', - 'App\Models\Expansion' => 'App\Policies\DungeonRouteDiscoverExpansionPolicy', - 'App\Models\Season' => 'App\Policies\DungeonRouteDiscoverSeasonPolicy', - 'App\Models\DungeonRoute' => 'App\Policies\DungeonRoutePolicy', - 'App\Models\LiveSession' => 'App\Policies\LiveSessionPolicy', - 'App\Models\Tags\Tag' => 'App\Policies\TagPolicy', - 'App\Models\Tags\TagCategory' => 'App\Policies\TagCategoryPolicy', - 'App\Models\Team' => 'App\Policies\TeamPolicy', + Dungeon::class => DungeonRouteDiscoverDungeonPolicy::class, + Expansion::class => DungeonRouteDiscoverExpansionPolicy::class, + Season::class => DungeonRouteDiscoverSeasonPolicy::class, + DungeonRoute::class => DungeonRoutePolicy::class, + LiveSession::class => LiveSessionPolicy::class, + Tag::class => TagPolicy::class, + TagCategory::class => TagCategoryPolicy::class, + Team::class => TeamPolicy::class, ]; /** diff --git a/app/SeederHelpers/RelationImport/Mapping/DungeonRouteRelationMapping.php b/app/SeederHelpers/RelationImport/Mapping/DungeonRouteRelationMapping.php index 436e0ebd0..649fc9618 100644 --- a/app/SeederHelpers/RelationImport/Mapping/DungeonRouteRelationMapping.php +++ b/app/SeederHelpers/RelationImport/Mapping/DungeonRouteRelationMapping.php @@ -4,7 +4,7 @@ namespace App\SeederHelpers\RelationImport\Mapping; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\SeederHelpers\RelationImport\Parsers\Relation\DungeonRouteAffixGroupRelationParser; use App\SeederHelpers\RelationImport\Parsers\Relation\DungeonRouteAttributesRelationParser; use App\SeederHelpers\RelationImport\Parsers\Relation\DungeonRouteBrushlinesRelationParser; diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAffixGroupRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAffixGroupRelationParser.php index c827550d5..ff8dbde0b 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAffixGroupRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAffixGroupRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAffixGroup; class DungeonRouteAffixGroupRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAttributesRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAttributesRelationParser.php index f2c65fc37..b0522223e 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAttributesRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteAttributesRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAttribute; class DungeonRouteAttributesRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteBrushlinesRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteBrushlinesRelationParser.php index e7e4fdeb7..8a0e27054 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteBrushlinesRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteBrushlinesRelationParser.php @@ -3,7 +3,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; use App\Models\Brushline; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Polyline; class DungeonRouteBrushlinesRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteEnemyRaidMarkersRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteEnemyRaidMarkersRelationParser.php index 3fd438e60..d9324e4e8 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteEnemyRaidMarkersRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteEnemyRaidMarkersRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteEnemyRaidMarker; class DungeonRouteEnemyRaidMarkersRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteKillZoneRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteKillZoneRelationParser.php index 3926a5815..b9e766d5e 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteKillZoneRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteKillZoneRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemy; use App\Models\KillZone\KillZone; use App\Models\KillZone\KillZoneEnemy; diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteMapIconsRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteMapIconsRelationParser.php index 8f3119b4d..ba6f09fc2 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteMapIconsRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRouteMapIconsRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\MapIcon; use App\Models\MapObjectToAwakenedObeliskLink; diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePathsRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePathsRelationParser.php index 3181fe2ef..fa55dd582 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePathsRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePathsRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\MapObjectToAwakenedObeliskLink; use App\Models\Path; use App\Models\Polyline; diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerClassRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerClassRelationParser.php index 4960868aa..e2e5af3ce 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerClassRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerClassRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRoutePlayerClass; class DungeonRoutePlayerClassRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerRaceRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerRaceRelationParser.php index 11e4bfe98..75619ed1f 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerRaceRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerRaceRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRoutePlayerRace; class DungeonRoutePlayerRaceRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerSpecializationRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerSpecializationRelationParser.php index 84ca09353..5b34e4099 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerSpecializationRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePlayerSpecializationRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRoutePlayerSpecialization; class DungeonRoutePlayerSpecializationRelationParser implements RelationParserInterface diff --git a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePridefulEnemiesRelationParser.php b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePridefulEnemiesRelationParser.php index a601caaa3..1eb8b5dba 100644 --- a/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePridefulEnemiesRelationParser.php +++ b/app/SeederHelpers/RelationImport/Parsers/Relation/DungeonRoutePridefulEnemiesRelationParser.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Parsers\Relation; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; class DungeonRoutePridefulEnemiesRelationParser implements RelationParserInterface { diff --git a/app/Service/Cache/CacheService.php b/app/Service/Cache/CacheService.php index 4003dee7b..db0c0e3c0 100644 --- a/app/Service/Cache/CacheService.php +++ b/app/Service/Cache/CacheService.php @@ -4,7 +4,7 @@ namespace App\Service\Cache; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Closure; use DateInterval; use Illuminate\Support\Facades\Cache; diff --git a/app/Service/CombatLog/Builders/CreateRouteBodyDungeonRouteBuilder.php b/app/Service/CombatLog/Builders/CreateRouteBodyDungeonRouteBuilder.php index ae3e7fd07..c47b3945e 100644 --- a/app/Service/CombatLog/Builders/CreateRouteBodyDungeonRouteBuilder.php +++ b/app/Service/CombatLog/Builders/CreateRouteBodyDungeonRouteBuilder.php @@ -5,7 +5,7 @@ use App; use App\Models\AffixGroup\AffixGroup; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAffixGroup; use App\Models\Faction; use App\Models\Floor\Floor; diff --git a/app/Service/CombatLog/Builders/DungeonRouteBuilder.php b/app/Service/CombatLog/Builders/DungeonRouteBuilder.php index 587a48694..3ccf68145 100644 --- a/app/Service/CombatLog/Builders/DungeonRouteBuilder.php +++ b/app/Service/CombatLog/Builders/DungeonRouteBuilder.php @@ -5,7 +5,7 @@ use App; use App\Logic\Structs\IngameXY; use App\Logic\Structs\LatLng; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemy; use App\Models\EnemyPatrol; use App\Models\Floor\Floor; diff --git a/app/Service/CombatLog/Builders/ResultEventDungeonRouteBuilder.php b/app/Service/CombatLog/Builders/ResultEventDungeonRouteBuilder.php index 9ec1c3bed..37defc8a4 100644 --- a/app/Service/CombatLog/Builders/ResultEventDungeonRouteBuilder.php +++ b/app/Service/CombatLog/Builders/ResultEventDungeonRouteBuilder.php @@ -5,7 +5,7 @@ use App; use App\Logic\CombatLog\SpecialEvents\MapChange as MapChangeCombatLogEvent; use App\Logic\CombatLog\SpecialEvents\UnitDied; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\CombatLog\Logging\ResultEventDungeonRouteBuilderLoggingInterface; use App\Service\CombatLog\Models\ActivePull\ActivePull; use App\Service\CombatLog\Models\ActivePull\ActivePullEnemy; diff --git a/app/Service/CombatLog/CombatLogService.php b/app/Service/CombatLog/CombatLogService.php index 3db76411e..151122198 100644 --- a/app/Service/CombatLog/CombatLogService.php +++ b/app/Service/CombatLog/CombatLogService.php @@ -10,7 +10,7 @@ use App\Logic\CombatLog\SpecialEvents\MapChange as MapChangeEvent; use App\Logic\CombatLog\SpecialEvents\SpecialEvent; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\CombatLog\Exceptions\DungeonNotSupportedException; use App\Service\CombatLog\Filters\DungeonRoute\CombatLogDungeonRouteFilter; use App\Service\CombatLog\Filters\DungeonRoute\DungeonRouteFilter; diff --git a/app/Service/CombatLog/CreateRouteDungeonRouteService.php b/app/Service/CombatLog/CreateRouteDungeonRouteService.php index f358e7386..79d7bc3ab 100644 --- a/app/Service/CombatLog/CreateRouteDungeonRouteService.php +++ b/app/Service/CombatLog/CreateRouteDungeonRouteService.php @@ -10,7 +10,7 @@ use App\Models\CombatLog\ChallengeModeRun; use App\Models\CombatLog\ChallengeModeRunData; use App\Models\CombatLog\EnemyPosition; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\MapIcon; use App\Models\MapIconType; diff --git a/app/Service/CombatLog/CreateRouteDungeonRouteServiceInterface.php b/app/Service/CombatLog/CreateRouteDungeonRouteServiceInterface.php index 527abfab5..67732c559 100644 --- a/app/Service/CombatLog/CreateRouteDungeonRouteServiceInterface.php +++ b/app/Service/CombatLog/CreateRouteDungeonRouteServiceInterface.php @@ -2,10 +2,8 @@ namespace App\Service\CombatLog; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\CombatLog\Models\CreateRoute\CreateRouteBody; -use App\Service\CombatLog\ResultEvents\BaseResultEvent; -use Illuminate\Support\Collection; interface CreateRouteDungeonRouteServiceInterface { diff --git a/app/Service/CombatLog/Filters/DungeonRoute/CombatLogDungeonRouteFilter.php b/app/Service/CombatLog/Filters/DungeonRoute/CombatLogDungeonRouteFilter.php index 124fa8c29..d7c3f1554 100644 --- a/app/Service/CombatLog/Filters/DungeonRoute/CombatLogDungeonRouteFilter.php +++ b/app/Service/CombatLog/Filters/DungeonRoute/CombatLogDungeonRouteFilter.php @@ -2,7 +2,7 @@ namespace App\Service\CombatLog\Filters\DungeonRoute; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\CombatLog\Filters\BaseCombatLogFilter; class CombatLogDungeonRouteFilter extends BaseCombatLogFilter diff --git a/app/Service/CombatLog/Filters/DungeonRoute/DungeonRouteFilter.php b/app/Service/CombatLog/Filters/DungeonRoute/DungeonRouteFilter.php index e167c5370..49d1fe07a 100644 --- a/app/Service/CombatLog/Filters/DungeonRoute/DungeonRouteFilter.php +++ b/app/Service/CombatLog/Filters/DungeonRoute/DungeonRouteFilter.php @@ -7,7 +7,7 @@ use App\Logic\CombatLog\SpecialEvents\CombatLogVersion; use App\Models\AffixGroup\AffixGroup; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAffixGroup; use App\Models\Faction; use App\Models\PublishedState; diff --git a/app/Service/CombatLog/ResultEventDungeonRouteService.php b/app/Service/CombatLog/ResultEventDungeonRouteService.php index 926fc270a..48312bb93 100644 --- a/app/Service/CombatLog/ResultEventDungeonRouteService.php +++ b/app/Service/CombatLog/ResultEventDungeonRouteService.php @@ -7,7 +7,7 @@ use App\Logic\Structs\IngameXY; use App\Models\CombatLog\ChallengeModeRun; use App\Models\CombatLog\EnemyPosition; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\MapIcon; use App\Models\MapIconType; use App\Models\Mapping\MappingVersion; @@ -22,11 +22,11 @@ use App\Service\CombatLog\ResultEvents\EnemyEngaged as EnemyEngagedResultEvent; use App\Service\CombatLog\ResultEvents\MapChange as MapChangeResultEvent; use App\Service\Coordinates\CoordinatesServiceInterface; +use App\Service\Season\SeasonServiceInterface; use Carbon\Carbon; use Exception; use Illuminate\Support\Collection; use InvalidArgumentException; -use App\Service\Season\SeasonServiceInterface; class ResultEventDungeonRouteService implements ResultEventDungeonRouteServiceInterface { diff --git a/app/Service/CombatLog/ResultEventDungeonRouteServiceInterface.php b/app/Service/CombatLog/ResultEventDungeonRouteServiceInterface.php index 528031983..59615b74d 100644 --- a/app/Service/CombatLog/ResultEventDungeonRouteServiceInterface.php +++ b/app/Service/CombatLog/ResultEventDungeonRouteServiceInterface.php @@ -2,7 +2,7 @@ namespace App\Service\CombatLog; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Support\Collection; interface ResultEventDungeonRouteServiceInterface diff --git a/app/Service/DungeonRoute/CoverageService.php b/app/Service/DungeonRoute/CoverageService.php index 4efb8fcbb..ec9e87178 100644 --- a/app/Service/DungeonRoute/CoverageService.php +++ b/app/Service/DungeonRoute/CoverageService.php @@ -3,7 +3,7 @@ namespace App\Service\DungeonRoute; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Season; use App\User; use Illuminate\Support\Collection; diff --git a/app/Service/DungeonRoute/DevDiscoverService.php b/app/Service/DungeonRoute/DevDiscoverService.php index fa7b95e2d..960e3eb4b 100644 --- a/app/Service/DungeonRoute/DevDiscoverService.php +++ b/app/Service/DungeonRoute/DevDiscoverService.php @@ -5,7 +5,7 @@ use App\Models\AffixGroup\AffixGroupBase; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Season; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; diff --git a/app/Service/DungeonRoute/DiscoverService.php b/app/Service/DungeonRoute/DiscoverService.php index 3f2b2158a..d05aeec9d 100644 --- a/app/Service/DungeonRoute/DiscoverService.php +++ b/app/Service/DungeonRoute/DiscoverService.php @@ -5,7 +5,7 @@ use App\Models\AffixGroup\AffixGroupBase; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAffixGroup; use App\Models\GameServerRegion; use App\Models\PublishedState; diff --git a/app/Service/DungeonRoute/ThumbnailService.php b/app/Service/DungeonRoute/ThumbnailService.php index d0ced5d60..3e9f55484 100644 --- a/app/Service/DungeonRoute/ThumbnailService.php +++ b/app/Service/DungeonRoute/ThumbnailService.php @@ -4,7 +4,7 @@ namespace App\Service\DungeonRoute; use App\Jobs\ProcessRouteFloorThumbnail; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use Carbon\Carbon; use Illuminate\Support\Facades\File; diff --git a/app/Service/DungeonRoute/ThumbnailServiceInterface.php b/app/Service/DungeonRoute/ThumbnailServiceInterface.php index 02a93995e..da0098e9e 100644 --- a/app/Service/DungeonRoute/ThumbnailServiceInterface.php +++ b/app/Service/DungeonRoute/ThumbnailServiceInterface.php @@ -3,7 +3,7 @@ namespace App\Service\DungeonRoute; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; interface ThumbnailServiceInterface { diff --git a/app/Service/MDT/MDTExportStringService.php b/app/Service/MDT/MDTExportStringService.php index 0f352cd15..d26f65027 100644 --- a/app/Service/MDT/MDTExportStringService.php +++ b/app/Service/MDT/MDTExportStringService.php @@ -6,7 +6,7 @@ use App\Logic\MDT\Data\MDTDungeon; use App\Logic\MDT\Exception\ImportWarning; use App\Models\Brushline; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\KillZone\KillZone; use App\Models\MapIcon; use App\Models\Mapping\MappingVersion; diff --git a/app/Service/MDT/MDTExportStringServiceInterface.php b/app/Service/MDT/MDTExportStringServiceInterface.php index 3dace3a71..cce81afa0 100644 --- a/app/Service/MDT/MDTExportStringServiceInterface.php +++ b/app/Service/MDT/MDTExportStringServiceInterface.php @@ -2,7 +2,7 @@ namespace App\Service\MDT; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use Illuminate\Support\Collection; interface MDTExportStringServiceInterface diff --git a/app/Service/MDT/MDTImportStringService.php b/app/Service/MDT/MDTImportStringService.php index 52d6fab32..fb3efdf59 100644 --- a/app/Service/MDT/MDTImportStringService.php +++ b/app/Service/MDT/MDTImportStringService.php @@ -14,7 +14,7 @@ use App\Models\AffixGroup\AffixGroup; use App\Models\Brushline; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\DungeonRoute\DungeonRouteAffixGroup; use App\Models\Enemy; use App\Models\Floor\Floor; diff --git a/app/Service/MDT/MDTImportStringServiceInterface.php b/app/Service/MDT/MDTImportStringServiceInterface.php index 6b4c00fa5..0cca69355 100644 --- a/app/Service/MDT/MDTImportStringServiceInterface.php +++ b/app/Service/MDT/MDTImportStringServiceInterface.php @@ -2,7 +2,7 @@ namespace App\Service\MDT; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Service\MDT\Models\ImportStringDetails; use Illuminate\Support\Collection; diff --git a/app/Service/MapContext/MapContextService.php b/app/Service/MapContext/MapContextService.php index 23a934d5e..74acfc82c 100644 --- a/app/Service/MapContext/MapContextService.php +++ b/app/Service/MapContext/MapContextService.php @@ -7,7 +7,7 @@ use App\Logic\MapContext\MapContextLiveSession; use App\Logic\MapContext\MapContextMappingVersionEdit; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\LiveSession; use App\Models\Mapping\MappingVersion; diff --git a/app/Service/MapContext/MapContextServiceInterface.php b/app/Service/MapContext/MapContextServiceInterface.php index 8148f76b3..35ede74dc 100644 --- a/app/Service/MapContext/MapContextServiceInterface.php +++ b/app/Service/MapContext/MapContextServiceInterface.php @@ -7,7 +7,7 @@ use App\Logic\MapContext\MapContextLiveSession; use App\Logic\MapContext\MapContextMappingVersionEdit; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Floor\Floor; use App\Models\LiveSession; use App\Models\Mapping\MappingVersion; diff --git a/app/Service/View/ViewService.php b/app/Service/View/ViewService.php index 0a6d96960..fc81cbc75 100644 --- a/app/Service/View/ViewService.php +++ b/app/Service/View/ViewService.php @@ -8,7 +8,7 @@ use App\Models\CharacterClassSpecialization; use App\Models\CharacterRace; use App\Models\Dungeon; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\Expansion; use App\Models\Faction; use App\Models\GameServerRegion; diff --git a/app/User.php b/app/User.php index b19dfdf81..661369859 100644 --- a/app/User.php +++ b/app/User.php @@ -3,7 +3,7 @@ namespace App; use App\Email\CustomPasswordResetEmail; -use App\Models\DungeonRoute; +use App\Models\DungeonRoute\DungeonRoute; use App\Models\GameServerRegion; use App\Models\GameVersion\GameVersion; use App\Models\Patreon\PatreonAdFreeGiveaway; diff --git a/database/migrations/2022_01_31_201140_fix_team_id_on_dungeon_route_table.php b/database/migrations/2022_01_31_201140_fix_team_id_on_dungeon_route_table.php index 9d591b65e..a56278cf2 100644 --- a/database/migrations/2022_01_31_201140_fix_team_id_on_dungeon_route_table.php +++ b/database/migrations/2022_01_31_201140_fix_team_id_on_dungeon_route_table.php @@ -1,6 +1,6 @@ @extends('layouts.sitepage', [ 'showAds' => false, diff --git a/resources/views/common/dungeonroute/attributes.blade.php b/resources/views/common/dungeonroute/attributes.blade.php index e45c33525..fd69fb5b0 100644 --- a/resources/views/common/dungeonroute/attributes.blade.php +++ b/resources/views/common/dungeonroute/attributes.blade.php @@ -1,5 +1,5 @@ @foreach ($routeAttributes as $category => $categoryAttributes) - @foreach ($categoryAttributes as $attribute) { + @foreach ($categoryAttributes as $attribute)
+
+ + @endif
  • @@ -324,7 +319,7 @@ class="btn btn-success w-100">