From a5fb02f376d71ca3118c4c12e19cd7514cf06461 Mon Sep 17 00:00:00 2001 From: andyksaw Date: Sat, 2 Nov 2024 15:04:20 +0900 Subject: [PATCH] Rename panel to manage --- .../BanAppealConfirmationNotification.php | 2 +- .../BuilderRankAppSubmittedNotification.php | 2 +- .../Front/BanAppeal/BanAppealController.php | 4 +- .../Controllers/Front/BanlistController.php | 2 +- .../{Panel => Manage}/AccountActivate.php | 2 +- .../AccountApproveEmailChange.php | 2 +- .../{Panel => Manage}/AccountController.php | 4 +- .../{Panel => Manage}/AccountGameAccount.php | 2 +- .../AccountResendActivation.php | 2 +- .../{Panel => Manage}/AccountUpdateBadges.php | 2 +- .../{Panel => Manage}/AccountUpdateGroups.php | 2 +- .../{Panel => Manage}/ActivityController.php | 2 +- .../{Panel => Manage}/BadgeController.php | 8 +-- .../{Panel => Manage}/BanAppealController.php | 4 +- .../BuilderRanksController.php | 2 +- .../{Panel => Manage}/DonationController.php | 8 +-- .../DonationPerksController.php | 8 +-- .../{Panel => Manage}/GameIPBanController.php | 10 ++-- .../GamePlayerBanController.php | 10 ++-- .../GroupAccountController.php | 2 +- .../{Panel => Manage}/GroupController.php | 2 +- .../MinecraftConfigController.php | 4 +- .../MinecraftPlayerController.php | 6 +-- .../MinecraftPlayerLookupController.php | 6 +-- .../MinecraftWarpController.php | 8 +-- .../PlayerWarningController.php | 10 ++-- .../{Panel => Manage}/ServerController.php | 8 +-- .../ServerTokenController.php | 8 +-- .../ShowcaseWarpsController.php | 8 +-- app/Models/Account.php | 2 +- app/Models/Badge.php | 2 +- app/Models/BanAppeal.php | 2 +- app/Models/BuilderRankApplication.php | 2 +- app/Models/Donation.php | 2 +- app/Models/DonationPerk.php | 2 +- app/Models/GameIPBan.php | 2 +- app/Models/GamePlayerBan.php | 2 +- app/Models/Group.php | 2 +- app/Models/MinecraftPlayer.php | 2 +- app/Models/PlayerWarning.php | 2 +- app/Models/Server.php | 2 +- app/Models/ServerToken.php | 2 +- bootstrap/app.php | 2 +- resources/views/admin/account/edit.blade.php | 2 +- resources/views/admin/account/index.blade.php | 6 +-- resources/views/admin/account/show.blade.php | 20 +++---- .../views/admin/activity/_filter.blade.php | 4 +- .../views/admin/activity/index.blade.php | 2 +- resources/views/admin/badges/create.blade.php | 2 +- resources/views/admin/badges/edit.blade.php | 4 +- resources/views/admin/badges/index.blade.php | 4 +- .../views/admin/ban-appeal/index.blade.php | 6 +-- .../views/admin/ban-appeal/show.blade.php | 8 +-- .../ban-appeal/status/_decision-kv.blade.php | 2 +- .../views/admin/builder-rank/index.blade.php | 6 +-- .../views/admin/builder-rank/show.blade.php | 6 +-- .../admin/donation-perk/create.blade.php | 2 +- .../views/admin/donation-perk/edit.blade.php | 2 +- .../views/admin/donation/create.blade.php | 2 +- resources/views/admin/donation/edit.blade.php | 2 +- .../views/admin/donation/index.blade.php | 6 +-- resources/views/admin/donation/show.blade.php | 12 ++--- resources/views/admin/group/index.blade.php | 2 +- .../views/admin/ip-bans/create.blade.php | 2 +- resources/views/admin/ip-bans/edit.blade.php | 4 +- resources/views/admin/ip-bans/index.blade.php | 6 +-- .../views/admin/layouts/_sidebar.blade.php | 34 ++++++------ resources/views/admin/layouts/admin.blade.php | 2 +- .../admin/minecraft-config/create.blade.php | 2 +- .../admin/minecraft-player/create.blade.php | 2 +- .../admin/minecraft-player/edit.blade.php | 2 +- .../admin/minecraft-player/index.blade.php | 8 +-- .../admin/minecraft-player/show.blade.php | 8 +-- .../admin/minecraft-warps/create.blade.php | 2 +- .../admin/minecraft-warps/edit.blade.php | 4 +- .../admin/minecraft-warps/index.blade.php | 4 +- .../views/admin/player-bans/create.blade.php | 2 +- .../views/admin/player-bans/edit.blade.php | 4 +- .../views/admin/player-bans/index.blade.php | 8 +-- .../admin/server-tokens/create.blade.php | 2 +- .../views/admin/server-tokens/edit.blade.php | 4 +- .../views/admin/server-tokens/index.blade.php | 6 +-- .../views/admin/servers/create.blade.php | 2 +- resources/views/admin/servers/edit.blade.php | 4 +- resources/views/admin/servers/index.blade.php | 4 +- .../admin/showcase-warps/create.blade.php | 2 +- .../views/admin/showcase-warps/edit.blade.php | 4 +- .../admin/showcase-warps/index.blade.php | 4 +- .../views/admin/warnings/create.blade.php | 2 +- resources/views/admin/warnings/edit.blade.php | 4 +- .../views/admin/warnings/index.blade.php | 8 +-- resources/views/admin/warnings/show.blade.php | 6 +-- .../front/components/account-navbar.blade.php | 2 +- .../views/front/components/navbar.blade.php | 2 +- .../pages/ban-appeal/error-pending.blade.php | 2 +- routes/{web_panel.php => web_manage.php} | 54 +++++++++---------- .../Panel/PanelAccountListTest.php | 8 +-- tests/Integration/Panel/PanelAccountTest.php | 8 +-- .../Panel/PanelBanAppealDecisionTest.php | 18 +++---- .../Panel/PanelBanAppealViewTest.php | 12 ++--- .../Panel/PanelDonationPerkDeleteTest.php | 4 +- .../Panel/PanelDonationPerkUpdateTest.php | 4 +- .../Panel/PanelDonationsListTest.php | 6 +-- .../Panel/PanelGroupMemberTest.php | 6 +-- tests/Integration/Panel/PanelGroupsTest.php | 6 +-- .../Panel/PanelMinecraftPlayerCreateTest.php | 14 ++--- .../Panel/PanelMinecraftPlayerEditTest.php | 18 +++---- .../Panel/PanelMinecraftPlayerLookupTest.php | 36 ++++++------- .../Panel/PanelMinecraftPlayerShowTest.php | 8 +-- .../Panel/PanelMinecraftPlayersListTest.php | 10 ++-- tests/Integration/Panel/PanelTest.php | 6 +-- 111 files changed, 319 insertions(+), 319 deletions(-) rename app/Http/Controllers/{Panel => Manage}/AccountActivate.php (90%) rename app/Http/Controllers/{Panel => Manage}/AccountApproveEmailChange.php (93%) rename app/Http/Controllers/{Panel => Manage}/AccountController.php (93%) rename app/Http/Controllers/{Panel => Manage}/AccountGameAccount.php (94%) rename app/Http/Controllers/{Panel => Manage}/AccountResendActivation.php (88%) rename app/Http/Controllers/{Panel => Manage}/AccountUpdateBadges.php (92%) rename app/Http/Controllers/{Panel => Manage}/AccountUpdateGroups.php (92%) rename app/Http/Controllers/{Panel => Manage}/ActivityController.php (95%) rename app/Http/Controllers/{Panel => Manage}/BadgeController.php (92%) rename app/Http/Controllers/{Panel => Manage}/BanAppealController.php (95%) rename app/Http/Controllers/{Panel => Manage}/BuilderRanksController.php (98%) rename app/Http/Controllers/{Panel => Manage}/DonationController.php (92%) rename app/Http/Controllers/{Panel => Manage}/DonationPerksController.php (93%) rename app/Http/Controllers/{Panel => Manage}/GameIPBanController.php (90%) rename app/Http/Controllers/{Panel => Manage}/GamePlayerBanController.php (91%) rename app/Http/Controllers/{Panel => Manage}/GroupAccountController.php (91%) rename app/Http/Controllers/{Panel => Manage}/GroupController.php (89%) rename app/Http/Controllers/{Panel => Manage}/MinecraftConfigController.php (90%) rename app/Http/Controllers/{Panel => Manage}/MinecraftPlayerController.php (92%) rename app/Http/Controllers/{Panel => Manage}/MinecraftPlayerLookupController.php (91%) rename app/Http/Controllers/{Panel => Manage}/MinecraftWarpController.php (91%) rename app/Http/Controllers/{Panel => Manage}/PlayerWarningController.php (91%) rename app/Http/Controllers/{Panel => Manage}/ServerController.php (94%) rename app/Http/Controllers/{Panel => Manage}/ServerTokenController.php (92%) rename app/Http/Controllers/{Panel => Manage}/ShowcaseWarpsController.php (92%) rename routes/{web_panel.php => web_manage.php} (79%) diff --git a/app/Domains/BanAppeals/Notifications/BanAppealConfirmationNotification.php b/app/Domains/BanAppeals/Notifications/BanAppealConfirmationNotification.php index f3986872b..2d80bc3b9 100644 --- a/app/Domains/BanAppeals/Notifications/BanAppealConfirmationNotification.php +++ b/app/Domains/BanAppeals/Notifications/BanAppealConfirmationNotification.php @@ -68,7 +68,7 @@ public function toDiscord() return (new DiscordMessage) ->content('A new ban appeal has been submitted.') ->embed(function (DiscordEmbed $embed) { - $embed->title('Ban Appeal', route('front.panel.ban-appeals.show', $this->banAppeal)) + $embed->title('Ban Appeal', route('manage.ban-appeals.show', $this->banAppeal)) ->description(Str::limit($this->banAppeal->explanation, 500)) ->field('Banning Staff', $this->banAppeal->gamePlayerBan->bannerPlayer->alias ?? 'No Alias') ->field('Ban Reason', $this->banAppeal->gamePlayerBan->reason ?? '-') diff --git a/app/Domains/BuilderRankApplications/Notifications/BuilderRankAppSubmittedNotification.php b/app/Domains/BuilderRankApplications/Notifications/BuilderRankAppSubmittedNotification.php index 38d433484..3c8c54ed5 100644 --- a/app/Domains/BuilderRankApplications/Notifications/BuilderRankAppSubmittedNotification.php +++ b/app/Domains/BuilderRankApplications/Notifications/BuilderRankAppSubmittedNotification.php @@ -73,7 +73,7 @@ public function toDiscord() return (new DiscordMessage) ->content('<@&839756575153324032> A new builder rank application has arrived.') ->embed(function (DiscordEmbed $embed) { - $embed->title('Builder Rank Application', route('front.panel.builder-ranks.show', $this->builderRankApplication)) + $embed->title('Builder Rank Application', route('manage.builder-ranks.show', $this->builderRankApplication)) ->field('Current build rank', $this->builderRankApplication->current_builder_rank) ->field('Build location', $this->builderRankApplication->build_location) ->field('Build description', Str::limit($this->builderRankApplication->build_description, 500)) diff --git a/app/Http/Controllers/Front/BanAppeal/BanAppealController.php b/app/Http/Controllers/Front/BanAppeal/BanAppealController.php index ecac077ad..a5c2d8d60 100644 --- a/app/Http/Controllers/Front/BanAppeal/BanAppealController.php +++ b/app/Http/Controllers/Front/BanAppeal/BanAppealController.php @@ -20,7 +20,7 @@ class BanAppealController extends WebController public function index(Request $request) { $bans = $request->user()?->gamePlayerBans() - ->with(['banAppeals', 'bannerPlayer.aliases', 'bannedPlayer.aliases']) + ->with(['banAppeals', 'bannerPlayer', 'bannedPlayer']) ->latest()->get() ?? collect(); return view('front.pages.ban-appeal.index')->with([ @@ -46,7 +46,7 @@ public function create(GamePlayerBan $ban, Request $request, CreateBanAppeal $us $bannedPlayer = $ban->bannedPlayer; $banHistory = $bannedPlayer->gamePlayerBans() - ->with(['bannerPlayer.aliases', 'bannedPlayer.aliases']) + ->with(['bannerPlayer', 'bannedPlayer']) ->latest()->get(); return view('front.pages.ban-appeal.create')->with([ diff --git a/app/Http/Controllers/Front/BanlistController.php b/app/Http/Controllers/Front/BanlistController.php index 8d71bdf4d..de8500383 100644 --- a/app/Http/Controllers/Front/BanlistController.php +++ b/app/Http/Controllers/Front/BanlistController.php @@ -11,7 +11,7 @@ final class BanlistController extends WebController public function index(Request $request) { $bans = GamePlayerBan::active() - ->with(['bannedPlayer', 'bannerPlayer', 'bannerPlayer.aliases']) + ->with(['bannedPlayer', 'bannerPlayer']) ->latest(); if ($request->has('query') && !empty($request->input('query'))) { diff --git a/app/Http/Controllers/Panel/AccountActivate.php b/app/Http/Controllers/Manage/AccountActivate.php similarity index 90% rename from app/Http/Controllers/Panel/AccountActivate.php rename to app/Http/Controllers/Manage/AccountActivate.php index d5e54826c..4fdcd818e 100644 --- a/app/Http/Controllers/Panel/AccountActivate.php +++ b/app/Http/Controllers/Manage/AccountActivate.php @@ -1,6 +1,6 @@ emailChangeRequests()->delete(); - return redirect(route('front.panel.accounts.show', $account)); + return redirect(route('manage.accounts.show', $account)); } } diff --git a/app/Http/Controllers/Panel/AccountGameAccount.php b/app/Http/Controllers/Manage/AccountGameAccount.php similarity index 94% rename from app/Http/Controllers/Panel/AccountGameAccount.php rename to app/Http/Controllers/Manage/AccountGameAccount.php index 3faa11296..1bebf5377 100644 --- a/app/Http/Controllers/Panel/AccountGameAccount.php +++ b/app/Http/Controllers/Manage/AccountGameAccount.php @@ -1,6 +1,6 @@ $request->get('list_hidden', 0), ]); - return redirect(route('front.panel.badges.index')); + return redirect(route('manage.badges.index')); } /** @@ -84,7 +84,7 @@ public function update(Request $request, int $badgeId): RedirectResponse $badge->update($input); $badge->save(); - return redirect(route('front.panel.badges.index')); + return redirect(route('manage.badges.index')); } public function destroy(Request $request, int $badgeId): RedirectResponse @@ -92,6 +92,6 @@ public function destroy(Request $request, int $badgeId): RedirectResponse $badge = Badge::find($badgeId); $badge->delete(); - return redirect(route('front.panel.badges.index')); + return redirect(route('manage.badges.index')); } } diff --git a/app/Http/Controllers/Panel/BanAppealController.php b/app/Http/Controllers/Manage/BanAppealController.php similarity index 95% rename from app/Http/Controllers/Panel/BanAppealController.php rename to app/Http/Controllers/Manage/BanAppealController.php index 2ca216f7a..b9a06c739 100644 --- a/app/Http/Controllers/Panel/BanAppealController.php +++ b/app/Http/Controllers/Manage/BanAppealController.php @@ -1,6 +1,6 @@ notify(new BanAppealUpdatedNotification($banAppeal->showLink())); - return redirect()->route('front.panel.ban-appeals.show', $banAppeal); + return redirect()->route('manage.ban-appeals.show', $banAppeal); } } diff --git a/app/Http/Controllers/Panel/BuilderRanksController.php b/app/Http/Controllers/Manage/BuilderRanksController.php similarity index 98% rename from app/Http/Controllers/Panel/BuilderRanksController.php rename to app/Http/Controllers/Manage/BuilderRanksController.php index 584e6be36..38e71dceb 100644 --- a/app/Http/Controllers/Panel/BuilderRanksController.php +++ b/app/Http/Controllers/Manage/BuilderRanksController.php @@ -1,6 +1,6 @@ $request->get('created_at'), ]); - return redirect(route('front.panel.donations.index')); + return redirect(route('manage.donations.index')); } /** @@ -104,7 +104,7 @@ public function update(Request $request, Donation $donation) $donation->update($request->all()); $donation->save(); - return redirect(route('front.panel.donations.show', $donation->donation_id)); + return redirect(route('manage.donations.show', $donation->donation_id)); } /** @@ -117,6 +117,6 @@ public function destroy(Request $request, Donation $donation) { $donation->delete(); - return redirect(route('front.panel.donations.index')); + return redirect(route('manage.donations.index')); } } diff --git a/app/Http/Controllers/Panel/DonationPerksController.php b/app/Http/Controllers/Manage/DonationPerksController.php similarity index 93% rename from app/Http/Controllers/Panel/DonationPerksController.php rename to app/Http/Controllers/Manage/DonationPerksController.php index 3c15a6f29..252810bdd 100644 --- a/app/Http/Controllers/Panel/DonationPerksController.php +++ b/app/Http/Controllers/Manage/DonationPerksController.php @@ -1,6 +1,6 @@ $request->get('created_at'), ]); - return redirect(route('front.panel.donations.show', $perk->donation)); + return redirect(route('manage.donations.show', $perk->donation)); } /** @@ -122,7 +122,7 @@ public function update(Request $request, DonationPerk $donationPerk) $donationPerk->update($request->all()); $donationPerk->save(); - return redirect(route('front.panel.donations.show', $donationPerk->donation)); + return redirect(route('manage.donations.show', $donationPerk->donation)); } /** @@ -136,6 +136,6 @@ public function destroy(Request $request, DonationPerk $donationPerk) $donation = $donationPerk->donation; $donationPerk->delete(); - return redirect(route('front.panel.donations.show', $donation)); + return redirect(route('manage.donations.show', $donation)); } } diff --git a/app/Http/Controllers/Panel/GameIPBanController.php b/app/Http/Controllers/Manage/GameIPBanController.php similarity index 90% rename from app/Http/Controllers/Panel/GameIPBanController.php rename to app/Http/Controllers/Manage/GameIPBanController.php index d29b71b6d..96b9108f3 100644 --- a/app/Http/Controllers/Panel/GameIPBanController.php +++ b/app/Http/Controllers/Manage/GameIPBanController.php @@ -1,6 +1,6 @@ orderBy('created_at', 'desc') ->paginate(100); @@ -56,7 +56,7 @@ public function store(Request $request): RedirectResponse IpAddressBanned::dispatch($ban); - return redirect(route('front.panel.ip-bans.index')); + return redirect(route('manage.ip-bans.index')); } /** @@ -88,13 +88,13 @@ public function update(Request $request, int $banId): RedirectResponse GameIPBan::find($banId)->update($request->all()); - return redirect(route('front.panel.ip-bans.index')); + return redirect(route('manage.ip-bans.index')); } public function destroy(Request $request, int $banId): RedirectResponse { GameIPBan::find($banId)->delete(); - return redirect(route('front.panel.ip-bans.index')); + return redirect(route('manage.ip-bans.index')); } } diff --git a/app/Http/Controllers/Panel/GamePlayerBanController.php b/app/Http/Controllers/Manage/GamePlayerBanController.php similarity index 91% rename from app/Http/Controllers/Panel/GamePlayerBanController.php rename to app/Http/Controllers/Manage/GamePlayerBanController.php index ddf3da4e7..1141d3aa9 100644 --- a/app/Http/Controllers/Panel/GamePlayerBanController.php +++ b/app/Http/Controllers/Manage/GamePlayerBanController.php @@ -1,6 +1,6 @@ orderBy('created_at', 'desc') ->paginate(100); @@ -70,7 +70,7 @@ public function store(Request $request): RedirectResponse MinecraftUuidBanned::dispatch($ban); - return redirect(route('front.panel.player-bans.index')); + return redirect(route('manage.player-bans.index')); } /** @@ -107,13 +107,13 @@ public function update(Request $request, int $banId): RedirectResponse GamePlayerBan::find($banId)->update($request->all()); - return redirect(route('front.panel.player-bans.index')); + return redirect(route('manage.player-bans.index')); } public function destroy(Request $request, int $banId): RedirectResponse { GamePlayerBan::find($banId)->delete(); - return redirect(route('front.panel.player-bans.index')); + return redirect(route('manage.player-bans.index')); } } diff --git a/app/Http/Controllers/Panel/GroupAccountController.php b/app/Http/Controllers/Manage/GroupAccountController.php similarity index 91% rename from app/Http/Controllers/Panel/GroupAccountController.php rename to app/Http/Controllers/Manage/GroupAccountController.php index fb16bb847..5d6d9d5b8 100644 --- a/app/Http/Controllers/Panel/GroupAccountController.php +++ b/app/Http/Controllers/Manage/GroupAccountController.php @@ -1,6 +1,6 @@ $uuid], ['account_id' => $request->account_id]); - return redirect(route('front.panel.minecraft-players.show', $mcPlayer)); + return redirect(route('manage.minecraft-players.show', $mcPlayer)); } /** @@ -94,7 +94,7 @@ public function update(Request $request, MinecraftPlayer $minecraftPlayer) 'account_id' => $request->account_id, ]); - return redirect(route('front.panel.minecraft-players.show', $minecraftPlayer)); + return redirect(route('manage.minecraft-players.show', $minecraftPlayer)); } /** diff --git a/app/Http/Controllers/Panel/MinecraftPlayerLookupController.php b/app/Http/Controllers/Manage/MinecraftPlayerLookupController.php similarity index 91% rename from app/Http/Controllers/Panel/MinecraftPlayerLookupController.php rename to app/Http/Controllers/Manage/MinecraftPlayerLookupController.php index f200a0819..4f7046269 100644 --- a/app/Http/Controllers/Panel/MinecraftPlayerLookupController.php +++ b/app/Http/Controllers/Manage/MinecraftPlayerLookupController.php @@ -1,6 +1,6 @@ all()); - return redirect(route('front.panel.minecraft.warps.index')); + return redirect(route('manage.minecraft.warps.index')); } /** @@ -82,13 +82,13 @@ public function update(Request $request, MinecraftWarp $warp): RedirectResponse $warp->update($request->all()); - return redirect(route('front.panel.minecraft.warps.index')); + return redirect(route('manage.minecraft.warps.index')); } public function destroy(Request $request, MinecraftWarp $warp): RedirectResponse { $warp->delete(); - return redirect(route('front.panel.minecraft.warps.index')); + return redirect(route('manage.minecraft.warps.index')); } } diff --git a/app/Http/Controllers/Panel/PlayerWarningController.php b/app/Http/Controllers/Manage/PlayerWarningController.php similarity index 91% rename from app/Http/Controllers/Panel/PlayerWarningController.php rename to app/Http/Controllers/Manage/PlayerWarningController.php index 436b230f5..ae3830748 100644 --- a/app/Http/Controllers/Panel/PlayerWarningController.php +++ b/app/Http/Controllers/Manage/PlayerWarningController.php @@ -1,6 +1,6 @@ orderBy('created_at', 'desc') ->paginate(100); @@ -67,7 +67,7 @@ public function store(Request $request): RedirectResponse 'acknowledged_at' => $request->get('acknowledged_at'), ]); - return redirect(route('front.panel.warnings.index')); + return redirect(route('manage.warnings.index')); } /** @@ -106,13 +106,13 @@ public function update(Request $request, int $warningId): RedirectResponse ]), ); - return redirect(route('front.panel.warnings.index')); + return redirect(route('manage.warnings.index')); } public function destroy(Request $request, int $warningId): RedirectResponse { PlayerWarning::find($warningId)->delete(); - return redirect(route('front.panel.warnings.index')); + return redirect(route('manage.warnings.index')); } } diff --git a/app/Http/Controllers/Panel/ServerController.php b/app/Http/Controllers/Manage/ServerController.php similarity index 94% rename from app/Http/Controllers/Panel/ServerController.php rename to app/Http/Controllers/Manage/ServerController.php index c7f3893ad..f982937bc 100644 --- a/app/Http/Controllers/Panel/ServerController.php +++ b/app/Http/Controllers/Manage/ServerController.php @@ -1,6 +1,6 @@ $request->get('is_querying', false), ]); - return redirect(route('front.panel.servers.index')); + return redirect(route('manage.servers.index')); } /** @@ -114,7 +114,7 @@ public function update(Request $request, int $serverId): RedirectResponse $server->is_querying = $request->get('is_querying', false); $server->save(); - return redirect(route('front.panel.servers.index')); + return redirect(route('manage.servers.index')); } /** @@ -125,6 +125,6 @@ public function destroy(Request $request, int $serverId): RedirectResponse $server = Server::find($serverId); $server->delete(); - return redirect(route('front.panel.servers.index')); + return redirect(route('manage.servers.index')); } } diff --git a/app/Http/Controllers/Panel/ServerTokenController.php b/app/Http/Controllers/Manage/ServerTokenController.php similarity index 92% rename from app/Http/Controllers/Panel/ServerTokenController.php rename to app/Http/Controllers/Manage/ServerTokenController.php index 59f26e41c..56a19920f 100644 --- a/app/Http/Controllers/Panel/ServerTokenController.php +++ b/app/Http/Controllers/Manage/ServerTokenController.php @@ -1,6 +1,6 @@ $request->get('description'), ]); - return redirect(route('front.panel.server-tokens.index')); + return redirect(route('manage.server-tokens.index')); } /** @@ -94,7 +94,7 @@ public function update(Request $request, int $tokenId): RedirectResponse $token->update($request->all()); $token->save(); - return redirect(route('front.panel.server-tokens.index')); + return redirect(route('manage.server-tokens.index')); } /** @@ -105,6 +105,6 @@ public function destroy(Request $request, int $tokenId): RedirectResponse $token = ServerToken::find($tokenId); $token->delete(); - return redirect(route('front.panel.server-tokens.index')); + return redirect(route('manage.server-tokens.index')); } } diff --git a/app/Http/Controllers/Panel/ShowcaseWarpsController.php b/app/Http/Controllers/Manage/ShowcaseWarpsController.php similarity index 92% rename from app/Http/Controllers/Panel/ShowcaseWarpsController.php rename to app/Http/Controllers/Manage/ShowcaseWarpsController.php index e3e1f8dd9..bba71343a 100644 --- a/app/Http/Controllers/Panel/ShowcaseWarpsController.php +++ b/app/Http/Controllers/Manage/ShowcaseWarpsController.php @@ -1,6 +1,6 @@ all()); - return redirect(route('front.panel.showcase-warps.index')); + return redirect(route('manage.showcase-warps.index')); } /** @@ -93,7 +93,7 @@ public function update(Request $request, int $id): RedirectResponse $warp->update($request->all()); $warp->save(); - return redirect(route('front.panel.showcase-warps.index')); + return redirect(route('manage.showcase-warps.index')); } public function destroy(Request $request, int $id): RedirectResponse @@ -101,6 +101,6 @@ public function destroy(Request $request, int $id): RedirectResponse $warp = ShowcaseWarp::find($id); $warp->delete(); - return redirect(route('front.panel.showcase-warps.index')); + return redirect(route('manage.showcase-warps.index')); } } diff --git a/app/Models/Account.php b/app/Models/Account.php index e9c593577..c7f2a4774 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -253,7 +253,7 @@ public function auditAttributeConfig(): AuditAttributes public function getActivitySubjectLink(): ?string { - return route('front.panel.accounts.show', $this); + return route('manage.accounts.show', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/Badge.php b/app/Models/Badge.php index ed8c2f9b0..db1fdf727 100644 --- a/app/Models/Badge.php +++ b/app/Models/Badge.php @@ -29,7 +29,7 @@ final class Badge extends Model implements LinkableAuditModel public function getActivitySubjectLink(): ?string { - return route('front.panel.badges.edit', $this); + return route('manage.badges.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/BanAppeal.php b/app/Models/BanAppeal.php index 16b2f8c82..ce613116c 100644 --- a/app/Models/BanAppeal.php +++ b/app/Models/BanAppeal.php @@ -99,7 +99,7 @@ public function getDecisionTempbanDuration() public function getActivitySubjectLink(): ?string { - return route('front.panel.ban-appeals.show', $this); + return route('manage.ban-appeals.show', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/BuilderRankApplication.php b/app/Models/BuilderRankApplication.php index 197df60f7..2e1fdc6cc 100644 --- a/app/Models/BuilderRankApplication.php +++ b/app/Models/BuilderRankApplication.php @@ -72,7 +72,7 @@ public function status(): ApplicationStatus public function getActivitySubjectLink(): ?string { - return route('front.panel.builder-ranks.show', $this); + return route('manage.builder-ranks.show', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/Donation.php b/app/Models/Donation.php index 1bf4d84a8..752287015 100644 --- a/app/Models/Donation.php +++ b/app/Models/Donation.php @@ -40,7 +40,7 @@ public function perks(): HasMany public function getActivitySubjectLink(): ?string { - return route('front.panel.donations.show', $this); + return route('manage.donations.show', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/DonationPerk.php b/app/Models/DonationPerk.php index 954c78b91..27030baff 100644 --- a/app/Models/DonationPerk.php +++ b/app/Models/DonationPerk.php @@ -64,7 +64,7 @@ public function donationTier(): BelongsTo public function getActivitySubjectLink(): ?string { - return route('front.panel.donations.show', $this->donation_id) + return route('manage.donations.show', $this->donation_id) .'#perk-'.$this->getKey(); } diff --git a/app/Models/GameIPBan.php b/app/Models/GameIPBan.php index 9a737e6fd..81b9ab7d7 100644 --- a/app/Models/GameIPBan.php +++ b/app/Models/GameIPBan.php @@ -53,7 +53,7 @@ public function unbannerPlayer(): BelongsTo public function getActivitySubjectLink(): ?string { - return route('front.panel.ip-bans.edit', $this); + return route('manage.ip-bans.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/GamePlayerBan.php b/app/Models/GamePlayerBan.php index 2b9461e2c..4d55c1092 100644 --- a/app/Models/GamePlayerBan.php +++ b/app/Models/GamePlayerBan.php @@ -174,7 +174,7 @@ public function toSearchableArray(): array public function getActivitySubjectLink(): ?string { - return route('front.panel.player-bans.edit', $this); + return route('manage.player-bans.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/Group.php b/app/Models/Group.php index a7153f1b6..7c7c33c1c 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -75,7 +75,7 @@ public function scopeWhereDonor(Builder $query) public function getActivitySubjectLink(): ?string { - return route('front.panel.groups.index').'#group-'.$this->getKey(); + return route('manage.groups.index').'#group-'.$this->getKey(); } public function getActivitySubjectName(): ?string diff --git a/app/Models/MinecraftPlayer.php b/app/Models/MinecraftPlayer.php index e0867c33a..2f240391d 100644 --- a/app/Models/MinecraftPlayer.php +++ b/app/Models/MinecraftPlayer.php @@ -131,7 +131,7 @@ public function auditAttributeConfig(): AuditAttributes public function getActivitySubjectLink(): ?string { - return route('front.panel.minecraft-players.show', $this); + return route('manage.minecraft-players.show', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/PlayerWarning.php b/app/Models/PlayerWarning.php index a783e653c..970c199b9 100644 --- a/app/Models/PlayerWarning.php +++ b/app/Models/PlayerWarning.php @@ -55,7 +55,7 @@ public function warnerPlayer(): BelongsTo public function getActivitySubjectLink(): ?string { - return route('front.panel.warnings.edit', $this); + return route('manage.warnings.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/Server.php b/app/Models/Server.php index dbb03d752..cce44f506 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -44,7 +44,7 @@ public function address(): string public function getActivitySubjectLink(): ?string { - return route('front.panel.servers.edit', $this); + return route('manage.servers.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/app/Models/ServerToken.php b/app/Models/ServerToken.php index a0b56e623..acbeec656 100644 --- a/app/Models/ServerToken.php +++ b/app/Models/ServerToken.php @@ -44,7 +44,7 @@ public function server(): HasOne public function getActivitySubjectLink(): ?string { - return route('front.panel.server-tokens.edit', $this); + return route('manage.server-tokens.edit', $this); } public function getActivitySubjectName(): ?string diff --git a/bootstrap/app.php b/bootstrap/app.php index 45d7c1480..c6ecb3882 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -22,7 +22,7 @@ ->withRouting( web: [ __DIR__.'/../routes/web.php', - __DIR__.'/../routes/web_panel.php', + __DIR__.'/../routes/web_manage.php', __DIR__.'/../routes/web_redirects.php', __DIR__.'/../routes/web_tests.php', ], diff --git a/resources/views/admin/account/edit.blade.php b/resources/views/admin/account/edit.blade.php index 4f931b8a3..4a8d9847d 100644 --- a/resources/views/admin/account/edit.blade.php +++ b/resources/views/admin/account/edit.blade.php @@ -8,7 +8,7 @@
@include('admin._errors') -
+ @csrf @method('PUT')
diff --git a/resources/views/admin/account/index.blade.php b/resources/views/admin/account/index.blade.php index b472193f9..29445ce3c 100644 --- a/resources/views/admin/account/index.blade.php +++ b/resources/views/admin/account/index.blade.php @@ -6,9 +6,9 @@ @if($showSearch ?? true)
@if(!empty($query)) - Clear + Clear @endif - +
@@ -46,7 +46,7 @@ {{ $account->username }} {{ $account->last_login_at }} - Manage + Manage @endforeach diff --git a/resources/views/admin/account/show.blade.php b/resources/views/admin/account/show.blade.php index 7e78ceb88..791797ffa 100644 --- a/resources/views/admin/account/show.blade.php +++ b/resources/views/admin/account/show.blade.php @@ -10,7 +10,7 @@
Details - + Edit
@@ -31,12 +31,12 @@ @unless($account->activated)
@csrf -
@csrf @@ -125,7 +125,7 @@ + action="{{ route('manage.accounts.email-change.approve', [$account, $request]) }}"> @csrf
@@ -139,7 +139,7 @@ class="inline"
-
+ @csrf
@@ -163,7 +163,7 @@ class="inline"
- + @csrf
@@ -207,7 +207,7 @@ class="inline" {{ $perk->is_active ? 'Yes' : 'No' }} - + #{{ $perk->donation_id }} @@ -220,7 +220,7 @@ class="inline" {{ $perk->created_at }} {{ $perk->expires_at }} - Edit + Edit @empty @@ -277,9 +277,9 @@ class="inline" {{ $player->created_at }} - View + View @csrf diff --git a/resources/views/admin/activity/_filter.blade.php b/resources/views/admin/activity/_filter.blade.php index 990dd3173..2d143abd9 100644 --- a/resources/views/admin/activity/_filter.blade.php +++ b/resources/views/admin/activity/_filter.blade.php @@ -2,10 +2,10 @@
@@ -35,7 +35,7 @@ {{ $player->uuid }} @if($player->account) - + {{ $player->account->username ?: '(Unset)' }} @else @@ -43,7 +43,7 @@ @endif - Details + Details @endforeach diff --git a/resources/views/admin/minecraft-player/show.blade.php b/resources/views/admin/minecraft-player/show.blade.php index abba99cfb..1f8afd919 100644 --- a/resources/views/admin/minecraft-player/show.blade.php +++ b/resources/views/admin/minecraft-player/show.blade.php @@ -20,7 +20,7 @@
Details - + Edit
@@ -47,7 +47,7 @@
@if($minecraftPlayer->account) - + {{ $minecraftPlayer->account->username ?: '(Unset)' }} @else @@ -104,7 +104,7 @@ @if($ban->bannerPlayer == null) Null @else - + {{ $ban->getBannerName() }} @endif @@ -148,7 +148,7 @@ {{ $warning->reason }} - + {{ $warning->warnerPlayer->alias ?? '(No Alias)' }} diff --git a/resources/views/admin/minecraft-warps/create.blade.php b/resources/views/admin/minecraft-warps/create.blade.php index c285ecbe6..3264e5b36 100644 --- a/resources/views/admin/minecraft-warps/create.blade.php +++ b/resources/views/admin/minecraft-warps/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.minecraft-warps._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/minecraft-warps/edit.blade.php b/resources/views/admin/minecraft-warps/edit.blade.php index ebbdbaae4..b4b5f6e70 100644 --- a/resources/views/admin/minecraft-warps/edit.blade.php +++ b/resources/views/admin/minecraft-warps/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/minecraft-warps/index.blade.php b/resources/views/admin/minecraft-warps/index.blade.php index b6d5c2f46..c92b3dec1 100644 --- a/resources/views/admin/minecraft-warps/index.blade.php +++ b/resources/views/admin/minecraft-warps/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -37,7 +37,7 @@ {{ $warp->pitch }} {{ $warp->yaw }} {{ $warp->created_at }} - Edit + Edit @endforeach diff --git a/resources/views/admin/player-bans/create.blade.php b/resources/views/admin/player-bans/create.blade.php index 909ee8460..6a2207c39 100644 --- a/resources/views/admin/player-bans/create.blade.php +++ b/resources/views/admin/player-bans/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.player-bans._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/player-bans/edit.blade.php b/resources/views/admin/player-bans/edit.blade.php index c7259085b..1d3090687 100644 --- a/resources/views/admin/player-bans/edit.blade.php +++ b/resources/views/admin/player-bans/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/player-bans/index.blade.php b/resources/views/admin/player-bans/index.blade.php index df2f81f6b..7c604eb03 100644 --- a/resources/views/admin/player-bans/index.blade.php +++ b/resources/views/admin/player-bans/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -33,14 +33,14 @@ - + {{ $ban->bannedPlayer->alias ?: '(No Alias)' }} {{ $ban->reason }} @if ($ban->bannerPlayer) - + {{ $ban->bannerPlayer?->alias ?: '(No Alias)' }} @else @@ -52,7 +52,7 @@ {{ $ban->unbanned_at ?? '-' }} {{ $ban->unban_type?->value ?? '-' }} - Edit + Edit @endforeach diff --git a/resources/views/admin/server-tokens/create.blade.php b/resources/views/admin/server-tokens/create.blade.php index 072affefa..49d6036cb 100644 --- a/resources/views/admin/server-tokens/create.blade.php +++ b/resources/views/admin/server-tokens/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.server-tokens._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/server-tokens/edit.blade.php b/resources/views/admin/server-tokens/edit.blade.php index 7384811bf..e5ae505a2 100644 --- a/resources/views/admin/server-tokens/edit.blade.php +++ b/resources/views/admin/server-tokens/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/server-tokens/index.blade.php b/resources/views/admin/server-tokens/index.blade.php index 5bfe2bb63..82e3c3f3f 100644 --- a/resources/views/admin/server-tokens/index.blade.php +++ b/resources/views/admin/server-tokens/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -25,13 +25,13 @@ {{ $token->getKey() }} - + {{ $token->server->name ?? '(Unset)' }} {{ $token->token }} {{ $token->description ?: '-' }} - Edit + Edit @endforeach diff --git a/resources/views/admin/servers/create.blade.php b/resources/views/admin/servers/create.blade.php index 2eb12f9dc..485b947f5 100644 --- a/resources/views/admin/servers/create.blade.php +++ b/resources/views/admin/servers/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.servers._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/servers/edit.blade.php b/resources/views/admin/servers/edit.blade.php index 97358fd98..64106a680 100644 --- a/resources/views/admin/servers/edit.blade.php +++ b/resources/views/admin/servers/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/servers/index.blade.php b/resources/views/admin/servers/index.blade.php index e64712a92..de7c9725c 100644 --- a/resources/views/admin/servers/index.blade.php +++ b/resources/views/admin/servers/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -30,7 +30,7 @@ {{ $server->ip }} {{ $server->port }} {{ $server->ip_alias ?: '' }} - Edit + Edit @endforeach diff --git a/resources/views/admin/showcase-warps/create.blade.php b/resources/views/admin/showcase-warps/create.blade.php index e1d4a4bcd..5eb998cf1 100644 --- a/resources/views/admin/showcase-warps/create.blade.php +++ b/resources/views/admin/showcase-warps/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.showcase-warps._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/showcase-warps/edit.blade.php b/resources/views/admin/showcase-warps/edit.blade.php index 30e45809c..b65d1fe7c 100644 --- a/resources/views/admin/showcase-warps/edit.blade.php +++ b/resources/views/admin/showcase-warps/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/showcase-warps/index.blade.php b/resources/views/admin/showcase-warps/index.blade.php index 8c8fea282..338267dcb 100644 --- a/resources/views/admin/showcase-warps/index.blade.php +++ b/resources/views/admin/showcase-warps/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -37,7 +37,7 @@ p: {{ $warp->location_pitch }}, y: {{ $warp->location_yaw }} {{ $warp->built_at }} {{ $warp->created_at }} - Edit + Edit @endforeach diff --git a/resources/views/admin/warnings/create.blade.php b/resources/views/admin/warnings/create.blade.php index 3d685f7db..9e7d49690 100644 --- a/resources/views/admin/warnings/create.blade.php +++ b/resources/views/admin/warnings/create.blade.php @@ -6,7 +6,7 @@
@include('admin._errors') - + @csrf @include('admin.warnings._form', ['buttonText' => 'Create']) diff --git a/resources/views/admin/warnings/edit.blade.php b/resources/views/admin/warnings/edit.blade.php index fef0620cc..e11082bd7 100644 --- a/resources/views/admin/warnings/edit.blade.php +++ b/resources/views/admin/warnings/edit.blade.php @@ -4,7 +4,7 @@ @section('toolbar')
- + @csrf @method('DELETE') @@ -16,7 +16,7 @@
@include('admin._errors') - + @csrf @method('PUT') diff --git a/resources/views/admin/warnings/index.blade.php b/resources/views/admin/warnings/index.blade.php index d1fb74034..f6430f09b 100644 --- a/resources/views/admin/warnings/index.blade.php +++ b/resources/views/admin/warnings/index.blade.php @@ -4,7 +4,7 @@ @section('toolbar') @endsection @@ -28,13 +28,13 @@ {{ $warning->getKey() }} - + {{ $warning->warnedPlayer->alias ?: '(No Alias)' }} {{ $warning->reason }} - + {{ $warning->warnerPlayer->alias ?: '(No Alias)' }} @@ -42,7 +42,7 @@ {{ $warning->updated_at }} {{ $warning->acknowledged_at ?? '-' }} - View + View @endforeach diff --git a/resources/views/admin/warnings/show.blade.php b/resources/views/admin/warnings/show.blade.php index 256e11434..5eb29e417 100644 --- a/resources/views/admin/warnings/show.blade.php +++ b/resources/views/admin/warnings/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('toolbar') - + Edit @endsection @@ -56,7 +56,7 @@
@@ -68,7 +68,7 @@
diff --git a/resources/views/front/components/account-navbar.blade.php b/resources/views/front/components/account-navbar.blade.php index 0cec89d23..7c53db145 100644 --- a/resources/views/front/components/account-navbar.blade.php +++ b/resources/views/front/components/account-navbar.blade.php @@ -20,7 +20,7 @@ diff --git a/resources/views/front/components/navbar.blade.php b/resources/views/front/components/navbar.blade.php index f3ea86cb9..8dabe9fed 100644 --- a/resources/views/front/components/navbar.blade.php +++ b/resources/views/front/components/navbar.blade.php @@ -24,7 +24,7 @@ @if (Auth::user()->canAccessPanel())
  • - Staff Panel + Staff Panel
  • @endif diff --git a/resources/views/front/pages/ban-appeal/error-pending.blade.php b/resources/views/front/pages/ban-appeal/error-pending.blade.php index f5c7983bb..cd43878d3 100644 --- a/resources/views/front/pages/ban-appeal/error-pending.blade.php +++ b/resources/views/front/pages/ban-appeal/error-pending.blade.php @@ -5,7 +5,7 @@

    Appeal Already Created

    @if($existingAppeal->is_account_verified) - You already have an appeal in progress. + You already have an appeal in progress. @else You already have an appeal in progress. Click the link in the appeal confirmation email to check progress. diff --git a/routes/web_panel.php b/routes/web_manage.php similarity index 79% rename from routes/web_panel.php rename to routes/web_manage.php index d882491f2..3ac90a844 100644 --- a/routes/web_panel.php +++ b/routes/web_manage.php @@ -1,35 +1,35 @@ prefix('panel') +Route::name('manage.') + ->prefix('manage') ->middleware([ 'auth', 'activated', diff --git a/tests/Integration/Panel/PanelAccountListTest.php b/tests/Integration/Panel/PanelAccountListTest.php index 6b5039dae..05f31a0b9 100644 --- a/tests/Integration/Panel/PanelAccountListTest.php +++ b/tests/Integration/Panel/PanelAccountListTest.php @@ -25,7 +25,7 @@ public function test_account_shown_in_list() $account = Account::factory()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.accounts.index')) + ->get(route('manage.accounts.index')) ->assertSee($account->username); } @@ -34,7 +34,7 @@ public function test_unactivated_account_shown_in_list() $account = Account::factory()->unactivated()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.accounts.index')) + ->get(route('manage.accounts.index')) ->assertSee($account->username); } @@ -45,7 +45,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->get(route('front.panel.accounts.index')) + ->get(route('manage.accounts.index')) ->assertUnauthorized(); } @@ -56,7 +56,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->get(route('front.panel.accounts.index')) + ->get(route('manage.accounts.index')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelAccountTest.php b/tests/Integration/Panel/PanelAccountTest.php index 87062e5be..2628928f9 100644 --- a/tests/Integration/Panel/PanelAccountTest.php +++ b/tests/Integration/Panel/PanelAccountTest.php @@ -30,7 +30,7 @@ public function test_account_details_shown() $account = Account::factory()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.accounts.show', $account)) + ->get(route('manage.accounts.show', $account)) ->assertOk() ->assertSee($account->username); } @@ -46,7 +46,7 @@ public function test_account_details_change() $this->actingAs($this->admin) ->withoutExceptionHandling() - ->put(route('front.panel.accounts.update', $account), $newData) + ->put(route('manage.accounts.update', $account), $newData) ->assertRedirect(); $this->assertDatabaseHas('accounts', $newData); @@ -61,7 +61,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->get(route('front.panel.accounts.update', $account)) + ->get(route('manage.accounts.update', $account)) ->assertUnauthorized(); } @@ -72,7 +72,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->get(route('front.panel.accounts.index')) + ->get(route('manage.accounts.index')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelBanAppealDecisionTest.php b/tests/Integration/Panel/PanelBanAppealDecisionTest.php index 46f7d55f9..0add679c9 100644 --- a/tests/Integration/Panel/PanelBanAppealDecisionTest.php +++ b/tests/Integration/Panel/PanelBanAppealDecisionTest.php @@ -42,7 +42,7 @@ public function test_error_if_account_has_no_players() ]); $this->actingAs($admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal), [ + ->put(route('manage.ban-appeals.update', $this->appeal), [ 'decision_note' => 'Some Note', 'status' => BanAppealStatus::ACCEPTED_UNBAN->value, ]) @@ -53,12 +53,12 @@ public function test_error_if_account_has_no_players() public function test_can_unban_player() { $this->actingAs($this->admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal), [ + ->put(route('manage.ban-appeals.update', $this->appeal), [ 'decision_note' => 'Some Note', 'status' => BanAppealStatus::ACCEPTED_UNBAN->value, ]) ->assertSessionHasNoErrors() - ->assertRedirect(route('front.panel.ban-appeals.show', $this->appeal)); + ->assertRedirect(route('manage.ban-appeals.show', $this->appeal)); $this->assertEquals(BanAppealStatus::ACCEPTED_UNBAN, $this->appeal->refresh()->status); $this->assertEquals(false, $this->appeal->gamePlayerBan->refresh()->is_active); $this->assertDatabaseHas(GamePlayerBan::tableName(), [ @@ -73,12 +73,12 @@ public function test_can_unban_player() public function test_can_deny_appeal() { $this->actingAs($this->admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal), [ + ->put(route('manage.ban-appeals.update', $this->appeal), [ 'decision_note' => 'Some Note', 'status' => BanAppealStatus::DENIED->value, ]) ->assertSessionHasNoErrors() - ->assertRedirect(route('front.panel.ban-appeals.show', $this->appeal)); + ->assertRedirect(route('manage.ban-appeals.show', $this->appeal)); $this->assertEquals(BanAppealStatus::DENIED, $this->appeal->refresh()->status); $this->assertDatabaseHas(GamePlayerBan::tableName(), [ 'id' => $this->gamePlayerBan->getKey(), @@ -99,7 +99,7 @@ public function test_validation_error_if_ban_has_become_inactive() $this->gamePlayerBan->save(); $this->actingAs($this->admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal), [ + ->put(route('manage.ban-appeals.update', $this->appeal), [ 'decision_note' => 'Some Note', 'status' => BanAppealStatus::ACCEPTED_UNBAN->value, ]) @@ -118,7 +118,7 @@ public function test_validation_error_if_appeal_already_decided() $this->appeal->save(); $this->actingAs($this->admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal), [ + ->put(route('manage.ban-appeals.update', $this->appeal), [ 'decision_note' => 'Some Note', 'status' => BanAppealStatus::ACCEPTED_UNBAN->value, ]) @@ -134,7 +134,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal)) + ->put(route('manage.ban-appeals.update', $this->appeal)) ->assertUnauthorized(); } @@ -145,7 +145,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->put(route('front.panel.ban-appeals.update', $this->appeal)) + ->put(route('manage.ban-appeals.update', $this->appeal)) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelBanAppealViewTest.php b/tests/Integration/Panel/PanelBanAppealViewTest.php index 55b75651e..ea48b3222 100644 --- a/tests/Integration/Panel/PanelBanAppealViewTest.php +++ b/tests/Integration/Panel/PanelBanAppealViewTest.php @@ -31,7 +31,7 @@ public function test_can_view_pending_appeal() )->create(['explanation' => 'My Explanation']); $this->actingAs($this->admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertOk() ->assertSee('My Explanation') ->assertSee('Awaiting Decision'); @@ -46,7 +46,7 @@ public function test_can_view_unbanned_appeal() )->create(['decision_note' => 'Some Decision Reason']); $this->actingAs($this->admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertOk() ->assertSee('Some Decision Reason') ->assertSee('Unbanned'); @@ -61,7 +61,7 @@ public function test_can_view_tempbanned_appeal() )->create(['decision_note' => 'Some Decision Reason']); $this->actingAs($this->admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertOk() ->assertSee('Some Decision Reason') ->assertSee('Banned for'); @@ -76,7 +76,7 @@ public function test_can_view_denied_appeal() )->create(['decision_note' => 'Some Decision Reason']); $this->actingAs($this->admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertOk() ->assertSee('Some Decision Reason') ->assertSee('Denied'); @@ -93,7 +93,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertUnauthorized(); } @@ -108,7 +108,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->get(route('front.panel.ban-appeals.show', $appeal)) + ->get(route('manage.ban-appeals.show', $appeal)) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelDonationPerkDeleteTest.php b/tests/Integration/Panel/PanelDonationPerkDeleteTest.php index 32252dffc..2937c1834 100644 --- a/tests/Integration/Panel/PanelDonationPerkDeleteTest.php +++ b/tests/Integration/Panel/PanelDonationPerkDeleteTest.php @@ -40,8 +40,8 @@ public function test_delete_donation_perk() ->create(); $this->actingAs($this->adminAccount) - ->delete(route('front.panel.donation-perks.destroy', $donationPerk)) - ->assertRedirect(route('front.panel.donations.show', $donation)); + ->delete(route('manage.donation-perks.destroy', $donationPerk)) + ->assertRedirect(route('manage.donations.show', $donation)); $this->assertDatabaseCount(DonationPerk::tableName(), 0); } diff --git a/tests/Integration/Panel/PanelDonationPerkUpdateTest.php b/tests/Integration/Panel/PanelDonationPerkUpdateTest.php index d1c6142fb..aabd11c98 100644 --- a/tests/Integration/Panel/PanelDonationPerkUpdateTest.php +++ b/tests/Integration/Panel/PanelDonationPerkUpdateTest.php @@ -28,7 +28,7 @@ public function test_valid_update() $newExpiry = now()->addMonth(); $this->actingAs($this->adminAccount) - ->put(route('front.panel.donation-perks.update', $donationPerk), [ + ->put(route('manage.donation-perks.update', $donationPerk), [ 'donation_id' => $donationPerk->donation->getKey(), 'account_id' => $donationPerk->account->getKey(), 'is_active' => true, @@ -36,7 +36,7 @@ public function test_valid_update() 'expires_at' => $newExpiry, 'created_at' => $donationPerk->created_at, ])->assertSessionHasNoErrors() - ->assertRedirect(route('front.panel.donations.show', $donationPerk->donation)); + ->assertRedirect(route('manage.donations.show', $donationPerk->donation)); $this->assertDatabaseHas(DonationPerk::tableName(), [ 'donation_perks_id' => $donationPerk->getKey(), diff --git a/tests/Integration/Panel/PanelDonationsListTest.php b/tests/Integration/Panel/PanelDonationsListTest.php index 231f9e767..b6270f540 100644 --- a/tests/Integration/Panel/PanelDonationsListTest.php +++ b/tests/Integration/Panel/PanelDonationsListTest.php @@ -18,7 +18,7 @@ public function test_donation_shown_in_list() $donation = Donation::factory()->create(); $this->actingAs($admin) - ->get(route('front.panel.donations.index')) + ->get(route('manage.donations.index')) ->assertSee($donation->donation_id); } @@ -29,7 +29,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->get(route('front.panel.donations.index')) + ->get(route('manage.donations.index')) ->assertUnauthorized(); } @@ -40,7 +40,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->get(route('front.panel.donations.index')) + ->get(route('manage.donations.index')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelGroupMemberTest.php b/tests/Integration/Panel/PanelGroupMemberTest.php index 6f70629b0..6956ce8a9 100644 --- a/tests/Integration/Panel/PanelGroupMemberTest.php +++ b/tests/Integration/Panel/PanelGroupMemberTest.php @@ -26,7 +26,7 @@ public function test_group_list_only_shows_group_members() $this->withoutExceptionHandling(); $this->actingAs($admin) - ->get(route('front.panel.groups.accounts', $groupA)) + ->get(route('manage.groups.accounts', $groupA)) ->assertSee($accountA->username) ->assertDontSee($accountB->username); } @@ -42,7 +42,7 @@ public function test_unauthorised_without_scope() $account->groups()->attach($group); $this->actingAs($admin) - ->get(route('front.panel.groups.accounts', $group)) + ->get(route('manage.groups.accounts', $group)) ->assertUnauthorized(); } @@ -57,7 +57,7 @@ public function test_unauthorised_without_panel_access() $account->groups()->attach($group); $this->actingAs($admin) - ->get(route('front.panel.groups.accounts', $group)) + ->get(route('manage.groups.accounts', $group)) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelGroupsTest.php b/tests/Integration/Panel/PanelGroupsTest.php index fb8d61358..2f37986d7 100644 --- a/tests/Integration/Panel/PanelGroupsTest.php +++ b/tests/Integration/Panel/PanelGroupsTest.php @@ -17,7 +17,7 @@ public function test_can_view_group_list() $group = Group::factory()->create(); $this->actingAs($admin) - ->get(route('front.panel.groups.index')) + ->get(route('manage.groups.index')) ->assertSee($group->name); } @@ -28,7 +28,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->get(route('front.panel.groups.index')) + ->get(route('manage.groups.index')) ->assertUnauthorized(); } @@ -39,7 +39,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->get(route('front.panel.groups.index')) + ->get(route('manage.groups.index')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelMinecraftPlayerCreateTest.php b/tests/Integration/Panel/PanelMinecraftPlayerCreateTest.php index 076cc1b3e..45adea484 100644 --- a/tests/Integration/Panel/PanelMinecraftPlayerCreateTest.php +++ b/tests/Integration/Panel/PanelMinecraftPlayerCreateTest.php @@ -40,7 +40,7 @@ private function mockSuccessfulUUIDCheck(): void public function test_can_view_create_form() { $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.create')) + ->get(route('manage.minecraft-players.create')) ->assertOk(); } @@ -52,7 +52,7 @@ public function test_can_add_by_undashed_uuid_to_account() $this->mockSuccessfulUUIDCheck(); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.store'), [ + ->post(route('manage.minecraft-players.store'), [ 'uuid' => $mcPlayer->uuid, 'account_id' => $account->account_id, ]) @@ -72,7 +72,7 @@ public function test_can_add_dashed_uuid_to_account() $this->mockSuccessfulUUIDCheck(); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.store'), [ + ->post(route('manage.minecraft-players.store'), [ 'uuid' => $dashedUUID, 'account_id' => $account->account_id, ]); @@ -92,7 +92,7 @@ public function test_assigns_existing_player_to_account() $this->mockSuccessfulUUIDCheck(); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.store'), [ + ->post(route('manage.minecraft-players.store'), [ 'uuid' => $mcPlayer->uuid, 'account_id' => $newAccount->account_id, ]); @@ -116,7 +116,7 @@ public function test_fake_uuid_does_not_work() }); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.store'), [ + ->post(route('manage.minecraft-players.store'), [ 'uuid' => $mcPlayer->uuid, 'account_id' => $account->account_id, ]); @@ -134,7 +134,7 @@ public function test_unauthorised_without_scope() ]); $this->actingAs($admin) - ->post(route('front.panel.minecraft-players.store')) + ->post(route('manage.minecraft-players.store')) ->assertUnauthorized(); } @@ -145,7 +145,7 @@ public function test_unauthorised_without_panel_access() ]); $this->actingAs($admin) - ->post(route('front.panel.minecraft-players.store')) + ->post(route('manage.minecraft-players.store')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelMinecraftPlayerEditTest.php b/tests/Integration/Panel/PanelMinecraftPlayerEditTest.php index 29b0296ea..06cab3c86 100644 --- a/tests/Integration/Panel/PanelMinecraftPlayerEditTest.php +++ b/tests/Integration/Panel/PanelMinecraftPlayerEditTest.php @@ -26,7 +26,7 @@ public function test_can_view_edit_form() $mcPlayer = MinecraftPlayer::factory()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.edit', $mcPlayer)) + ->get(route('manage.minecraft-players.edit', $mcPlayer)) ->assertOk() ->assertSee('Edit'); } @@ -38,7 +38,7 @@ public function test_can_view_edit_form_with_active_account() { $mcPlayer = MinecraftPlayer::factory()->for(Account::factory())->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.edit', $mcPlayer)) + ->get(route('manage.minecraft-players.edit', $mcPlayer)) ->assertOk(); } @@ -48,8 +48,8 @@ public function test_can_change_assigned_user() $anotherAccount = Account::factory()->create(); $this->actingAs($this->admin) - ->put(route('front.panel.minecraft-players.update', $mcPlayer), ['account_id' => $anotherAccount->account_id]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->put(route('manage.minecraft-players.update', $mcPlayer), ['account_id' => $anotherAccount->account_id]) + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); $this->assertDatabaseHas('players_minecraft', [ 'player_minecraft_id' => $mcPlayer->player_minecraft_id, @@ -61,8 +61,8 @@ public function test_can_change_to_no_user() { $mcPlayer = MinecraftPlayer::factory()->for(Account::factory()->create())->create(); $this->actingAs($this->admin) - ->put(route('front.panel.minecraft-players.update', $mcPlayer), ['account_id' => null]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->put(route('manage.minecraft-players.update', $mcPlayer), ['account_id' => null]) + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); } public function test_cant_change_user_to_unassigned() @@ -70,7 +70,7 @@ public function test_cant_change_user_to_unassigned() $mcPlayer = MinecraftPlayer::factory()->for(Account::factory()->create())->create(); $this->actingAs($this->admin) - ->put(route('front.panel.minecraft-players.update', $mcPlayer), ['account_id' => 12]) + ->put(route('manage.minecraft-players.update', $mcPlayer), ['account_id' => 12]) ->assertSessionHasErrors(); } @@ -83,7 +83,7 @@ public function test_unauthorised_without_scope() $mcPlayer = MinecraftPlayer::factory()->for(Account::factory()->create())->create(); $this->actingAs($admin) - ->put(route('front.panel.minecraft-players.update', $mcPlayer)) + ->put(route('manage.minecraft-players.update', $mcPlayer)) ->assertUnauthorized(); } @@ -96,7 +96,7 @@ public function test_unauthorised_without_panel_access() $mcPlayer = MinecraftPlayer::factory()->for(Account::factory()->create())->create(); $this->actingAs($admin) - ->put(route('front.panel.minecraft-players.update', $mcPlayer)) + ->put(route('manage.minecraft-players.update', $mcPlayer)) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelMinecraftPlayerLookupTest.php b/tests/Integration/Panel/PanelMinecraftPlayerLookupTest.php index 678a47707..4a834c7a1 100644 --- a/tests/Integration/Panel/PanelMinecraftPlayerLookupTest.php +++ b/tests/Integration/Panel/PanelMinecraftPlayerLookupTest.php @@ -34,10 +34,10 @@ public function test_lookup_player_by_undashed_uuid() { $mcPlayer = MinecraftPlayer::factory()->create(); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => $mcPlayer->uuid, ]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); } public function test_lookup_player_by_dashed_uuid() @@ -48,10 +48,10 @@ public function test_lookup_player_by_dashed_uuid() ]); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => $uuid, ]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); } public function test_lookup_player_by_stored_alias() @@ -59,10 +59,10 @@ public function test_lookup_player_by_stored_alias() $mcPlayer = MinecraftPlayer::factory()->create(); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => $mcPlayer->alias, ]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); } public function test_lookup_player_by_non_stored_alias() @@ -76,10 +76,10 @@ public function test_lookup_player_by_non_stored_alias() }); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => 'Herobrine', ]) - ->assertRedirect(route('front.panel.minecraft-players.show', $mcPlayer)); + ->assertRedirect(route('manage.minecraft-players.show', $mcPlayer)); } public function test_lookup_of_invalid_player() @@ -90,10 +90,10 @@ public function test_lookup_of_invalid_player() }); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => 'Herobrine', ]) - ->assertRedirect(route('front.panel.minecraft-players.index')); + ->assertRedirect(route('manage.minecraft-players.index')); } public function test_lookup_of_unknown_player() @@ -105,28 +105,28 @@ public function test_lookup_of_unknown_player() }); $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => 'Herobrine', ]) - ->assertRedirect(route('front.panel.minecraft-players.index')); + ->assertRedirect(route('manage.minecraft-players.index')); } public function test_empty_lookup_string_entered() { $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => '', ]) - ->assertRedirect(route('front.panel.minecraft-players.index')); + ->assertRedirect(route('manage.minecraft-players.index')); } public function test_null_lookup_string_entered() { $this->actingAs($this->admin) - ->post(route('front.panel.minecraft-players.lookup'), [ + ->post(route('manage.minecraft-players.lookup'), [ 'query' => null, ]) - ->assertRedirect(route('front.panel.minecraft-players.index')); + ->assertRedirect(route('manage.minecraft-players.index')); } public function test_unauthorised_without_scope() @@ -139,7 +139,7 @@ public function test_unauthorised_without_scope() $this->expectException(HttpException::class); $this->actingAs($admin) - ->post(route('front.panel.minecraft-players.lookup')) + ->post(route('manage.minecraft-players.lookup')) ->assertUnauthorized(); } @@ -153,7 +153,7 @@ public function test_unauthorised_without_panel_access() $this->expectException(HttpException::class); $this->actingAs($admin) - ->post(route('front.panel.minecraft-players.lookup')) + ->post(route('manage.minecraft-players.lookup')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelMinecraftPlayerShowTest.php b/tests/Integration/Panel/PanelMinecraftPlayerShowTest.php index f12604597..20f5cc9b9 100644 --- a/tests/Integration/Panel/PanelMinecraftPlayerShowTest.php +++ b/tests/Integration/Panel/PanelMinecraftPlayerShowTest.php @@ -33,7 +33,7 @@ public function test_ban_shown() ->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.show', $bannedPlayer)) + ->get(route('manage.minecraft-players.show', $bannedPlayer)) ->assertOk() ->assertSee(GamePlayerBan::first()->reason); } @@ -45,7 +45,7 @@ public function test_ban_with_null_staff_shown() ->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.show', $bannedPlayer)) + ->get(route('manage.minecraft-players.show', $bannedPlayer)) ->assertOk() ->assertSee(GamePlayerBan::first()->reason); } @@ -64,7 +64,7 @@ public function test_unauthorised_without_scope() $this->expectException(HttpException::class); $this->actingAs($admin) - ->get(route('front.panel.minecraft-players.show', $bannedPlayer)) + ->get(route('manage.minecraft-players.show', $bannedPlayer)) ->assertUnauthorized(); } @@ -82,7 +82,7 @@ public function test_unauthorised_without_panel_access() $this->expectException(HttpException::class); $this->actingAs($admin) - ->get(route('front.panel.minecraft-players.show', $bannedPlayer)) + ->get(route('manage.minecraft-players.show', $bannedPlayer)) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelMinecraftPlayersListTest.php b/tests/Integration/Panel/PanelMinecraftPlayersListTest.php index cb2c6b65c..1bfdba6cf 100644 --- a/tests/Integration/Panel/PanelMinecraftPlayersListTest.php +++ b/tests/Integration/Panel/PanelMinecraftPlayersListTest.php @@ -29,7 +29,7 @@ public function test_mc_player_without_account_shown_on_list() $player = MinecraftPlayer::factory()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.index')) + ->get(route('manage.minecraft-players.index')) ->assertOk() ->assertSee($player->uuid) ->assertSee($player->alias); @@ -41,7 +41,7 @@ public function test_mc_player_with_account_shown_on_list() MinecraftPlayer::factory()->for($account)->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.index')) + ->get(route('manage.minecraft-players.index')) ->assertOk() ->assertSee($account->username); } @@ -51,7 +51,7 @@ public function test_mc_player_with_no_alias() $mcPlayer = MinecraftPlayer::factory()->create(); $this->actingAs($this->admin) - ->get(route('front.panel.minecraft-players.index')) + ->get(route('manage.minecraft-players.index')) ->assertOk() ->assertSee($mcPlayer->uuid); } @@ -66,7 +66,7 @@ public function test_unauthorised_without_scope() $this->expectException(HttpException::class); $this->actingAs($admin) - ->get(route('front.panel.minecraft-players.index')) + ->get(route('manage.minecraft-players.index')) ->assertUnauthorized(); } @@ -80,7 +80,7 @@ public function test_unauthorised_without_panel_access() $this->expectException(HttpException::class); $this->actingAs($admin) - ->get(route('front.panel.minecraft-players.index')) + ->get(route('manage.minecraft-players.index')) ->assertUnauthorized(); } } diff --git a/tests/Integration/Panel/PanelTest.php b/tests/Integration/Panel/PanelTest.php index 6adba3efc..c286404bf 100644 --- a/tests/Integration/Panel/PanelTest.php +++ b/tests/Integration/Panel/PanelTest.php @@ -24,7 +24,7 @@ private function createPanelAccessGroup(): Group public function test_guest_cannot_see_panel() { - $this->get(route('front.panel.index')) + $this->get(route('manage.index')) ->assertRedirect(route('front.login')); } @@ -36,7 +36,7 @@ public function test_non_mfa_user_cannot_see_panel() ); $this->actingAs($nonMfaAccount) - ->get(route('front.panel.index')) + ->get(route('manage.index')) ->assertRedirectContains(route('front.account.settings.mfa')) ->assertSessionHas('mfa_setup_required', true); } @@ -51,7 +51,7 @@ public function test_mfa_user_can_see_panel() ); $this->actingAs($mfaAccount) - ->get(route('front.panel.index')) + ->get(route('manage.index')) ->assertOk(); } }