From 277b9f7e1fd0f57016c181bfa00fd1ffa87198ff Mon Sep 17 00:00:00 2001 From: Crypta-Eve Date: Thu, 8 Dec 2022 22:56:44 +1030 Subject: [PATCH 01/95] refactor: declare web ui settings --- src/WebServiceProvider.php | 118 +++++++++++++++++++++++++++++++++ src/resources/lang/en/seat.php | 2 - 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/src/WebServiceProvider.php b/src/WebServiceProvider.php index 706c9ee98..362914ed1 100644 --- a/src/WebServiceProvider.php +++ b/src/WebServiceProvider.php @@ -37,6 +37,8 @@ use Seat\Eveapi\Models\RefreshToken; use Seat\Eveapi\Pivot\Character\CharacterTitle; use Seat\Services\AbstractSeatPlugin; +use Seat\Services\Settings\Profile; +use Seat\Services\Settings\Seat; use Seat\Web\Commands\Seat\Admin\Login as AdminLogin; use Seat\Web\Events\Attempt; use Seat\Web\Events\Login; @@ -83,6 +85,9 @@ public function boot(Router $router) // Register policies $this->register_policies(); + // Register settings + $this->register_settings(); + // Include the Routes $this->add_routes(); @@ -469,6 +474,119 @@ private function register_policies() } } + /** + * Register settings relative to Web UI. + */ + private function register_settings() + { + // + // global settings + // + + // User Registration + Seat::define('registration', 'yes'); + + // Admin contact + Seat::define('admin_contact', 'seatadmin@localhost.local'); + + // Cleanup data in the database for users + // that have been deleted. + Seat::define('cleanup_data', 'no'); + + // Allow Usage Tracking + Seat::define('allow_tracking', 'yes'); + + // Currently Installed SDE version + Seat::define('installed_sde', null); + + // Default Scopes asked for SSO Authentication + Seat::define('sso_scopes', [ + [ + 'id' => 0, + 'name' => 'default', + 'default' => true, + 'scopes' => [ + 'publicData', + 'esi-alliances.read_contacts.v1', + 'esi-assets.read_assets.v1', + 'esi-assets.read_corporation_assets.v1', + 'esi-bookmarks.read_character_bookmarks.v1', + 'esi-bookmarks.read_corporation_bookmarks.v1', + 'esi-calendar.read_calendar_events.v1', + 'esi-characters.read_agents_research.v1', + 'esi-characters.read_blueprints.v1', + 'esi-characters.read_chat_channels.v1', + 'esi-characters.read_contacts.v1', + 'esi-characters.read_corporation_roles.v1', + 'esi-characters.read_fatigue.v1', + 'esi-characters.read_fw_stats.v1', + 'esi-characters.read_loyalty.v1', + 'esi-characters.read_medals.v1', + 'esi-characters.read_notifications.v1', + 'esi-characters.read_opportunities.v1', + 'esi-characters.read_standings.v1', + 'esi-characters.read_titles.v1', + 'esi-characterstats.read.v1', + 'esi-clones.read_clones.v1', + 'esi-clones.read_implants.v1', + 'esi-contracts.read_character_contracts.v1', + 'esi-contracts.read_corporation_contracts.v1', + 'esi-corporations.read_blueprints.v1', + 'esi-corporations.read_contacts.v1', + 'esi-corporations.read_container_logs.v1', + 'esi-corporations.read_corporation_membership.v1', + 'esi-corporations.read_divisions.v1', + 'esi-corporations.read_facilities.v1', + 'esi-corporations.read_fw_stats.v1', + 'esi-corporations.read_medals.v1', + 'esi-corporations.read_standings.v1', + 'esi-corporations.read_starbases.v1', + 'esi-corporations.read_structures.v1', + 'esi-corporations.read_titles.v1', + 'esi-corporations.track_members.v1', + 'esi-fittings.read_fittings.v1', + 'esi-fleets.read_fleet.v1', + 'esi-industry.read_character_jobs.v1', + 'esi-industry.read_character_mining.v1', + 'esi-industry.read_corporation_jobs.v1', + 'esi-industry.read_corporation_mining.v1', + 'esi-killmails.read_corporation_killmails.v1', + 'esi-killmails.read_killmails.v1', + 'esi-location.read_location.v1', + 'esi-location.read_online.v1', + 'esi-location.read_ship_type.v1', + 'esi-mail.read_mail.v1', + 'esi-markets.read_character_orders.v1', + 'esi-markets.read_corporation_orders.v1', + 'esi-markets.structure_markets.v1', + 'esi-planets.manage_planets.v1', + 'esi-planets.read_customs_offices.v1', + 'esi-search.search_structures.v1', + 'esi-skills.read_skillqueue.v1', + 'esi-skills.read_skills.v1', + 'esi-ui.open_window.v1', + 'esi-universe.read_structures.v1', + 'esi-wallet.read_character_wallet.v1', + 'esi-wallet.read_corporation_wallets.v1', + ], + ], + ]); + + // + // user settings + // + + // UI + Profile::define('sidebar', 'sidebar-full'); + Profile::define('skin', 'skin-black'); + Profile::define('language', 'en'); + Profile::define('mail_threads', 'yes'); + + // Numbers + Profile::define('thousand_separator', ' '); + Profile::define('decimal_separator', '.'); + } + /** * Return an URI to a CHANGELOG.md file or an API path which will be providing changelog history. * diff --git a/src/resources/lang/en/seat.php b/src/resources/lang/en/seat.php index fa44a9532..9f50bd27b 100644 --- a/src/resources/lang/en/seat.php +++ b/src/resources/lang/en/seat.php @@ -411,8 +411,6 @@ 'allow_registration' => 'Allow Registration', 'allow_user_character_unlink' => 'Allow user to unlink their characters', 'unlink' => 'Unlink', - 'email_activation' => 'Email Activation', - 'require_activation' => 'Require Email Activation', 'module_versions' => 'SeAT Module Versions', 'tp_versions' => 'Third Party Versions', 'installed' => 'Installed', From 609b1930980e9bb164cad1fba8cf17ad0fbd3351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20LEUILLIOT?= Date: Sat, 1 Jan 2022 13:31:44 +0100 Subject: [PATCH 02/95] refactor: prefix all routes --- src/Commands/Seat/Admin/Login.php | 2 +- src/Config/package.alliance.menu.php | 6 +- src/Config/package.character.menu.php | 38 +++---- src/Config/package.corporation.menu.php | 36 +++---- src/Config/package.sidebar.php | 30 +++--- .../Alliance/AlliancesController.php | 4 +- .../Controllers/Auth/AdminLoginController.php | 2 +- src/Http/Controllers/Auth/LoginController.php | 4 +- src/Http/Controllers/Auth/SsoController.php | 4 +- .../Character/CharacterController.php | 4 +- .../Configuration/AccessController.php | 8 +- .../Configuration/UserController.php | 4 +- .../Corporation/CorporationsController.php | 4 +- .../Controllers/Squads/MembersController.php | 2 +- .../Controllers/Squads/SquadsController.php | 6 +- .../Support/FastLookupController.php | 6 +- src/Http/Routes/Alliance/View.php | 12 +-- src/Http/Routes/Auth/Auth.php | 42 ++++---- src/Http/Routes/Auth/Sso.php | 61 +++++------ src/Http/Routes/Character/View.php | 101 +++++++++--------- src/Http/Routes/Configuration/Access.php | 19 ++-- .../Routes/Configuration/Impersonation.php | 7 +- src/Http/Routes/Configuration/Schedule.php | 21 ++-- src/Http/Routes/Configuration/Seat.php | 61 +++++------ src/Http/Routes/Configuration/Security.php | 14 ++- src/Http/Routes/Configuration/Sso.php | 42 ++++---- src/Http/Routes/Configuration/User.php | 44 ++++---- src/Http/Routes/Corporation/View.php | 74 ++++++------- src/Http/Routes/Home.php | 24 ++--- src/Http/Routes/Profile/View.php | 70 ++++++------ src/Http/Routes/Queue/Status.php | 7 +- src/Http/Routes/Squads/Routes.php | 55 +++++----- src/Http/Routes/Support/FastLookup.php | 100 ++++++++--------- src/Http/Routes/Support/Insurance.php | 7 +- src/Http/Routes/Support/List.php | 16 ++- src/Http/Routes/Support/Resolve.php | 14 ++- src/Http/Routes/Support/Search.php | 53 +++++---- src/Http/Routes/Tools/Job.php | 7 +- src/Http/Routes/Tools/Moons.php | 8 +- src/Http/Routes/Tools/Notes.php | 28 +++-- src/Http/Routes/Tools/Standings.php | 16 +-- src/Models/Squads/Squad.php | 2 +- src/Notifications/EmailVerification.php | 4 +- .../views/alliance/partials/delete.blade.php | 2 +- src/resources/views/auth/login.blade.php | 2 +- .../views/auth/unauthorized.blade.php | 2 +- .../character/includes/summary.blade.php | 4 +- .../character/intel/buttons/journal.blade.php | 2 +- .../character/intel/buttons/mail.blade.php | 2 +- .../intel/buttons/transaction.blade.php | 2 +- .../character/intel/includes/menu.blade.php | 6 +- .../character/intel/journaldetail.blade.php | 2 +- .../intel/standingscompare.blade.php | 2 +- .../views/character/intel/summary.blade.php | 6 +- .../views/character/mail-timeline.blade.php | 2 +- .../views/character/partials/delete.blade.php | 2 +- .../partials/miningdetails-button.blade.php | 2 +- .../character/partials/topmailread.blade.php | 2 +- .../views/character/skills.blade.php | 6 +- .../character/wallet/includes/menu.blade.php | 4 +- .../wallet/journal/journal.blade.php | 2 +- .../common/assets/buttons/cargo.blade.php | 4 +- .../common/assets/buttons/fitting.blade.php | 4 +- .../contracts/buttons/details.blade.php | 4 +- .../common/fittings/buttons/detail.blade.php | 4 +- .../fittings/buttons/insurance.blade.php | 2 +- .../common/killmails/buttons/show.blade.php | 4 +- .../views/common/mails/buttons/read.blade.php | 2 +- .../common/minings/buttons/details.blade.php | 4 +- .../common/notes/buttons/action.blade.php | 4 +- .../common/notes/modals/create.blade.php | 2 +- .../views/common/notes/modals/edit.blade.php | 2 +- .../components/jobs/buttons/update.blade.php | 2 +- .../access/includes/scripts/filters.blade.php | 2 +- .../access/includes/scripts/members.blade.php | 2 +- .../views/configuration/access/list.blade.php | 2 +- .../access/partials/action.blade.php | 4 +- .../access/partials/card.blade.php | 4 +- .../access/partials/members.blade.php | 2 +- .../configuration/schedule/view.blade.php | 4 +- .../configuration/security/logs.blade.php | 2 +- .../configuration/settings/view.blade.php | 14 +-- .../views/configuration/sso/view.blade.php | 18 ++-- .../users/buttons/delete.blade.php | 2 +- .../users/buttons/edit.blade.php | 2 +- .../users/buttons/impersonate.blade.php | 2 +- .../views/configuration/users/edit.blade.php | 8 +- .../users/modals/transfer/transfer.blade.php | 4 +- .../ledger/bounty_prizes.blade.php | 4 +- .../ledger/includes/menu.blade.php | 16 +-- .../ledger/industry_facility.blade.php | 4 +- .../corporation/ledger/jump_bridges.blade.php | 4 +- .../corporation/ledger/jump_clones.blade.php | 4 +- .../ledger/offices_rentals.blade.php | 4 +- .../ledger/planetary_interaction.blade.php | 4 +- .../corporation/ledger/reprocessing.blade.php | 4 +- .../mining/includes/menu.blade.php | 2 +- .../views/corporation/mining/ledger.blade.php | 4 +- .../corporation/partials/ceoname.blade.php | 2 +- .../partials/corporationname.blade.php | 2 +- .../corporation/partials/delete.blade.php | 2 +- .../security/includes/menu.blade.php | 6 +- .../corporation/security/titles.blade.php | 2 +- .../views/corporation/starbases.blade.php | 2 +- .../structures/buttons/detail.blade.php | 2 +- .../wallet/includes/menu.blade.php | 4 +- src/resources/views/home.blade.php | 8 +- src/resources/views/includes/header.blade.php | 12 +-- .../character-id-to-main-character.blade.php | 2 +- .../includes/javascript/id-to-name.blade.php | 2 +- .../views/includes/sidebar.blade.php | 4 +- src/resources/views/layouts/app.blade.php | 2 +- .../views/partials/alliance.blade.php | 2 +- .../partials/character-icon-hover.blade.php | 2 +- .../views/partials/character.blade.php | 2 +- .../views/partials/corporation.blade.php | 2 +- .../views/partials/maincharacter.blade.php | 2 +- .../views/profile/buttons/scopes.blade.php | 2 +- .../views/profile/buttons/unlink.blade.php | 2 +- .../profile/modals/email/email.blade.php | 2 +- src/resources/views/profile/view.blade.php | 10 +- .../search/components/character.blade.php | 2 +- .../components/character_assets.blade.php | 2 +- .../search/components/corporation.blade.php | 2 +- .../views/search/components/mail.blade.php | 2 +- .../views/search/components/skills.blade.php | 2 +- .../buttons/application/approve.blade.php | 2 +- .../buttons/application/reject.blade.php | 2 +- .../squads/buttons/application/show.blade.php | 2 +- .../squads/buttons/roles/remove.blade.php | 2 +- .../squads/buttons/squads/kick.blade.php | 2 +- src/resources/views/squads/create.blade.php | 18 ++-- src/resources/views/squads/edit.blade.php | 18 ++-- src/resources/views/squads/list.blade.php | 2 +- .../applications/create/application.blade.php | 2 +- src/resources/views/squads/show.blade.php | 30 +++--- .../tools/moons/buttons/delete.blade.php | 2 +- .../views/tools/moons/buttons/show.blade.php | 2 +- .../tools/moons/filters/moon-filter.blade.php | 8 +- .../moons/modals/import/import.blade.php | 2 +- .../views/tools/standings/edit.blade.php | 12 +-- .../views/tools/standings/list.blade.php | 6 +- .../partials/delete_button.blade.php | 2 +- 143 files changed, 702 insertions(+), 781 deletions(-) diff --git a/src/Commands/Seat/Admin/Login.php b/src/Commands/Seat/Admin/Login.php index ee3f6f5dc..52ee3c357 100644 --- a/src/Commands/Seat/Admin/Login.php +++ b/src/Commands/Seat/Admin/Login.php @@ -92,7 +92,7 @@ public function handle() $this->line(''); $this->info('Your authentication URL is valid for 60 seconds.'); - $this->line(route('auth.admin.login', ['token' => $token])); + $this->line(route('seatcore::auth.admin.login', ['token' => $token])); // Analytics $this->dispatch(new Analytics((new AnalyticsContainer) diff --git a/src/Config/package.alliance.menu.php b/src/Config/package.alliance.menu.php index 37afb23cc..a59944d1d 100644 --- a/src/Config/package.alliance.menu.php +++ b/src/Config/package.alliance.menu.php @@ -26,20 +26,20 @@ 'label' => 'web::seat.contacts', 'permission' => 'alliance.contact', 'highlight_view' => 'contacts', - 'route' => 'alliance.view.contacts', + 'route' => 'seatcore::alliance.view.contacts', ], [ 'name' => 'summary', 'label' => 'web::seat.summary', 'permission' => 'alliance.summary', 'highlight_view' => 'summary', - 'route' => 'alliance.view.summary', + 'route' => 'seatcore::alliance.view.summary', ], [ 'name' => 'tracking', 'label' => 'web::seat.tracking', 'permission' => 'alliance.tracking', 'highlight_view' => 'tracking', - 'route' => 'alliance.view.tracking', + 'route' => 'seatcore::alliance.view.tracking', ], ]; diff --git a/src/Config/package.character.menu.php b/src/Config/package.character.menu.php index 0b33d9d2b..72f634f7a 100644 --- a/src/Config/package.character.menu.php +++ b/src/Config/package.character.menu.php @@ -26,119 +26,119 @@ 'label' => 'web::seat.assets', 'permission' => 'character.asset', 'highlight_view' => 'assets', - 'route' => 'character.view.assets', + 'route' => 'seatcore::character.view.assets', ], [ 'name' => 'calendar', 'label' => 'web::seat.calendar', 'permission' => 'character.calendar', 'highlight_view' => 'calendar', - 'route' => 'character.view.calendar', + 'route' => 'seatcore::character.view.calendar', ], [ 'name' => 'contacts', 'label' => 'web::seat.contacts', 'permission' => 'character.contact', 'highlight_view' => 'contacts', - 'route' => 'character.view.contacts', + 'route' => 'seatcore::character.view.contacts', ], [ 'name' => 'contracts', 'label' => 'web::seat.contracts', 'permission' => 'character.contract', 'highlight_view' => 'contracts', - 'route' => 'character.view.contracts', + 'route' => 'seatcore::character.view.contracts', ], [ 'name' => 'fittings', 'label' => 'web::seat.fittings', 'permission' => 'character.fitting', 'highlight_view' => 'fittings', - 'route' => 'character.view.fittings', + 'route' => 'seatcore::character.view.fittings', ], [ 'name' => 'blueprint', 'label' => 'web::seat.blueprint', 'permission' => 'character.blueprint', 'highlight_view' => 'blueprint', - 'route' => 'character.view.blueprint', + 'route' => 'seatcore::character.view.blueprint', ], [ 'name' => 'industry', 'label' => 'web::seat.industry', 'permission' => 'character.industry', 'highlight_view' => 'industry', - 'route' => 'character.view.industry', + 'route' => 'seatcore::character.view.industry', ], [ 'name' => 'intel', 'label' => 'web::seat.intel', 'permission' => 'character.intel', 'highlight_view' => 'intel', - 'route' => 'character.view.intel.summary', + 'route' => 'seatcore::character.view.intel.summary', ], [ 'name' => 'killmails', 'label' => 'web::seat.killmails', 'permission' => 'character.killmail', 'highlight_view' => 'killmails', - 'route' => 'character.view.killmails', + 'route' => 'seatcore::character.view.killmails', ], [ 'name' => 'mail', 'label' => 'web::seat.mail', 'permission' => 'character.mail', 'highlight_view' => 'mail', - 'route' => 'character.view.mail', + 'route' => 'seatcore::character.view.mail', ], [ 'name' => 'market', 'label' => 'web::seat.market', 'permission' => 'character.market', 'highlight_view' => 'market', - 'route' => 'character.view.market', + 'route' => 'seatcore::character.view.market', ], [ 'name' => 'mining-ledger', 'label' => 'web::seat.mining', 'permission' => 'character.mining', 'highlight_view' => 'mining-ledger', - 'route' => 'character.view.mining_ledger', + 'route' => 'seatcore::character.view.mining_ledger', ], [ 'name' => 'notifications', 'label' => 'web::seat.notifications', 'permission' => 'character.notification', 'highlight_view' => 'notifications', - 'route' => 'character.view.notifications', + 'route' => 'seatcore::character.view.notifications', ], [ 'name' => 'pi', 'label' => 'web::seat.pi', 'permission' => 'character.planetary', 'highlight_view' => 'pi', - 'route' => 'character.view.pi', + 'route' => 'seatcore::character.view.pi', ], [ 'name' => 'research', 'label' => 'web::seat.research', 'permission' => 'character.research', 'highlight_view' => 'research', - 'route' => 'character.view.research', + 'route' => 'seatcore::character.view.research', ], [ 'name' => 'sheet', 'label' => 'web::seat.sheet', 'permission' => 'character.sheet', 'highlight_view' => 'sheet', - 'route' => 'character.view.sheet', + 'route' => 'seatcore::character.view.sheet', ], [ 'name' => 'skills', 'label' => 'web::seat.skills', 'permission' => 'character.skill', 'highlight_view' => 'skills', - 'route' => 'character.view.skills', + 'route' => 'seatcore::character.view.skills', ], [ 'name' => 'standings', @@ -146,14 +146,14 @@ 'plural' => true, 'permission' => 'character.standing', 'highlight_view' => 'standings', - 'route' => 'character.view.standings', + 'route' => 'seatcore::character.view.standings', ], [ 'name' => 'wallet', 'label' => 'web::seat.wallet', 'permission' => ['character.journal', 'character.transactions'], 'highlight_view' => 'wallet', - 'route' => 'character.view.journal', + 'route' => 'seatcore::character.view.journal', ], [ 'name' => 'loyalty-points', diff --git a/src/Config/package.corporation.menu.php b/src/Config/package.corporation.menu.php index 028306bba..06dc08dbe 100644 --- a/src/Config/package.corporation.menu.php +++ b/src/Config/package.corporation.menu.php @@ -26,21 +26,21 @@ 'label' => 'web::seat.assets', 'permission' => 'corporation.asset', 'highlight_view' => 'assets', - 'route' => 'corporation.view.assets', + 'route' => 'seatcore::corporation.view.assets', ], [ 'name' => 'contacts', 'label' => 'web::seat.contacts', 'permission' => 'corporation.contact', 'highlight_view' => 'contacts', - 'route' => 'corporation.view.contacts', + 'route' => 'seatcore::corporation.view.contacts', ], [ 'name' => 'contracts', 'label' => 'web::seat.contracts', 'permission' => 'corporation.contract', 'highlight_view' => 'contracts', - 'route' => 'corporation.view.contracts', + 'route' => 'seatcore::corporation.view.contracts', ], [ 'name' => 'extractions', @@ -48,56 +48,56 @@ 'plural' => true, 'permission' => 'corporation.extraction', 'highlight_view' => 'extractions', - 'route' => 'corporation.view.extractions', + 'route' => 'seatcore::corporation.view.extractions', ], [ 'name' => 'blueprint', 'label' => 'web::seat.blueprint', 'permission' => 'corporation.blueprint', 'highlight_view' => 'blueprint', - 'route' => 'corporation.view.blueprint', + 'route' => 'seatcore::corporation.view.blueprint', ], [ 'name' => 'industry', 'label' => 'web::seat.industry', 'permission' => 'corporation.industry', 'highlight_view' => 'industry', - 'route' => 'corporation.view.industry', + 'route' => 'seatcore::corporation.view.industry', ], [ 'name' => 'killmails', 'label' => 'web::seat.killmails', 'permission' => 'corporation.killmail', 'highlight_view' => 'killmails', - 'route' => 'corporation.view.killmails', + 'route' => 'seatcore::corporation.view.killmails', ], [ 'name' => 'market', 'label' => 'web::seat.market', 'permission' => 'corporation.market', 'highlight_view' => 'market', - 'route' => 'corporation.view.market', + 'route' => 'seatcore::corporation.view.market', ], [ 'name' => 'mining', 'label' => 'web::seat.mining', 'permission' => 'corporation.mining', 'highlight_view' => 'mining', - 'route' => 'corporation.view.mining_ledger', + 'route' => 'seatcore::corporation.view.mining_ledger', ], [ 'name' => 'customs-offices', 'label' => 'web::seat.customs-offices', 'permission' => 'corporation.customs_office', 'highlight_view' => 'customs-offices', - 'route' => 'corporation.view.customs-offices', + 'route' => 'seatcore::corporation.view.customs-offices', ], [ 'name' => 'security', 'label' => 'web::seat.security', 'permission' => 'corporation.security', 'highlight_view' => 'security', - 'route' => 'corporation.view.security.roles', + 'route' => 'seatcore::corporation.view.security.roles', ], [ 'name' => 'starbase', @@ -105,7 +105,7 @@ 'plural' => true, 'permission' => 'corporation.starbase', 'highlight_view' => 'starbases', - 'route' => 'corporation.view.starbases', + 'route' => 'seatcore::corporation.view.starbases', ], [ 'name' => 'structure', @@ -113,14 +113,14 @@ 'plural' => true, 'permission' => 'corporation.structure', 'highlight_view' => 'structures', - 'route' => 'corporation.view.structures', + 'route' => 'seatcore::corporation.view.structures', ], [ 'name' => 'summary', 'label' => 'web::seat.summary', 'permission' => 'corporation.summary', 'highlight_view' => 'summary', - 'route' => 'corporation.view.summary', + 'route' => 'seatcore::corporation.view.summary', ], [ 'name' => 'standings', @@ -128,27 +128,27 @@ 'plural' => true, 'permission' => 'corporation.standing', 'highlight_view' => 'standings', - 'route' => 'corporation.view.standings', + 'route' => 'seatcore::corporation.view.standings', ], [ 'name' => 'tracking', 'label' => 'web::seat.tracking', 'permission' => 'corporation.tracking', 'highlight_view' => 'tracking', - 'route' => 'corporation.view.tracking', + 'route' => 'seatcore::corporation.view.tracking', ], [ 'name' => 'ledger', 'label' => 'web::seat.ledger', 'permission' => 'corporation.journal', 'highlight_view' => 'ledger', - 'route' => 'corporation.view.ledger.summary', + 'route' => 'seatcore::corporation.view.ledger.summary', ], [ 'name' => 'wallet', 'label' => 'web::seat.wallet', 'permission' => ['corporation.journal', 'corporation.transaction'], 'highlight_view' => 'wallet', - 'route' => 'corporation.view.journal', + 'route' => 'seatcore::corporation.view.journal', ], ]; diff --git a/src/Config/package.sidebar.php b/src/Config/package.sidebar.php index 095726dd7..108aae0b1 100644 --- a/src/Config/package.sidebar.php +++ b/src/Config/package.sidebar.php @@ -26,7 +26,7 @@ 'label' => 'web::seat.home', 'icon' => 'fas fa-home', 'route_segment' => 'home', - 'route' => 'home', + 'route' => 'seatcore::home', ], 'alliance' => [ 'name' => 'alliance', @@ -39,7 +39,7 @@ 'name' => 'all alliances', 'label' => 'web::seat.all_alliance', 'icon' => 'fab fa-fort-awesome', - 'route' => 'alliance.list', + 'route' => 'seatcore::alliance.list', ], ], ], @@ -54,7 +54,7 @@ 'name' => 'all corporations', 'label' => 'web::seat.all_corp', 'icon' => 'fas fa-hotel', - 'route' => 'corporation.list', + 'route' => 'seatcore::corporation.list', ], ], ], @@ -69,13 +69,13 @@ 'name' => 'all characters', 'label' => 'web::seat.all_char', 'icon' => 'fas fa-users', - 'route' => 'character.list', + 'route' => 'seatcore::character.list', ], [ 'name' => 'mail timeline', 'label' => 'web::seat.mail_timeline', 'icon' => 'fas fa-envelope', - 'route' => 'character.view.mail.timeline', + 'route' => 'seatcore::character.view.mail.timeline', ], ], ], @@ -85,7 +85,7 @@ 'plural' => true, 'icon' => 'fas fa-user-friends', 'route_segment' => 'squads', - 'route' => 'squads.index', + 'route' => 'seatcore::squads.index', ], 'settings' => [ 'name' => 'configuration', @@ -99,45 +99,45 @@ 'name' => 'access', 'label' => 'web::seat.access', 'icon' => 'fas fa-shield-alt', - 'route' => 'configuration.access.roles', + 'route' => 'seatcore::configuration.access.roles', ], [ // Users 'name' => 'user', 'plural' => true, 'label' => 'web::seat.user', 'icon' => 'fas fa-user', - 'route' => 'configuration.users', + 'route' => 'seatcore::configuration.users', ], [ // Schedule 'name' => 'schedule', 'label' => 'web::seat.schedule', 'icon' => 'far fa-clock', - 'route' => 'configuration.schedule', + 'route' => 'seatcore::configuration.schedule', ], [ // Sso 'name' => 'sso', 'label' => 'web::seat.sso', 'icon' => 'fas fa-user-circle', - 'route' => 'configuration.sso', + 'route' => 'seatcore::configuration.sso', ], [ // SeAT Setting 'name' => 'settings', 'label' => 'web::seat.settings', 'icon' => 'fas fa-cog', - 'route' => 'seat.settings.view', + 'route' => 'seatcore::seat.settings.view', ], [ // Security 'name' => 'security logs', 'label' => 'web::seat.security_logs', 'icon' => 'fas fa-list', - 'route' => 'configuration.security.logs', + 'route' => 'seatcore::configuration.security.logs', ], [ // About 'name' => 'about', 'label' => 'web::seat.about', 'icon' => 'fas fa-info', - 'route' => 'seat.settings.about', + 'route' => 'seatcore::seat.settings.about', ], ], ], @@ -152,14 +152,14 @@ 'label' => 'web::seat.standings_builder', 'icon' => 'fas fa-address-book', 'permission' => 'global.standing_builder', - 'route' => 'tools.standings', + 'route' => 'seatcore::tools.standings', ], [ 'name' => 'moons reporter', 'label' => 'web::seat.moons_reporter', 'icon' => 'fas fa-moon', 'permission' => 'moon.view_moon_reports', - 'route' => 'tools.moons.index', + 'route' => 'seatcore::tools.moons.index', ], ], ], diff --git a/src/Http/Controllers/Alliance/AlliancesController.php b/src/Http/Controllers/Alliance/AlliancesController.php index 9e275a663..3ee2c3bf8 100644 --- a/src/Http/Controllers/Alliance/AlliancesController.php +++ b/src/Http/Controllers/Alliance/AlliancesController.php @@ -62,7 +62,7 @@ public function show(Alliance $alliance) { // by default, redirect user to alliance summary if (Gate::allows('alliance.summary', $alliance)) - return redirect()->route('alliance.view.summary', [ + return redirect()->route('seatcore::alliance.view.summary', [ 'alliance' => $alliance, ]); @@ -87,7 +87,7 @@ public function show(Alliance $alliance) event('security.log', [$message, 'authorization']); // Redirect away from the original request - return redirect()->route('auth.unauthorized'); + return redirect()->route('seatcore::auth.unauthorized'); } /** diff --git a/src/Http/Controllers/Auth/AdminLoginController.php b/src/Http/Controllers/Auth/AdminLoginController.php index fd2a5090c..7435f02bd 100644 --- a/src/Http/Controllers/Auth/AdminLoginController.php +++ b/src/Http/Controllers/Auth/AdminLoginController.php @@ -49,7 +49,7 @@ public function checkLoginToken(string $token) $user = User::where('name', 'admin')->first(); if (is_null($user)) - return redirect()->route('auth.login') + return redirect()->route('seatcore::auth.login') ->withErrors('The Admin user does not exist. Re-run the seat:admin:login command.'); // Login and clear the token we just used. diff --git a/src/Http/Controllers/Auth/LoginController.php b/src/Http/Controllers/Auth/LoginController.php index 41f1f43f8..dcf54e16d 100644 --- a/src/Http/Controllers/Auth/LoginController.php +++ b/src/Http/Controllers/Auth/LoginController.php @@ -84,7 +84,7 @@ public function showLoginForm() $custom_signin_message = setting('custom_signin_message', true); $signin_message = sprintf('%s
LOG IN with EVE Online
', trans('web::seat.login_welcome'), - route('auth.eve'), + route('seatcore::auth.eve'), asset('web/img/evesso.png')); if(! empty($custom_signin_message)) { @@ -97,7 +97,7 @@ public function showLoginForm() $signin_message = preg_replace_callback($pattern, function ($matches) { return sprintf('
LOG IN with EVE Online
', - route('auth.eve.profile', $matches[1]), + route('seatcore::auth.eve.profile', $matches[1]), asset('web/img/evesso.png')); }, $signin_message); } diff --git a/src/Http/Controllers/Auth/SsoController.php b/src/Http/Controllers/Auth/SsoController.php index 012006926..5f7ed908c 100644 --- a/src/Http/Controllers/Auth/SsoController.php +++ b/src/Http/Controllers/Auth/SsoController.php @@ -102,7 +102,7 @@ public function handleProviderCallback(Socialite $social) // Avoid self attachment if (auth()->check() && auth()->user()->id == $eve_data->id) - return redirect()->route('home') + return redirect()->route('seatcore::home') ->with('error', 'You cannot add yourself. Did you forget to change character in Eve Online SSO form ?'); // Get or create the User bound to this login. @@ -115,7 +115,7 @@ public function handleProviderCallback(Socialite $social) $this->updateCharacterInfo($eve_data); if (! $this->loginUser($user)) - return redirect()->route('auth.login') + return redirect()->route('seatcore::auth.login') ->with('error', 'Login failed. Please contact your administrator.'); return redirect()->intended(); diff --git a/src/Http/Controllers/Character/CharacterController.php b/src/Http/Controllers/Character/CharacterController.php index c76b43b62..6934d865d 100644 --- a/src/Http/Controllers/Character/CharacterController.php +++ b/src/Http/Controllers/Character/CharacterController.php @@ -55,7 +55,7 @@ public function show(CharacterInfo $character) { // by default, redirect user to character sheet if (Gate::allows('character.sheet', $character)) - return redirect()->route('character.view.sheet', [ + return redirect()->route('seatcore::character.view.sheet', [ 'character' => $character, ]); @@ -80,7 +80,7 @@ public function show(CharacterInfo $character) event('security.log', [$message, 'authorization']); // Redirect away from the original request - return redirect()->route('auth.unauthorized'); + return redirect()->route('seatcore::auth.unauthorized'); } /** diff --git a/src/Http/Controllers/Configuration/AccessController.php b/src/Http/Controllers/Configuration/AccessController.php index 3be069e55..ac1d42434 100644 --- a/src/Http/Controllers/Configuration/AccessController.php +++ b/src/Http/Controllers/Configuration/AccessController.php @@ -65,7 +65,7 @@ public function store(Request $request) ]); return redirect() - ->route('configuration.access.roles.edit', [ + ->route('seatcore::configuration.access.roles.edit', [ $role->id, ])->with('success', trans('web::seat.role_added')); } @@ -111,7 +111,7 @@ public function update(Request $request, Role $role) $role->description = $request->input('description'); $role->logo = $request->file('logo'); } catch (NotReadableException $e) { - return redirect()->route('configuration.access.roles.edit', [$role->id]) + return redirect()->route('seatcore::configuration.access.roles.edit', [$role->id]) ->with('error', $e->getMessage()); } @@ -200,7 +200,7 @@ public function update(Request $request, Role $role) $role->save(); - return redirect()->route('configuration.access.roles.edit', [$role->id]) + return redirect()->route('seatcore::configuration.access.roles.edit', [$role->id]) ->with('success', trans('web::seat.role_updated', [ 'added' => $added_counter, 'removed' => $removed_counter, @@ -216,7 +216,7 @@ public function destroy(Role $role) { Role::destroy($role->id); - return redirect()->route('configuration.access.roles') + return redirect()->route('seatcore::configuration.access.roles') ->with('success', trans('web::seat.role_removed')); } diff --git a/src/Http/Controllers/Configuration/UserController.php b/src/Http/Controllers/Configuration/UserController.php index 324f28713..c089c4d0f 100644 --- a/src/Http/Controllers/Configuration/UserController.php +++ b/src/Http/Controllers/Configuration/UserController.php @@ -181,7 +181,7 @@ public function impersonate(int $user_id) // Login as the new user. auth()->login($user); - return redirect()->route('home') + return redirect()->route('seatcore::home') ->with('success', trans('web::seat.impersonating', ['user' => $user->name])); } @@ -208,7 +208,7 @@ public function getStopImpersonate() // Clear the session value session()->forget('impersonation_origin'); - return redirect()->route('home') + return redirect()->route('seatcore::home') ->with('success', trans('web::seat.revert_impersonation')); } diff --git a/src/Http/Controllers/Corporation/CorporationsController.php b/src/Http/Controllers/Corporation/CorporationsController.php index 2c265c77f..0b2c8b215 100644 --- a/src/Http/Controllers/Corporation/CorporationsController.php +++ b/src/Http/Controllers/Corporation/CorporationsController.php @@ -58,7 +58,7 @@ public function show(CorporationInfo $corporation) { // by default, redirect user to corporation sheet if (Gate::allows('corporation.summary', $corporation)) - return redirect()->route('corporation.view.summary', [ + return redirect()->route('seatcore::corporation.view.summary', [ 'corporation' => $corporation, ]); @@ -83,7 +83,7 @@ public function show(CorporationInfo $corporation) event('security.log', [$message, 'authorization']); // Redirect away from the original request - return redirect()->route('auth.unauthorized'); + return redirect()->route('seatcore::auth.unauthorized'); } /** diff --git a/src/Http/Controllers/Squads/MembersController.php b/src/Http/Controllers/Squads/MembersController.php index 1313086a3..be39f5e1d 100644 --- a/src/Http/Controllers/Squads/MembersController.php +++ b/src/Http/Controllers/Squads/MembersController.php @@ -120,6 +120,6 @@ public function leave(Squad $squad) { $squad->members()->detach(auth()->user()->id); - return redirect()->route('squads.index'); + return redirect()->route('seatcore::squads.index'); } } diff --git a/src/Http/Controllers/Squads/SquadsController.php b/src/Http/Controllers/Squads/SquadsController.php index dd8793a51..2992221e1 100644 --- a/src/Http/Controllers/Squads/SquadsController.php +++ b/src/Http/Controllers/Squads/SquadsController.php @@ -114,7 +114,7 @@ public function store(SquadValidation $request) 'logo' => $request->file('logo'), ]); - return redirect()->route('squads.show', $squad->id) + return redirect()->route('seatcore::squads.show', $squad->id) ->with('success', 'Squad has successfully been created. Please complete its setup by providing roles & moderators.'); } @@ -146,7 +146,7 @@ public function update(SquadValidation $request, Squad $squad) $squad->save(); return redirect() - ->route('squads.show', $squad) + ->route('seatcore::squads.show', $squad) ->with('success', 'Squad has successfully been updated.'); } @@ -158,7 +158,7 @@ public function destroy(Squad $squad) { $squad->delete(); - return redirect()->route('squads.index') + return redirect()->route('seatcore::squads.index') ->with('success', 'Squad has been deleted.'); } } diff --git a/src/Http/Controllers/Support/FastLookupController.php b/src/Http/Controllers/Support/FastLookupController.php index 68e7d5cfd..4ed47c041 100644 --- a/src/Http/Controllers/Support/FastLookupController.php +++ b/src/Http/Controllers/Support/FastLookupController.php @@ -74,7 +74,7 @@ public function getUsers(Request $request) $images_array = $characters->map(function ($character) { $attributes = [ 'class' => 'img-circle eve-icon small-icon', - 'data-link' => route('character.view.sheet', ['character' => $character]), + 'data-link' => route('seatcore::character.view.sheet', ['character' => $character]), 'data-name' => $character->name, ]; @@ -84,7 +84,7 @@ public function getUsers(Request $request) if ($characters->isEmpty()) { $attributes = [ 'class' => 'img-circle eve-icon small-icon', - 'data-link' => route('character.view.sheet', ['character' => $user->main_character]), + 'data-link' => route('seatcore::character.view.sheet', ['character' => $user->main_character]), 'data-name' => $user->name, ]; @@ -97,7 +97,7 @@ public function getUsers(Request $request) 'id' => $user->id, 'type' => 'characters', 'text' => $user->name, - 'href' => route('character.view.sheet', ['character' => $user->main_character]), + 'href' => route('seatcore::character.view.sheet', ['character' => $user->main_character]), 'character_id' => $user->main_character_id, 'img' => $images_array, ]; diff --git a/src/Http/Routes/Alliance/View.php b/src/Http/Routes/Alliance/View.php index e4b8ce4eb..6e48cb00f 100644 --- a/src/Http/Routes/Alliance/View.php +++ b/src/Http/Routes/Alliance/View.php @@ -21,28 +21,28 @@ */ Route::get('/') - ->name('alliance.list') + ->name('seatcore::alliance.list') ->uses('AlliancesController@index'); Route::get('/{alliance}') - ->name('alliance.view.default') + ->name('seatcore::alliance.view.default') ->uses('AlliancesController@show'); Route::delete('/{alliance}') - ->name('alliance.destroy') + ->name('seatcore::alliance.destroy') ->uses('AlliancesController@destroy'); Route::get('/{alliance}/contacts') - ->name('alliance.view.contacts') + ->name('seatcore::alliance.view.contacts') ->uses('AlliancesController@showContacts') ->middleware('can:alliance.contact,alliance'); Route::get('/{alliance}/summary') - ->name('alliance.view.summary') + ->name('seatcore::alliance.view.summary') ->uses('AlliancesController@showSummary') ->middleware('can:alliance.summary,alliance'); Route::get('/{alliance}/tracking') - ->name('alliance.view.tracking') + ->name('seatcore::alliance.view.tracking') ->uses('AlliancesController@showTracking') ->middleware('can:alliance.tracking,alliance'); diff --git a/src/Http/Routes/Auth/Auth.php b/src/Http/Routes/Auth/Auth.php index fb87b535e..481d89511 100644 --- a/src/Http/Routes/Auth/Auth.php +++ b/src/Http/Routes/Auth/Auth.php @@ -20,32 +20,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('login', [ - 'as' => 'auth.login', - 'uses' => 'LoginController@showLoginForm', -]); +Route::get('login') + ->name('seatcore::auth.login') + ->uses('LoginController@showLoginForm'); -Route::post('login', [ - 'as' => 'auth.login.post', - 'uses' => 'LoginController@login', -]); +Route::post('login') + ->name('seatcore::auth.login.post') + ->uses('LoginController@login'); -Route::get('login/admin/{token}', [ - 'as' => 'auth.admin.login', - 'uses' => 'AdminLoginController@checkLoginToken', -]); +Route::get('login/admin/{token}') + ->name('seatcore::auth.admin.login') + ->uses('AdminLoginController@checkLoginToken'); -Route::get('/login/sharelink/{token}', [ - 'as' => 'auth.activate.sharelink', - 'uses' => 'SharelinkController@checkLoginToken', -]); +Route::get('/login/sharelink/{token}') + ->name('seatcore::auth.activate.sharelink') + ->uses('SharelinkController@checkLoginToken'); -Route::any('logout', [ - 'as' => 'auth.logout', - 'uses' => 'LoginController@logout', -]); +Route::any('logout') + ->name('seatcore::auth.logout') + ->uses('LoginController@logout'); -Route::get('unauthorized', [ - 'as' => 'auth.unauthorized', - 'uses' => 'AuthorizationController@getUnauthorized', -]); +Route::get('unauthorized') + ->name('seatcore::auth.unauthorized') + ->uses('AuthorizationController@getUnauthorized'); diff --git a/src/Http/Routes/Auth/Sso.php b/src/Http/Routes/Auth/Sso.php index 29f00e22a..2641ce39a 100644 --- a/src/Http/Routes/Auth/Sso.php +++ b/src/Http/Routes/Auth/Sso.php @@ -20,37 +20,30 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/eve', [ - 'as' => 'auth.eve', - 'uses' => 'SsoController@redirectToProvider', -]); - -Route::get('/eve/profile/{profile?}', [ - 'as' => 'auth.eve.profile', - 'uses' => 'SsoController@redirectToProvider', -]); - -Route::get('/eve/callback', [ - 'as' => 'auth.eve.callback', - 'uses' => 'SsoController@handleProviderCallback', -]); - -Route::get('/eve/email', [ - 'as' => 'auth.eve.email', - 'uses' => 'SsoController@getUserEmail', -]); - -Route::post('/eve/email', [ - 'as' => 'auth.eve.email.set', - 'uses' => 'SsoController@postUpdateUserEmail', -]); - -Route::get('/eve/confirm', [ - 'as' => 'auth.eve.confirmation.get', - 'uses' => 'SsoController@getSsoConfirmation', -]); - -Route::post('/eve/confirm', [ - 'as' => 'auth.eve.confirmation.post', - 'uses' => 'SsoController@postSsoConfirmation', -]); +Route::get('/eve') + ->name('seatcore::auth.eve') + ->uses('SsoController@redirectToProvider'); + +Route::get('/eve/profile/{profile?}') + ->name('seatcore::auth.eve.profile') + ->uses('SsoController@redirectToProvider'); + +Route::get('/eve/callback') + ->name('seatcore::auth.eve.callback') + ->uses('SsoController@handleProviderCallback'); + +Route::get('/eve/email') + ->name('seatcore::auth.eve.email') + ->uses('SsoController@getUserEmail'); + +Route::post('/eve/email') + ->name('seatcore::auth.eve.email.set') + ->uses('SsoController@postUpdateUserEmail'); + +Route::get('/eve/confirm') + ->name('seatcore::auth.eve.confirmation.get') + ->uses('SsoController@getSsoConfirmation'); + +Route::post('/eve/confirm') + ->name('seatcore::auth.eve.confirmation.post') + ->uses('SsoController@postSsoConfirmation'); diff --git a/src/Http/Routes/Character/View.php b/src/Http/Routes/Character/View.php index 0996d6922..9cd0177f5 100644 --- a/src/Http/Routes/Character/View.php +++ b/src/Http/Routes/Character/View.php @@ -20,46 +20,47 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/')->name('character.list')->uses('CharacterController@index'); +Route::get('/') + ->name('seatcore::character.list') + ->uses('CharacterController@index'); -// TODO : surround with global superuser Route::delete('/{character}') - ->name('character.destroy') + ->name('seatcore::character.destroy') ->uses('CharacterController@destroy') ->middleware('can:global.superuser'); -Route::get('/{character}', [ - 'as' => 'character.view.default', - 'uses' => 'CharacterController@show', -])->where('character_id', '[0-9]+'); +Route::get('/{character}') + ->name('seatcore::character.view.default') + ->uses('CharacterController@show') + ->where('character_id', '[0-9]+'); Route::get('/{character}/assets') - ->name('character.view.assets') + ->name('seatcore::character.view.assets') ->uses('AssetsController@getAssetsView') ->middleware('can:character.asset,character'); Route::get('/{character}/assets/{item_id}/fitting') - ->name('character.view.assets.fitting') + ->name('seatcore::character.view.assets.fitting') ->uses('AssetsController@getFitting') ->middleware('can:character.asset,character'); Route::get('/{character}/assets/{item_id}/container') - ->name('character.view.assets.container') + ->name('seatcore::character.view.assets.container') ->uses('AssetsController@getContainer') ->middleware('can:character.asset,character'); Route::get('/{character}/calendar') - ->name('character.view.calendar') + ->name('seatcore::character.view.calendar') ->uses('CalendarController@index') ->middleware('can:character.calendar,character'); Route::get('/{character}/contacts') - ->name('character.view.contacts') + ->name('seatcore::character.view.contacts') ->uses('ContactsController@index') ->middleware('can:character.contact,character'); Route::get('/{character}/contracts') - ->name('character.view.contracts') + ->name('seatcore::character.view.contracts') ->uses('ContractsController@index') ->middleware('can:character.contract,character'); @@ -68,27 +69,27 @@ ->middleware('can:character.contract,character'); Route::get('/{character}/contracts/{contract_id}') - ->name('character.view.contracts.items') + ->name('seatcore::character.view.contracts.items') ->uses('ContractsController@show') ->middleware('can:character.contract,character'); Route::get('/{character}/fittings') - ->name('character.view.fittings') + ->name('seatcore::character.view.fittings') ->uses('FittingController@index') ->middleware('can:character.fitting,character'); Route::get('/{character}/fittings/{fitting_id}') - ->name('character.view.fittings.items') + ->name('seatcore::character.view.fittings.items') ->uses('FittingController@show') ->middleware('can:character.fitting,character'); Route::get('/{character}/blueprint') - ->name('character.view.blueprint') + ->name('seatcore::character.view.blueprint') ->uses('BlueprintController@index') ->middleware('can:character.blueprint,character'); Route::get('/{character}/industry') - ->name('character.view.industry') + ->name('seatcore::character.view.industry') ->uses('IndustryController@index') ->middleware('can:character.industry,character'); @@ -100,63 +101,63 @@ Route::group(['prefix' => '{character}/intel'], function () { Route::get('summary') - ->name('character.view.intel.summary') + ->name('seatcore::character.view.intel.summary') ->uses('IntelController@getIntelSummary') ->middleware('can:character.intel,character'); // Ajax Call Journal Route::get('summary/journal/data') - ->name('character.view.intel.summary.journal.data') + ->name('seatcore::character.view.intel.summary.journal.data') ->uses('IntelController@getTopWalletJournalData') ->middleware('can:character.intel,character'); Route::get('summary/journal/details/{first_party_id}/{second_party_id}/{ref_type}') - ->name('character.view.intel.summary.journal.details') + ->name('seatcore::character.view.intel.summary.journal.details') ->uses('IntelController@getJournalContent') ->middleware('can:character.intel,character'); // Transactions Route::get('summary/transactions/data') - ->name('character.view.intel.summary.transactions.data') + ->name('seatcore::character.view.intel.summary.transactions.data') ->uses('IntelController@getTopTransactionsData') ->middleware('can:character.intel,character'); Route::get('summary/transactions/details/{client_id}') - ->name('character.view.intel.summary.transactions.details') + ->name('seatcore::character.view.intel.summary.transactions.details') ->uses('IntelController@getTransactionContent') ->middleware('can:character.intel,character'); // Mail Route::get('summary/mail/data') - ->name('character.view.intel.summary.mail.data') + ->name('seatcore::character.view.intel.summary.mail.data') ->uses('IntelController@getTopMailFromData') ->middleware('can:character.intel,character'); Route::get('summary/mail/details/{from}') - ->name('character.view.intel.summary.mail.details') + ->name('seatcore::character.view.intel.summary.mail.details') ->uses('IntelController@getTopMailContent') ->middleware('can:character.intel,character'); // Standings Comparison Route::get('comparison') - ->name('character.view.intel.standingscomparison') + ->name('seatcore::character.view.intel.standingscomparison') ->uses('IntelController@getStandingsComparison') ->middleware('can:character.intel,character'); Route::get('comparison/data/{profile_id}') - ->name('character.view.intel.standingscomparison.data') + ->name('seatcore::character.view.intel.standingscomparison.data') ->uses('IntelController@getCompareStandingsWithProfileData') ->middleware('can:character.intel,character'); // Notes Route::get('notes') - ->name('character.view.intel.notes') + ->name('seatcore::character.view.intel.notes') ->uses('IntelController@notes') ->middleware('can:character.intel,character'); }); Route::get('/{character}/journal') - ->name('character.view.journal') + ->name('seatcore::character.view.journal') ->uses('WalletController@journal') ->middleware('can:character.journal,character'); @@ -165,40 +166,40 @@ ->middleware('can:character.journal,character'); Route::get('/view/journal/graph/balance/{character}') - ->name('character.view.journal.graph.balance') + ->name('seatcore::character.view.journal.graph.balance') ->uses('WalletController@getJournalGraphBalance') ->middleware('can:character.journal,character'); Route::get('/{character}/killmails') - ->name('character.view.killmails') + ->name('seatcore::character.view.killmails') ->uses('KillmailController@index') ->middleware('can:character.killmail,character'); Route::get('/{character}/killmails/{killmail}') - ->name('character.view.killmail') + ->name('seatcore::character.view.killmail') ->uses('KillmailController@show') ->middleware('can:character.killmail,character'); Route::get('/view/mail/timeline') - ->name('character.view.mail.timeline') + ->name('seatcore::character.view.mail.timeline') ->uses('MailController@getMailTimeline'); Route::get('/view/mail/timeline/read/{message_id}') - ->name('character.view.mail.timeline.read') + ->name('seatcore::character.view.mail.timeline.read') ->uses('MailController@getMailTimelineRead'); Route::get('/{character}/mail') - ->name('character.view.mail') + ->name('seatcore::character.view.mail') ->uses('MailController@index') ->middleware('can:character.mail,character'); Route::get('/{character}/mail/{message_id}') - ->name('character.view.mail.read') + ->name('seatcore::character.view.mail.read') ->uses('MailController@show') ->middleware('can:character.mail,character'); Route::get('/{character}/markets') - ->name('character.view.market') + ->name('seatcore::character.view.market') ->uses('MarketController@index') ->middleware('can:character.market,character'); @@ -207,67 +208,67 @@ ->middleware('can:character.market,character'); Route::get('/{character}/mining-ledger') - ->name('character.view.mining_ledger') + ->name('seatcore::character.view.mining_ledger') ->uses('MiningLedgerController@index') ->middleware('can:character.mining,character'); Route::get('/{character}/mining-ledger/details') - ->name('character.view.mining_ledger.details') + ->name('seatcore::character.view.mining_ledger.details') ->uses('MiningLedgerController@show') ->middleware('can:character.mining,character'); Route::get('/{character}/notifications') - ->name('character.view.notifications') + ->name('seatcore::character.view.notifications') ->uses('NotificationsController@index') ->middleware('can:character.notification,character'); Route::get('/{character}/pi') - ->name('character.view.pi') + ->name('seatcore::character.view.pi') ->uses('PiController@getPi') ->middleware('can:character.planetary,character'); Route::get('/{character}/research') - ->name('character.view.research') + ->name('seatcore::character.view.research') ->uses('ResearchController@index') ->middleware('can:character.research,character'); Route::get('/{character}/sheet') - ->name('character.view.sheet') + ->name('seatcore::character.view.sheet') ->uses('SheetController@show') ->middleware('can:character.sheet,character'); Route::get('/{character}/ship') - ->name('character.view.ship') + ->name('seatcore::character.view.ship') ->uses('CharacterController@getShip') ->middleware('can:character.asset,character'); Route::get('/{character}/skills') - ->name('character.view.skills') + ->name('seatcore::character.view.skills') ->uses('SkillsController@getSkills') ->middleware('can:character.skill,character'); Route::get('/{character}/skills/export') - ->name('character.export.skills') + ->name('seatcore::character.export.skills') ->uses('SkillsController@export') ->middleware('can:character.skill,character'); Route::get('/view/skills/graph/level/{character}') - ->name('character.view.skills.graph.level') + ->name('seatcore::character.view.skills.graph.level') ->uses('SkillsController@getCharacterSkillsLevelChartData') ->middleware('can:character.sheet,character'); Route::get('/view/skills/graph/coverage/{character}') - ->name('character.view.skills.graph.coverage') + ->name('seatcore::character.view.skills.graph.coverage') ->uses('SkillsController@getCharacterSkillsCoverageChartData') ->middleware('can:character.sheet,character'); Route::get('/{character}/standings') - ->name('character.view.standings') + ->name('seatcore::character.view.standings') ->uses('StandingsController@index') ->middleware('can:character.standing,character'); Route::get('/{character}/transactions') - ->name('character.view.transactions') + ->name('seatcore::character.view.transactions') ->uses('WalletController@transactions') ->middleware('can:character.transaction,character'); diff --git a/src/Http/Routes/Configuration/Access.php b/src/Http/Routes/Configuration/Access.php index 23bf668aa..daead7fbd 100644 --- a/src/Http/Routes/Configuration/Access.php +++ b/src/Http/Routes/Configuration/Access.php @@ -22,19 +22,18 @@ Route::resource('roles', 'AccessController', [ 'names' => [ - 'index' => 'configuration.access.roles', - 'create' => 'configuration.access.roles.add', - 'store' => 'configuration.access.roles.store', - 'edit' => 'configuration.access.roles.edit', - 'update' => 'configuration.access.roles.update', - 'destroy' => 'configuration.access.roles.delete', + 'index' => 'seatcore::configuration.access.roles', + 'create' => 'seatcore::configuration.access.roles.add', + 'store' => 'seatcore::configuration.access.roles.store', + 'edit' => 'seatcore::configuration.access.roles.edit', + 'update' => 'seatcore::configuration.access.roles.update', + 'destroy' => 'seatcore::configuration.access.roles.delete', ], 'except' => [ 'show', ], ]); -Route::delete('/roles/{role_id}/members/{user_id}', [ - 'as' => 'configuration.access.roles.edit.remove.user', - 'uses' => 'AccessController@removeUser', -]); +Route::delete('/roles/{role_id}/members/{user_id}') + ->name('seatcore::configuration.access.roles.edit.remove.user') + ->uses('AccessController@removeUser'); diff --git a/src/Http/Routes/Configuration/Impersonation.php b/src/Http/Routes/Configuration/Impersonation.php index 24d5dad96..e86b985af 100644 --- a/src/Http/Routes/Configuration/Impersonation.php +++ b/src/Http/Routes/Configuration/Impersonation.php @@ -20,7 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/impersonate/stop', [ - 'as' => 'configuration.users.impersonate.stop', - 'uses' => 'UserController@getStopImpersonate', -]); +Route::get('/impersonate/stop') + ->name('seatcore::configuration.users.impersonate.stop') + ->uses('UserController@getStopImpersonate'); diff --git a/src/Http/Routes/Configuration/Schedule.php b/src/Http/Routes/Configuration/Schedule.php index eeb8e53c8..a031d93b3 100644 --- a/src/Http/Routes/Configuration/Schedule.php +++ b/src/Http/Routes/Configuration/Schedule.php @@ -20,17 +20,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/', [ - 'as' => 'configuration.schedule', - 'uses' => 'ScheduleController@listSchedule', -]); +Route::get('/') + ->name('seatcore::configuration.schedule') + ->uses('ScheduleController@listSchedule'); -Route::post('/new', [ - 'as' => 'configuration.schedule.new', - 'uses' => 'ScheduleController@newSchedule', -]); +Route::post('/new') + ->name('seatcore::configuration.schedule.new') + ->uses('ScheduleController@newSchedule'); -Route::get('/delete/{schedule_id}', [ - 'as' => 'configuration.schedule.delete', - 'uses' => 'ScheduleController@deleteSchedule', -]); +Route::get('/delete/{schedule_id}') + ->name('seatcore::configuration.schedule.delete') + ->uses('ScheduleController@deleteSchedule'); diff --git a/src/Http/Routes/Configuration/Seat.php b/src/Http/Routes/Configuration/Seat.php index aeac2f29c..1a8144494 100644 --- a/src/Http/Routes/Configuration/Seat.php +++ b/src/Http/Routes/Configuration/Seat.php @@ -20,37 +20,30 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/view', [ - 'as' => 'seat.settings.view', - 'uses' => 'SeatController@getView', -]); - -Route::get('/about', [ - 'as' => 'seat.settings.about', - 'uses' => 'SeatController@getAbout', -]); - -Route::post('/update/customlink', [ - 'as' => 'seat.update.customlink', - 'uses' => 'SeatController@postUpdateCustomLinks', -]); - -Route::post('/update/settings', [ - 'as' => 'seat.update.settings', - 'uses' => 'SeatController@postUpdateSettings', -]); - -Route::get('/check/sde', [ - 'as' => 'check.sde', - 'uses' => 'SeatController@getApprovedSDE', -]); - -Route::post('/packages/check', [ - 'as' => 'packages.check', - 'uses' => 'SeatController@postPackagesCheck', -]); - -Route::post('/packages/changelog', [ - 'as' => 'packages.changelog', - 'uses' => 'SeatController@postPackagesChangelog', -]); +Route::get('/view') + ->name('seatcore::seat.settings.view') + ->uses('SeatController@getView'); + +Route::get('/about') + ->name('seatcore::seat.settings.about') + ->uses('SeatController@getAbout'); + +Route::post('/update/customlink') + ->name('seatcore::seat.update.customlink') + ->uses('SeatController@postUpdateCustomLinks'); + +Route::post('/update/settings') + ->name('seatcore::seat.update.settings') + ->uses('SeatController@postUpdateSettings'); + +Route::get('/check/sde') + ->name('seatcore::check.sde') + ->uses('SeatController@getApprovedSDE'); + +Route::post('/packages/check') + ->name('seatcore::packages.check') + ->uses('SeatController@postPackagesCheck'); + +Route::post('/packages/changelog') + ->name('seatcore::packages.changelog') + ->uses('SeatController@postPackagesChangelog'); diff --git a/src/Http/Routes/Configuration/Security.php b/src/Http/Routes/Configuration/Security.php index 4be2c0598..7ca7bcfcd 100644 --- a/src/Http/Routes/Configuration/Security.php +++ b/src/Http/Routes/Configuration/Security.php @@ -20,12 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/logs', [ - 'as' => 'configuration.security.logs', - 'uses' => 'SecurityController@getLogs', -]); +Route::get('/logs') + ->name('seatcore::configuration.security.logs') + ->uses('SecurityController@getLogs'); -Route::get('/logs/data', [ - 'as' => 'configuration.security.logs.data', - 'uses' => 'SecurityController@getLogsData', -]); +Route::get('/logs/data') + ->name('seatcore::configuration.security.logs.data') + ->uses('SecurityController@getLogsData'); diff --git a/src/Http/Routes/Configuration/Sso.php b/src/Http/Routes/Configuration/Sso.php index 2ad073de9..24a6fff83 100644 --- a/src/Http/Routes/Configuration/Sso.php +++ b/src/Http/Routes/Configuration/Sso.php @@ -20,32 +20,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::match(['get', 'post'], '/', [ - 'as' => 'configuration.sso', - 'uses' => 'SsoController@getConfigurationHome', -]); +Route::match(['get', 'post'], '/') + ->name('seatcore::configuration.sso') + ->uses('SsoController@getConfigurationHome'); -Route::post('/update-scopes', [ - 'as' => 'configuration.sso.update_scopes', - 'uses' => 'SsoController@postUpdateScopes', -]); +Route::post('/update-scopes') + ->name('seatcore::configuration.sso.update_scopes') + ->uses('SsoController@postUpdateScopes'); -Route::get('/set-default-profile/{id}', [ - 'as' => 'configuration.sso.set_default_profile', - 'uses' => 'SsoController@getSetDefaultProfile', -]); +Route::get('/set-default-profile/{id}') + ->name('seatcore::configuration.sso.set_default_profile') + ->uses('SsoController@getSetDefaultProfile'); -Route::get('/add-profile', [ - 'as' => 'configuration.sso.add_profile', - 'uses' => 'SsoController@getAddProfile', -]); +Route::get('/add-profile') + ->name('seatcore::configuration.sso.add_profile') + ->uses('SsoController@getAddProfile'); -Route::get('/delete-profile/{id}', [ - 'as' => 'configuration.sso.delete_profile', - 'uses' => 'SsoController@getDeleteProfile', -]); +Route::get('/delete-profile/{id}') + ->name('seatcore::configuration.sso.delete_profile') + ->uses('SsoController@getDeleteProfile'); -Route::post('/update-custom-signin', [ - 'as' => 'configuration.sso.update_custom_signin', - 'uses' => 'SsoController@postUpdateCustomSignin', -]); +Route::post('/update-custom-signin') + ->name('seatcore::configuration.sso.update_custom_signin') + ->uses('SsoController@postUpdateCustomSignin'); diff --git a/src/Http/Routes/Configuration/User.php b/src/Http/Routes/Configuration/User.php index 410c58e3a..fc6be6ea9 100644 --- a/src/Http/Routes/Configuration/User.php +++ b/src/Http/Routes/Configuration/User.php @@ -20,37 +20,31 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/', [ - 'as' => 'configuration.users', - 'uses' => 'UserController@index', -]); +Route::get('/') + ->name('seatcore::configuration.users') + ->uses('UserController@index'); -Route::get('/{user_id}', [ - 'as' => 'configuration.users.edit', - 'uses' => 'UserController@edit', -]); +Route::get('/{user_id}') + ->name('seatcore::configuration.users.edit') + ->uses('UserController@edit'); -Route::put('/{user_id}', [ - 'as' => 'configuration.users.update', - 'uses' => 'UserController@update', -]); +Route::put('/{user_id}') + ->name('seatcore::configuration.users.update') + ->uses('UserController@update'); Route::put('/{user_id}/reassign') ->middleware('can:global.superuser') - ->name('configuration.users.reassign') + ->name('seatcore::configuration.users.reassign') ->uses('UserController@reassign'); -Route::delete('/{user_id}', [ - 'as' => 'configuration.users.delete', - 'uses' => 'UserController@delete', -]); +Route::delete('/{user_id}') + ->name('seatcore::configuration.users.delete') + ->uses('UserController@delete'); -Route::get('/edit/{user_id}/account_status', [ - 'as' => 'configuration.users.edit.account_status', - 'uses' => 'UserController@editUserAccountStatus', -]); +Route::get('/edit/{user_id}/account_status') + ->name('seatcore::configuration.users.edit.account_status') + ->uses('UserController@editUserAccountStatus'); -Route::post('/{user_id}/impersonate', [ - 'as' => 'configuration.users.impersonate', - 'uses' => 'UserController@impersonate', -]); +Route::post('/{user_id}/impersonate') + ->name('seatcore::configuration.users.impersonate') + ->uses('UserController@impersonate'); diff --git a/src/Http/Routes/Corporation/View.php b/src/Http/Routes/Corporation/View.php index 618a67e45..5898274fc 100644 --- a/src/Http/Routes/Corporation/View.php +++ b/src/Http/Routes/Corporation/View.php @@ -21,39 +21,39 @@ */ Route::get('/') - ->name('corporation.list') + ->name('seatcore::corporation.list') ->uses('CorporationsController@index'); Route::get('/{corporation}') - ->name('corporation.view.default') + ->name('seatcore::corporation.view.default') ->uses('CorporationsController@show'); Route::delete('/{corporation}') - ->name('corporation.destroy') + ->name('seatcore::corporation.destroy') ->uses('CorporationsController@destroy'); Route::get('/{corporation}/assets') - ->name('corporation.view.assets') + ->name('seatcore::corporation.view.assets') ->uses('AssetsController@getAssets') ->middleware('can:corporation.asset,corporation'); Route::get('/{corporation}/assets/{item_id}/fitting') - ->name('corporation.view.assets.fitting') + ->name('seatcore::corporation.view.assets.fitting') ->uses('AssetsController@getFitting') ->middleware('can:corporation.asset,corporation'); Route::get('/{corporation}/assets/{item_id}/container') - ->name('corporation.view.assets.container') + ->name('seatcore::corporation.view.assets.container') ->uses('AssetsController@getContainer') ->middleware('can:corporation.asset,corporation'); Route::get('/{corporation}/contacts') - ->name('corporation.view.contacts') + ->name('seatcore::corporation.view.contacts') ->uses('ContactsController@index') ->middleware('can:corporation.contact,corporation'); Route::get('/{corporation}/contracts') - ->name('corporation.view.contracts') + ->name('seatcore::corporation.view.contracts') ->uses('ContractsController@index') ->middleware('can:corporation.contract,corporation'); @@ -62,32 +62,32 @@ ->middleware('can:corporation.contract,corporation'); Route::get('/{corporation}/contracts/{contract_id}') - ->name('corporation.view.contracts.items') + ->name('seatcore::corporation.view.contracts.items') ->uses('ContractsController@show') ->middleware('can:corporation.contract,corporation'); Route::get('/{corporation}/industry') - ->name('corporation.view.industry') + ->name('seatcore::corporation.view.industry') ->uses('IndustryController@index') ->middleware('can:corporation.industry,corporation'); Route::get('/{corporation}/blueprint') - ->name('corporation.view.blueprint') + ->name('seatcore::corporation.view.blueprint') ->uses('BlueprintController@index') ->middleware('can:corporation.blueprint,corporation'); Route::get('/{corporation}/killmails') - ->name('corporation.view.killmails') + ->name('seatcore::corporation.view.killmails') ->uses('KillmailsController@index') ->middleware('can:corporation.killmail,corporation'); Route::get('/{corporation}/killmails/{killmail}') - ->name('corporation.view.killmail') + ->name('seatcore::corporation.view.killmail') ->uses('KillmailsController@show') ->middleware('can:corporation.killmail,corporation'); Route::get('/{corporation}/markets') - ->name('corporation.view.market') + ->name('seatcore::corporation.view.market') ->uses('MarketController@index') ->middleware('can:corporation.market,corporation'); @@ -96,100 +96,100 @@ ->middleware('can:corporation.market,corporation'); Route::get('/{corporation}/mining-ledger/{year?}/{month?}') - ->name('corporation.view.mining_ledger') + ->name('seatcore::corporation.view.mining_ledger') ->uses('MiningLedgerController@index') ->middleware('can:corporation.mining,corporation'); Route::get('/{corporation}/customs-offices') - ->name('corporation.view.customs-offices') + ->name('seatcore::corporation.view.customs-offices') ->uses('CustomOfficeController@index') ->middleware('can:corporation.customs_office,corporation'); Route::get('/{corporation}/extractions') - ->name('corporation.view.extractions') + ->name('seatcore::corporation.view.extractions') ->uses('ExtractionController@getExtractions') ->middleware('can:corporation.extraction,corporation'); Route::group(['prefix' => '{corporation}/security', 'middleware' => 'can:corporation.security,corporation'], function () { Route::get('roles') - ->name('corporation.view.security.roles') + ->name('seatcore::corporation.view.security.roles') ->uses('SecurityController@getRoles'); Route::get('titles') - ->name('corporation.view.security.titles') + ->name('seatcore::corporation.view.security.titles') ->uses('SecurityController@getTitles'); Route::get('logs') - ->name('corporation.view.security.log') + ->name('seatcore::corporation.view.security.log') ->uses('SecurityController@getLogs'); }); Route::group(['prefix' => '{corporation}/ledger', 'middleware' => 'can:corporation.ledger,corporation'], function () { Route::get('summary') - ->name('corporation.view.ledger.summary') + ->name('seatcore::corporation.view.ledger.summary') ->uses('LedgerController@getWalletSummary'); Route::get('bounty-prizes/{year?}/{month?}') - ->name('corporation.view.ledger.bounty_prizes') + ->name('seatcore::corporation.view.ledger.bounty_prizes') ->uses('LedgerController@getBountyPrizesByMonth'); Route::get('planetary-interaction/{year?}/{month?}') - ->name('corporation.view.ledger.planetary_interaction') + ->name('seatcore::corporation.view.ledger.planetary_interaction') ->uses('LedgerController@getPlanetaryInteractionByMonth'); Route::get('offices-rentals/{year?}/{month?}') - ->name('corporation.view.ledger.offices_rentals') + ->name('seatcore::corporation.view.ledger.offices_rentals') ->uses('LedgerController@getOfficesRentalsByMonth'); Route::get('industry-facility/{year?}/{month?}') - ->name('corporation.view.ledger.industry_facility') + ->name('seatcore::corporation.view.ledger.industry_facility') ->uses('LedgerController@getIndustryFacilityByMonth'); Route::get('reprocessing/{year?}/{month?}') - ->name('corporation.view.ledger.reprocessing') + ->name('seatcore::corporation.view.ledger.reprocessing') ->uses('LedgerController@getReprocessingByMonth'); Route::get('jump-clones/{year?}/{month?}') - ->name('corporation.view.ledger.jump_clones') + ->name('seatcore::corporation.view.ledger.jump_clones') ->uses('LedgerController@getJumpClonesByMonth'); Route::get('jump-bridges/{year?}/{month?}') - ->name('corporation.view.ledger.jump_bridges') + ->name('seatcore::corporation.view.ledger.jump_bridges') ->uses('LedgerController@getJumpBridgesByMonth'); }); Route::get('/{corporation}/summary') - ->name('corporation.view.summary') + ->name('seatcore::corporation.view.summary') ->uses('SummaryController@show') ->middleware('can:corporation.summary,corporation'); Route::get('/{corporation}/standings') - ->name('corporation.view.standings') + ->name('seatcore::corporation.view.standings') ->uses('StandingsController@index') ->middleware('can:corporation.standing,corporation'); Route::get('/{corporation}/starbases') - ->name('corporation.view.starbases') + ->name('seatcore::corporation.view.starbases') ->uses('StarbaseController@getStarbases') ->middleware('can:corporation.starbase,corporation'); Route::post('/{corporation}/starbase/modules') - ->name('corporation.view.starbase.modules') + ->name('seatcore::corporation.view.starbase.modules') ->uses('StarbaseController@postStarbaseModules') ->middleware('can:corporation.starbase,corporation'); Route::get('/{corporation}/structures') - ->name('corporation.view.structures') + ->name('seatcore::corporation.view.structures') ->uses('StructureController@getStructures') ->middleware('can:corporation.structure,corporation'); Route::get('/{corporation}/structures/{structure_id}') - ->name('corporation.view.structures.show') + ->name('seatcore::corporation.view.structures.show') ->uses('StructureController@show') ->middleware('can:corporation.structure,corporation'); Route::get('/{corporation}/tracking') - ->name('corporation.view.tracking') + ->name('seatcore::corporation.view.tracking') ->uses('TrackingController@getTracking') ->middleware('can:corporation.tracking,corporation'); @@ -198,7 +198,7 @@ ->middleware('can:corporation.tracking,corporation'); Route::get('/{corporation}/journal') - ->name('corporation.view.journal') + ->name('seatcore::corporation.view.journal') ->uses('WalletController@journal') ->middleware('can:corporation.journal,corporation'); @@ -207,7 +207,7 @@ ->middleware('can:corporation.journal,corporation'); Route::get('/{corporation}/transactions') - ->name('corporation.view.transactions') + ->name('seatcore::corporation.view.transactions') ->uses('WalletController@transactions') ->middleware('can:corporation.transaction,corporation'); diff --git a/src/Http/Routes/Home.php b/src/Http/Routes/Home.php index 7d0e65f9b..3d98da2cb 100644 --- a/src/Http/Routes/Home.php +++ b/src/Http/Routes/Home.php @@ -20,19 +20,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/')->uses('HomeController@index'); +Route::get('/') + ->uses('HomeController@index'); -Route::get('/home', [ - 'as' => 'home', - 'uses' => 'HomeController@getHome', -]); +Route::get('/home') + ->name('seatcore::home') + ->uses('HomeController@getHome'); -Route::get('/home/chart/server-status', [ - 'as' => 'home.chart.serverstatus', - 'uses' => 'HomeController@getServerStatusChartData', -]); +Route::get('/home/chart/server-status') + ->name('seatcore::home.chart.serverstatus') + ->uses('HomeController@getServerStatusChartData'); -Route::get('/home/chart/server-response-times', [ - 'as' => 'home.chart.serverresponse', - 'uses' => 'HomeController@getEsiResponseTimeChartData', -]); +Route::get('/home/chart/server-response-times') + ->name('seatcore::home.chart.serverresponse') + ->uses('HomeController@getEsiResponseTimeChartData'); diff --git a/src/Http/Routes/Profile/View.php b/src/Http/Routes/Profile/View.php index 2b6b8825f..cba06fd7b 100644 --- a/src/Http/Routes/Profile/View.php +++ b/src/Http/Routes/Profile/View.php @@ -20,42 +20,34 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/', [ - 'as' => 'profile.view', - 'uses' => 'ProfileController@getView', -]); - -Route::get('/scopes/{user_id}/{character_id}', [ - 'as' => 'profile.character.scopes', - 'uses' => 'ProfileController@getCharacterScopes', -]); - -Route::post('/update', [ - 'as' => 'profile.update.settings', - 'uses' => 'ProfileController@postUpdateUserSettings', -]); - -Route::post('/update/email', [ - 'as' => 'profile.update.email', - 'uses' => 'ProfileController@postUpdateEmail', -]); - -Route::post('/update/main-character', [ - 'as' => 'profile.change-character', - 'uses' => 'ProfileController@postChangeCharacter', -]); - -Route::post('/update/sharelink', [ - 'as' => 'profile.update.sharelink', - 'uses' => 'ProfileController@postUpdateSharelink', -]); - -Route::delete('/update/sharelink', [ - 'as' => 'profile.update.sharelink.remove', - 'uses' => 'ProfileController@deleteRemoveSharelink', -]); - -Route::delete('/character', [ - 'as' => 'profile.delete.character', - 'uses' => 'ProfileController@deleteUnlinkCharacter', -]); +Route::get('/') + ->name('seatcore::profile.view') + ->uses('ProfileController@getView'); + +Route::get('/scopes/{user_id}/{character_id}') + ->name('seatcore::profile.character.scopes') + ->uses('ProfileController@getCharacterScopes'); + +Route::post('/update') + ->name('seatcore::profile.update.settings') + ->uses('ProfileController@postUpdateUserSettings'); + +Route::post('/update/email') + ->name('seatcore::profile.update.email') + ->uses('ProfileController@postUpdateEmail'); + +Route::post('/update/main-character') + ->name('seatcore::profile.change-character') + ->uses('ProfileController@postChangeCharacter'); + +Route::post('/update/sharelink') + ->name('seatcore::profile.update.sharelink') + ->uses('ProfileController@postUpdateSharelink'); + +Route::delete('/update/sharelink') + ->name('seatcore::profile.update.sharelink.remove') + ->uses('ProfileController@deleteRemoveSharelink'); + +Route::delete('/character') + ->name('seatcore::profile.delete.character') + ->uses('ProfileController@deleteUnlinkCharacter'); diff --git a/src/Http/Routes/Queue/Status.php b/src/Http/Routes/Queue/Status.php index 140f4ba4c..858746600 100644 --- a/src/Http/Routes/Queue/Status.php +++ b/src/Http/Routes/Queue/Status.php @@ -20,7 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/short-status', [ - 'as' => 'queue.status.short', - 'uses' => 'QueueController@getShortStatus', -]); +Route::get('/short-status') + ->name('seatcore::queue.status.short') + ->uses('QueueController@getShortStatus'); diff --git a/src/Http/Routes/Squads/Routes.php b/src/Http/Routes/Squads/Routes.php index 78e228adf..89e25a69e 100644 --- a/src/Http/Routes/Squads/Routes.php +++ b/src/Http/Routes/Squads/Routes.php @@ -20,22 +20,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/', [ - 'as' => 'squads.index', - 'uses' => 'SquadsController@index', -]); +Route::get('/') + ->name('seatcore::squads.index') + ->uses('SquadsController@index'); Route::group([ 'middleware' => 'can:squads.create', ], function () { // squad creation form Route::get('/create') - ->name('squads.create') + ->name('seatcore::squads.create') ->uses('SquadsController@create'); // create a squad Route::post('/') - ->name('squads.store') + ->name('seatcore::squads.store') ->uses('SquadsController@store'); }); @@ -44,24 +43,24 @@ // squad card Route::get('/') - ->name('squads.show') + ->name('seatcore::squads.show') ->uses('SquadsController@show'); // squad update form Route::get('/edit') - ->name('squads.edit') + ->name('seatcore::squads.edit') ->uses('SquadsController@edit') ->middleware('can:squads.edit,squad'); // update a squad Route::put('/') - ->name('squads.update') + ->name('seatcore::squads.update') ->uses('SquadsController@update') ->middleware('can:squads.edit,squad'); // remove a squad Route::delete('/') - ->name('squads.destroy') + ->name('seatcore::squads.destroy') ->uses('SquadsController@destroy') ->middleware('can:squads.delete,squad'); }); @@ -70,31 +69,31 @@ // select2 squad member (not already part of active squad) Route::get('/lookup') - ->name('squads.members.lookup') + ->name('seatcore::squads.members.lookup') ->uses('MembersController@lookup') ->middleware('can:squads.manage_members,squad'); // add member to a squad Route::post('/') - ->name('squads.members.store') + ->name('seatcore::squads.members.store') ->uses('MembersController@store') ->middleware('can:squads.manage_members,squad'); // remove member from a squad Route::delete('/{member}') - ->name('squads.members.kick') + ->name('seatcore::squads.members.kick') ->uses('MembersController@destroy') ->middleware('can:squads.kick,squad,member'); // show squad members Route::get('/') - ->name('squads.members.index') + ->name('seatcore::squads.members.index') ->uses('MembersController@index') ->middleware('can:squads.show_members,squad'); // leave a squad Route::delete('/') - ->name('squads.members.leave') + ->name('seatcore::squads.members.leave') ->uses('MembersController@leave'); }); @@ -104,17 +103,17 @@ // select2 squad moderators (not part of active squad) Route::get('/lookup') - ->name('squads.moderators.lookup') + ->name('seatcore::squads.moderators.lookup') ->uses('ModeratorsController@lookup'); // add moderator to a squad Route::post('/') - ->name('squads.moderators.store') + ->name('seatcore::squads.moderators.store') ->uses('ModeratorsController@store'); // remove moderator from a squad Route::delete('/{user}') - ->name('squads.moderators.destroy') + ->name('seatcore::squads.moderators.destroy') ->uses('ModeratorsController@destroy'); }); @@ -124,22 +123,22 @@ // show squad roles Route::get('/') - ->name('squads.roles.show') + ->name('seatcore::squads.roles.show') ->uses('RolesController@show'); // select2 squad roles (not part of active squad) Route::get('/lookup') - ->name('squads.roles.lookup') + ->name('seatcore::squads.roles.lookup') ->uses('RolesController@lookup'); // add a role to a squad Route::post('/') - ->name('squads.roles.store') + ->name('seatcore::squads.roles.store') ->uses('RolesController@store'); // remove a role from a squad Route::delete('/') - ->name('squads.roles.destroy') + ->name('seatcore::squads.roles.destroy') ->uses('RolesController@destroy'); }); @@ -148,35 +147,35 @@ // show squad applications Route::get('/') - ->name('squads.applications.index') + ->name('seatcore::squads.applications.index') ->uses('ApplicationsController@index') ->middleware('can:squads.manage_members,squad'); // apply to a squad Route::post('/') - ->name('squads.applications.store') + ->name('seatcore::squads.applications.store') ->uses('ApplicationsController@store'); // revoke squad application Route::delete('/') - ->name('squads.applications.cancel') + ->name('seatcore::squads.applications.cancel') ->uses('ApplicationsController@cancel'); // show squad application details Route::get('/{id}') - ->name('squads.applications.show') + ->name('seatcore::squads.applications.show') ->uses('ApplicationsController@show') ->middleware('can:squads.manage_members,squad'); // approve a squad application Route::post('/{id}') - ->name('squads.applications.approve') + ->name('seatcore::squads.applications.approve') ->uses('ApplicationsController@approve') ->middleware('can:squads.manage_members,squad'); // reject a squad application Route::delete('/{id}') - ->name('squads.applications.reject') + ->name('seatcore::squads.applications.reject') ->uses('ApplicationsController@reject') ->middleware('can:squads.manage_members,squad'); }); diff --git a/src/Http/Routes/Support/FastLookup.php b/src/Http/Routes/Support/FastLookup.php index 9aad63bb6..18dd3a638 100644 --- a/src/Http/Routes/Support/FastLookup.php +++ b/src/Http/Routes/Support/FastLookup.php @@ -20,73 +20,59 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/groups', [ - 'as' => 'fastlookup.groups', - 'uses' => 'FastLookupController@getGroups', -]); +Route::get('/groups') + ->name('seatcore::fastlookup.groups') + ->uses('FastLookupController@getGroups'); -Route::get('/titles', [ - 'as' => 'fastlookup.titles', - 'uses' => 'FastLookupController@getTitles', -]); +Route::get('/titles') + ->name('seatcore::fastlookup.titles') + ->uses('FastLookupController@getTitles'); -Route::get('/users', [ - 'as' => 'fastlookup.users', - 'uses' => 'FastLookupController@getUsers', -]); +Route::get('/users') + ->name('seatcore::fastlookup.users') + ->uses('FastLookupController@getUsers'); -Route::get('/characters', [ - 'as' => 'fastlookup.characters', - 'uses' => 'FastLookupController@getCharacters', -]); +Route::get('/characters') + ->name('seatcore::fastlookup.characters') + ->uses('FastLookupController@getCharacters'); -Route::get('/corporations', [ - 'as' => 'fastlookup.corporations', - 'uses' => 'FastLookupController@getCorporations', -]); +Route::get('/corporations') + ->name('seatcore::fastlookup.corporations') + ->uses('FastLookupController@getCorporations'); -Route::get('/alliances', [ - 'as' => 'fastlookup.alliances', - 'uses' => 'FastLookupController@getAlliances', -]); +Route::get('/alliances') + ->name('seatcore::fastlookup.alliances') + ->uses('FastLookupController@getAlliances'); -Route::get('/entities', [ - 'as' => 'fastlookup.entities', - 'uses' => 'FastLookupController@getEntities', - 'middleware' => 'can:global.superuser', -]); +Route::get('/entities') + ->name('seatcore::fastlookup.entities') + ->uses('FastLookupController@getEntities') + ->middleware('can:global.superuser'); -Route::get('/items', [ - 'as' => 'fastlookup.items', - 'uses' => 'FastLookupController@getItems', -]); +Route::get('/items') + ->name('seatcore::fastlookup.items') + ->uses('FastLookupController@getItems'); -Route::get('/scopes', [ - 'as' => 'fastlookup.scopes', - 'uses' => 'FastLookupController@getScopes', -]); +Route::get('/scopes') + ->name('seatcore::fastlookup.scopes') + ->uses('FastLookupController@getScopes'); -Route::get('/skills', [ - 'as' => 'fastlookup.skills', - 'uses' => 'FastLookupController@getSkills', -]); +Route::get('/skills') + ->name('seatcore::fastlookup.skills') + ->uses('FastLookupController@getSkills'); -Route::get('/regions', [ - 'as' => 'fastlookup.regions', - 'uses' => 'FastLookupController@getRegions', -]); +Route::get('/regions') + ->name('seatcore::fastlookup.regions') + ->uses('FastLookupController@getRegions'); -Route::get('/constellations', [ - 'as' => 'fastlookup.constellations', - 'uses' => 'FastLookupController@getConstellations', -]); +Route::get('/constellations') + ->name('seatcore::fastlookup.constellations') + ->uses('FastLookupController@getConstellations'); -Route::get('/systems', [ - 'as' => 'fastlookup.systems', - 'uses' => 'FastLookupController@getSystems', -]); +Route::get('/systems') + ->name('seatcore::fastlookup.systems') + ->uses('FastLookupController@getSystems'); -Route::get('/roles', [ - 'as' => 'fastlookup.roles', - 'uses' => 'FastLookupController@getCorporationRoles', -]); +Route::get('/roles') + ->name('seatcore::fastlookup.roles') + ->uses('FastLookupController@getCorporationRoles'); diff --git a/src/Http/Routes/Support/Insurance.php b/src/Http/Routes/Support/Insurance.php index 4a9d8c7d5..40c1f82b7 100644 --- a/src/Http/Routes/Support/Insurance.php +++ b/src/Http/Routes/Support/Insurance.php @@ -20,7 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/insurances/{type_id}', [ - 'as' => 'insurances.show', - 'uses' => 'InsuranceController@show', -]); +Route::get('/insurances/{type_id}') + ->name('seatcore::insurances.show') + ->uses('InsuranceController@show'); diff --git a/src/Http/Routes/Support/List.php b/src/Http/Routes/Support/List.php index c5ad93b62..0076b11e5 100644 --- a/src/Http/Routes/Support/List.php +++ b/src/Http/Routes/Support/List.php @@ -20,13 +20,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::get('/inv/types', [ - 'as' => 'support.inv.types', - 'uses' => 'ListController@getInvTypes', -]); +Route::get('/inv/types') + ->name('seatcore::support.inv.types') + ->uses('ListController@getInvTypes'); -Route::get('/api-key/userlist', [ - 'as' => 'support.api-key.userlist', - 'middleware' => 'can:global.superuser', - 'uses' => 'ListController@getSeatUserList', -]); +Route::get('/api-key/userlist') + ->name('seatcore::support.api-key.userlist') + ->middleware('can:global.superuser') + ->uses('ListController@getSeatUserList'); diff --git a/src/Http/Routes/Support/Resolve.php b/src/Http/Routes/Support/Resolve.php index 5ff2eab40..89c37e52f 100644 --- a/src/Http/Routes/Support/Resolve.php +++ b/src/Http/Routes/Support/Resolve.php @@ -20,12 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::post('/names/resolve', [ - 'as' => 'support.names.resolve', - 'uses' => 'ResolveController@resolveIdsToNames', -]); +Route::post('/names/resolve') + ->name('seatcore::support.names.resolve') + ->uses('ResolveController@resolveIdsToNames'); -Route::post('/main/resolve', [ - 'as' => 'support.main.resolve', - 'uses' => 'ResolveController@resolveMainCharacter', -]); +Route::post('/main/resolve') + ->name('seatcore::support.main.resolve') + ->uses('ResolveController@resolveMainCharacter'); diff --git a/src/Http/Routes/Support/Search.php b/src/Http/Routes/Support/Search.php index 9685617e6..839f4bdd5 100644 --- a/src/Http/Routes/Support/Search.php +++ b/src/Http/Routes/Support/Search.php @@ -20,32 +20,27 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::match(['get', 'post'], '/search', [ - 'as' => 'support.search', - 'uses' => 'SearchController@getSearch', -]); - -Route::get('/search/characters/data', [ - 'as' => 'support.search.characters.data', - 'uses' => 'SearchController@getSearchCharactersData', -]); - -Route::get('/search/corporations/data', [ - 'as' => 'support.search.corporations.data', - 'uses' => 'SearchController@getSearchCorporationsData', -]); - -Route::get('/search/mail/data', [ - 'as' => 'support.search.mail.data', - 'uses' => 'SearchController@getSearchMailData', -]); - -Route::get('/search/assets/data', [ - 'as' => 'support.search.assets.data', - 'uses' => 'SearchController@getSearchCharacterAssetsData', -]); - -Route::get('/search/skills/data', [ - 'as' => 'support.search.skills.data', - 'uses' => 'SearchController@getSearchCharacterSkillsData', -]); +Route::match(['get', 'post'], '/search') + ->name('seatcore::support.search') + ->uses('SearchController@getSearch'); + +Route::get('/search/characters/data') + ->name('seatcore::support.search.characters.data') + ->uses('SearchController@getSearchCharactersData'); + +Route::get('/search/corporations/data') + ->name('seatcore::support.search.corporations.data') + ->uses('SearchController@getSearchCorporationsData'); + +Route::get('/search/mail/data') + ->name('seatcore::support.search.mail.data') + ->uses('SearchController@getSearchMailData'); + +Route::get('/search/assets/data') + ->name('seatcore::support.search.assets.data') + ->uses('SearchController@getSearchCharacterAssetsData'); + +Route::get('/search/skills/data') + ->name('seatcore::support.search.skills.data') + ->uses('SearchController@getSearchCharacterSkillsData'); + diff --git a/src/Http/Routes/Tools/Job.php b/src/Http/Routes/Tools/Job.php index 5b617ca99..213af827b 100644 --- a/src/Http/Routes/Tools/Job.php +++ b/src/Http/Routes/Tools/Job.php @@ -20,7 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -Route::post('/dispatch', [ - 'as' => 'tools.jobs.dispatch', - 'uses' => 'JobController@getDispatchUpdateJob', -]); +Route::post('/dispatch') + ->name('seatcore::tools.jobs.dispatch') + ->uses('JobController@getDispatchUpdateJob'); diff --git a/src/Http/Routes/Tools/Moons.php b/src/Http/Routes/Tools/Moons.php index 4128c942f..b3f23ef7d 100644 --- a/src/Http/Routes/Tools/Moons.php +++ b/src/Http/Routes/Tools/Moons.php @@ -27,20 +27,20 @@ 'middleware' => 'can:moon.view_moon_reports', ], function () { Route::get('/') - ->name('tools.moons.index') + ->name('seatcore::tools.moons.index') ->uses('MoonsController@index'); Route::get('/{id}') - ->name('tools.moons.show') + ->name('seatcore::tools.moons.show') ->uses('MoonsController@show'); Route::post('/') - ->name('tools.moons.store') + ->name('seatcore::tools.moons.store') ->uses('MoonsController@store') ->middleware('can:moon.create_moon_reports'); Route::delete('/{report}') - ->name('tools.moons.destroy') + ->name('seatcore::tools.moons.destroy') ->uses('MoonsController@destroy') ->middleware('can:moon.manage_moon_reports'); }); diff --git a/src/Http/Routes/Tools/Notes.php b/src/Http/Routes/Tools/Notes.php index bc68aa785..bc17790b8 100644 --- a/src/Http/Routes/Tools/Notes.php +++ b/src/Http/Routes/Tools/Notes.php @@ -21,23 +21,19 @@ */ Route::group(['prefix' => '/notes/'], function () { - Route::get('/{id}', [ - 'as' => 'tools.notes.show', - 'uses' => 'NotesController@show', - ]); + Route::get('/{id}') + ->name('seatcore::tools.notes.show') + ->uses('NotesController@show'); - Route::post('/', [ - 'as' => 'tools.notes.store', - 'uses' => 'NotesController@store', - ]); + Route::post('/') + ->name('seatcore::tools.notes.store') + ->uses('NotesController@store'); - Route::put('/{id}', [ - 'as' => 'tools.notes.update', - 'uses' => 'NotesController@update', - ]); + Route::put('/{id}') + ->name('seatcore::tools.notes.update') + ->uses('NotesController@update'); - Route::delete('/{id}', [ - 'as' => 'tools.notes.destroy', - 'uses' => 'NotesController@destroy', - ]); + Route::delete('/{id}') + ->name('seatcore::tools.notes.destroy') + ->uses('NotesController@destroy'); }); diff --git a/src/Http/Routes/Tools/Standings.php b/src/Http/Routes/Tools/Standings.php index 25aa038ae..fee654e87 100644 --- a/src/Http/Routes/Tools/Standings.php +++ b/src/Http/Routes/Tools/Standings.php @@ -26,35 +26,35 @@ ], function () { Route::get('/') - ->name('tools.standings') + ->name('seatcore::tools.standings') ->uses('StandingsController@getAvailableProfiles'); Route::post('/') - ->name('tools.standings.new') + ->name('seatcore::tools.standings.new') ->uses('StandingsController@postNewStanding'); Route::get('/delete/{profile_id}') - ->name('tools.standings.delete') + ->name('seatcore::tools.standings.delete') ->uses('StandingsController@getDeleteStandingsProfile'); Route::get('/edit/{id}') - ->name('tools.standings.edit') + ->name('seatcore::tools.standings.edit') ->uses('StandingsController@getStandingEdit'); // Ajax Search Route::post('/ajax/element') - ->name('tools.standings.ajax.element') + ->name('seatcore::tools.standings.ajax.element') ->uses('StandingsController@getStandingsAjaxElementName'); Route::post('/edit/add-element') - ->name('tools.standings.edit.addelement') + ->name('seatcore::tools.standings.edit.addelement') ->uses('StandingsController@postAddElementToStanding'); Route::post('/edit/add-element/fromcorpchar') - ->name('tools.standings.edit.addelement.fromcorpchar') + ->name('seatcore::tools.standings.edit.addelement.fromcorpchar') ->uses('StandingsController@postAddStandingsFromCorpOrChar'); Route::get('/edit/remove/{entity_id}/{profile_id}') - ->name('tools.standings.edit.remove') + ->name('seatcore::tools.standings.edit.remove') ->uses('StandingsController@getRemoveElementFromProfile'); }); diff --git a/src/Models/Squads/Squad.php b/src/Models/Squads/Squad.php index 25dd6e29a..eb1895953 100644 --- a/src/Models/Squads/Squad.php +++ b/src/Models/Squads/Squad.php @@ -178,7 +178,7 @@ public function getModeratorsCountAttribute(): int */ public function getLinkAttribute(): string { - return route('squads.show', $this->id); + return route('seatcore::squads.show', $this->id); } /** diff --git a/src/Notifications/EmailVerification.php b/src/Notifications/EmailVerification.php index 2ff0a42e6..4e8b640c3 100644 --- a/src/Notifications/EmailVerification.php +++ b/src/Notifications/EmailVerification.php @@ -69,7 +69,7 @@ public function toMail($notifiable): MailMessage ->subject('SeAT Account Activation') ->line( 'This email address has been used to register a SeAT account ' . - 'at ' . route('home') . '. Before enabling your account, we would ' . + 'at ' . route('seatcore::home') . '. Before enabling your account, we would ' . 'like to make sure that you really own this address.' ) ->line( @@ -77,7 +77,7 @@ public function toMail($notifiable): MailMessage 'this email.' ) ->action( - 'Activate Your Account', route('auth.email.confirm', [ + 'Activate Your Account', route('seatcore::auth.email.confirm', [ 'token' => $notifiable->activation_token, ])); } diff --git a/src/resources/views/alliance/partials/delete.blade.php b/src/resources/views/alliance/partials/delete.blade.php index 76ba8219e..1b94a6680 100644 --- a/src/resources/views/alliance/partials/delete.blade.php +++ b/src/resources/views/alliance/partials/delete.blade.php @@ -1,5 +1,5 @@ @can('global.superuser') -
+ {!! csrf_field() !!} {!! method_field('delete') !!} diff --git a/src/resources/views/character/intel/buttons/mail.blade.php b/src/resources/views/character/intel/buttons/mail.blade.php index 29814f315..5b5a9a4a9 100644 --- a/src/resources/views/character/intel/buttons/mail.blade.php +++ b/src/resources/views/character/intel/buttons/mail.blade.php @@ -1,6 +1,6 @@ diff --git a/src/resources/views/character/intel/buttons/transaction.blade.php b/src/resources/views/character/intel/buttons/transaction.blade.php index aa373db90..58fc784e4 100644 --- a/src/resources/views/character/intel/buttons/transaction.blade.php +++ b/src/resources/views/character/intel/buttons/transaction.blade.php @@ -1,6 +1,6 @@ diff --git a/src/resources/views/character/intel/includes/menu.blade.php b/src/resources/views/character/intel/includes/menu.blade.php index 18c7757bb..d5e171ef7 100644 --- a/src/resources/views/character/intel/includes/menu.blade.php +++ b/src/resources/views/character/intel/includes/menu.blade.php @@ -2,19 +2,19 @@
    @endforeach From fd48210c46a9bf392a7836e6377432ccf35d7aaf Mon Sep 17 00:00:00 2001 From: Crypta Eve Date: Thu, 13 Jun 2024 09:51:27 +0930 Subject: [PATCH 87/95] fix: typo in squad creation (#680) --- src/resources/views/squads/create.blade.php | 2 +- src/resources/views/squads/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/views/squads/create.blade.php b/src/resources/views/squads/create.blade.php index 680e867b7..04ab36dc7 100644 --- a/src/resources/views/squads/create.blade.php +++ b/src/resources/views/squads/create.blade.php @@ -67,7 +67,7 @@ @include('web::components.filters.modals.filters.filters', [ 'filters' => [ - (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_tokens', 'field' => 'scopes', 'label' => 'Scopes'], + (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_token', 'field' => 'scopes', 'label' => 'Scopes'], (object) ['name' => 'character', 'src' => route('seatcore::fastlookup.characters'), 'path' => '', 'field' => 'character_id', 'label' => 'Character'], (object) ['name' => 'title', 'src' => route('seatcore::fastlookup.titles'), 'path' => 'titles', 'field' => 'id', 'label' => 'Title'], (object) ['name' => 'corporation', 'src' => route('seatcore::fastlookup.corporations'), 'path' => 'affiliation', 'field' => 'corporation_id', 'label' => 'Corporation'], diff --git a/src/resources/views/squads/edit.blade.php b/src/resources/views/squads/edit.blade.php index 05c6fbec4..475f74ea4 100644 --- a/src/resources/views/squads/edit.blade.php +++ b/src/resources/views/squads/edit.blade.php @@ -84,7 +84,7 @@ @include('web::components.filters.modals.filters.filters', [ 'filters' => [ - (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_tokens', 'field' => 'scopes', 'label' => 'Scopes'], + (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_token', 'field' => 'scopes', 'label' => 'Scopes'], (object) ['name' => 'character', 'src' => route('seatcore::fastlookup.characters'), 'path' => '', 'field' => 'character_id', 'label' => 'Character'], (object) ['name' => 'title', 'src' => route('seatcore::fastlookup.titles'), 'path' => 'titles', 'field' => 'id', 'label' => 'Title'], (object) ['name' => 'corporation', 'src' => route('seatcore::fastlookup.corporations'), 'path' => 'affiliation', 'field' => 'corporation_id', 'label' => 'Corporation'], From b13d2833c60ea43e8b9ba83a3c342d3a8a3d9645 Mon Sep 17 00:00:00 2001 From: Marc <9104198+zmsMarc@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:15:40 +0200 Subject: [PATCH 88/95] fix zkill link (#681) --- src/resources/views/character/includes/summary.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/character/includes/summary.blade.php b/src/resources/views/character/includes/summary.blade.php index b6d097588..5be6246e2 100644 --- a/src/resources/views/character/includes/summary.blade.php +++ b/src/resources/views/character/includes/summary.blade.php @@ -143,7 +143,7 @@ target="_blank"> - From 57f17c230796cef683101ff11edcc789413d41b3 Mon Sep 17 00:00:00 2001 From: recursivetree <60423027+recursivetree@users.noreply.github.com> Date: Thu, 5 Sep 2024 02:10:29 +0200 Subject: [PATCH 89/95] Granular esi scheduling for characters (#684) * squads: trigger filter check using events * squads: move to one common definition for rules This also allows plugins to register their own rules! * add scheduling rule migration * add scheduling rule migration * add scheduling rule user interface prototype This commit also contains a lot of unrelated changes in the view since I had to refactor some things for the layout, which introduces identation changes for almost everything * Finish character scheduling rule interface * character filters: trigger data update event with character instead of user * schedule: apply character scheduling rules to tokens * styleci * make some tests pass * fix setting a scheduling rule for new tokens --- src/Config/web.characterfilter.php | 33 ++ src/Events/CharacterFilterDataUpdate.php | 45 +++ src/Http/Composers/CharacterFilter.php | 45 +++ .../Configuration/ScheduleController.php | 59 +++- src/Http/Routes/Configuration/Schedule.php | 8 + .../CharacterFilterDataUpdatedSquads.php} | 35 +- .../CharacterFilterDataUpdatedTokens.php | 34 ++ src/Models/CharacterSchedulingRule.php | 93 +++++ .../AbstractCharacterFilterObserver.php | 62 ++++ .../CharacterAffiliationObserver.php | 22 +- src/Observers/CharacterAssetObserver.php | 23 +- src/Observers/CharacterRoleObserver.php | 23 +- src/Observers/CharacterSkillObserver.php | 20 +- src/Observers/CharacterTitleObserver.php | 23 +- src/Observers/RefreshTokenObserver.php | 21 +- src/WebServiceProvider.php | 23 +- ...reate_character_scheduling_rules_table.php | 52 +++ src/resources/lang/en/seat.php | 12 + .../filters/buttons/filters.blade.php | 4 +- .../configuration/schedule/view.blade.php | 325 ++++++++++++------ src/resources/views/squads/create.blade.php | 12 +- src/resources/views/squads/edit.blade.php | 12 +- tests/Acl/AlliancePolicyTest.php | 6 + tests/Acl/CharacterPolicyTest.php | 6 + tests/Acl/CorporationPolicyTest.php | 3 + 25 files changed, 781 insertions(+), 220 deletions(-) create mode 100644 src/Config/web.characterfilter.php create mode 100644 src/Events/CharacterFilterDataUpdate.php create mode 100644 src/Http/Composers/CharacterFilter.php rename src/{Observers/AbstractSquadObserver.php => Listeners/CharacterFilterDataUpdatedSquads.php} (62%) create mode 100644 src/Listeners/CharacterFilterDataUpdatedTokens.php create mode 100644 src/Models/CharacterSchedulingRule.php create mode 100644 src/Observers/AbstractCharacterFilterObserver.php create mode 100644 src/database/migrations/2024_08_15_create_character_scheduling_rules_table.php diff --git a/src/Config/web.characterfilter.php b/src/Config/web.characterfilter.php new file mode 100644 index 000000000..f1e3dbf9b --- /dev/null +++ b/src/Config/web.characterfilter.php @@ -0,0 +1,33 @@ + 'scopes', 'src' => 'seatcore::fastlookup.scopes', 'path' => 'refresh_token', 'field' => 'scopes', 'label' => 'Scopes'], + ['name' => 'character', 'src' => 'seatcore::fastlookup.characters', 'path' => '', 'field' => 'character_id', 'label' => 'Character'], + ['name' => 'title', 'src' => 'seatcore::fastlookup.titles', 'path' => 'titles', 'field' => 'id', 'label' => 'Title'], + ['name' => 'corporation', 'src' => 'seatcore::fastlookup.corporations', 'path' => 'affiliation', 'field' => 'corporation_id', 'label' => 'Corporation'], + ['name' => 'alliance', 'src' => 'seatcore::fastlookup.alliances', 'path' => 'affiliation', 'field' => 'alliance_id', 'label' => 'Alliance'], + ['name' => 'skill', 'src' => 'seatcore::fastlookup.skills', 'path' => 'skills', 'field' => 'skill_id', 'label' => 'Skill'], + ['name' => 'skill_level', 'src' => [['id' => 1, 'text' => 'Level 1'], ['id' => 2, 'text' => 'Level 2'], ['id' => 3, 'text' => 'Level 3'], ['id' => 4, 'text' => 'Level 4'], ['id' => 5, 'text' => 'Level 5']], 'path' => 'skills', 'field' => 'trained_skill_level', 'label' => 'Skill Level'], + ['name' => 'type', 'src' => 'seatcore::fastlookup.items', 'path' => 'assets', 'field' => 'type_id', 'label' => 'Item'], + ['name' => 'role', 'src' => 'seatcore::fastlookup.roles', 'path' => 'corporation_roles', 'field' => 'role', 'label' => 'Role'], +]; diff --git a/src/Events/CharacterFilterDataUpdate.php b/src/Events/CharacterFilterDataUpdate.php new file mode 100644 index 000000000..415b4ec23 --- /dev/null +++ b/src/Events/CharacterFilterDataUpdate.php @@ -0,0 +1,45 @@ +character = $character; + } +} diff --git a/src/Http/Composers/CharacterFilter.php b/src/Http/Composers/CharacterFilter.php new file mode 100644 index 000000000..01f16642f --- /dev/null +++ b/src/Http/Composers/CharacterFilter.php @@ -0,0 +1,45 @@ +with('characterFilterRules', $newrules); + } +} diff --git a/src/Http/Controllers/Configuration/ScheduleController.php b/src/Http/Controllers/Configuration/ScheduleController.php index 3e4333d5d..64a9eb6b1 100644 --- a/src/Http/Controllers/Configuration/ScheduleController.php +++ b/src/Http/Controllers/Configuration/ScheduleController.php @@ -23,9 +23,12 @@ namespace Seat\Web\Http\Controllers\Configuration; use Artisan; +use Illuminate\Http\Request; +use Seat\Eveapi\Models\RefreshToken; use Seat\Services\Models\Schedule; use Seat\Web\Http\Controllers\Controller; use Seat\Web\Http\Validation\NewSchedule; +use Seat\Web\Models\CharacterSchedulingRule; /** * Class ScheduleController. @@ -52,11 +55,12 @@ public function listSchedule() 'every five minutes' => '*/5 * * * *', 'every ten minutes' => '*/10 * * * *', 'every thirty minutes' => '*/30 * * * *', - ]; + $scheduling_rules = CharacterSchedulingRule::all(); + return view('web::configuration.schedule.view', - compact('schedule', 'commands', 'expressions')); + compact('schedule', 'commands', 'expressions', 'scheduling_rules')); } /** @@ -85,4 +89,55 @@ public function deleteSchedule(int $schedule_id) return redirect()->back() ->with('success', 'Schedule entry deleted!'); } + + public function createSchedulingRule(Request $request) + { + $request->validate([ + 'filters' => 'required|json', + 'name' => 'required|string', + 'time' => 'required|numeric', + 'timeunit' => 'required|in:hour,day,week', + ]); + + // $time_modifier: conversion factor from timeunit to seconds + if($request->timeunit === 'hour') { + $time_modifier = 60 * 60; + } elseif ($request->timeunit === 'day') { + $time_modifier = 60 * 60 * 24; + } elseif ($request->timeunit === 'week') { + $time_modifier = 60 * 60 * 24 * 7; + } + $time = $request->time * $time_modifier; + + $rule = CharacterSchedulingRule::where('name', $request->name)->first(); + if($rule === null) { + $rule = new CharacterSchedulingRule(); + $rule->name = $request->name; + } + $rule->interval = $time; + $rule->filter = $request->filters; + $rule->save(); + + RefreshToken::all()->each(function ($token) { + CharacterSchedulingRule::updateRefreshTokenSchedule($token); + }); + + return redirect()->back() + ->with('success', 'Character Scheduling Rule added!'); + } + + public function deleteSchedulingRule(Request $request) + { + $request->validate([ + 'rule_id' => 'required|numeric', + ]); + + CharacterSchedulingRule::destroy($request->rule_id); + + RefreshToken::all()->each(function ($token) { + CharacterSchedulingRule::updateRefreshTokenSchedule($token); + }); + + return redirect()->back()->with('success', 'Successfully removed character scheduling rule!'); + } } diff --git a/src/Http/Routes/Configuration/Schedule.php b/src/Http/Routes/Configuration/Schedule.php index 11bf0ee67..9f4a2e1d6 100644 --- a/src/Http/Routes/Configuration/Schedule.php +++ b/src/Http/Routes/Configuration/Schedule.php @@ -31,3 +31,11 @@ Route::get('/delete/{schedule_id}') ->name('seatcore::configuration.schedule.delete') ->uses('ScheduleController@deleteSchedule'); + +Route::post('/rules/create') + ->name('seatcore::configuration.schedule.rule.create') + ->uses('ScheduleController@createSchedulingRule'); + +Route::post('/rules/delete') + ->name('seatcore::configuration.schedule.rule.delete') + ->uses('ScheduleController@deleteSchedulingRule'); diff --git a/src/Observers/AbstractSquadObserver.php b/src/Listeners/CharacterFilterDataUpdatedSquads.php similarity index 62% rename from src/Observers/AbstractSquadObserver.php rename to src/Listeners/CharacterFilterDataUpdatedSquads.php index b0189f9aa..82d810e62 100644 --- a/src/Observers/AbstractSquadObserver.php +++ b/src/Listeners/CharacterFilterDataUpdatedSquads.php @@ -20,41 +20,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -namespace Seat\Web\Observers; +namespace Seat\Web\Listeners; -use Illuminate\Database\Eloquent\Model; -use Seat\Web\Exceptions\InvalidFilterException; +use Seat\Web\Events\CharacterFilterDataUpdate; use Seat\Web\Models\Squads\Squad; -use Seat\Web\Models\User; -/** - * Class AbstractSquadObserver. - * - * @package Seat\Web\Observers - */ -abstract class AbstractSquadObserver +class CharacterFilterDataUpdatedSquads { - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return \Seat\Web\Models\User|null The user owning this model - */ - abstract protected function findRelatedUser(Model $fired_model): ?User; - - /** - * Update squads to which the user owning model firing the event is member. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * - * @throws InvalidFilterException - */ - protected function updateUserSquads(Model $fired_model) + public static function handle(CharacterFilterDataUpdate $event) { - $user = $this->findRelatedUser($fired_model); - - if (! $user) - return; + $user = $event->character->user; $member_squads = $user->squads; diff --git a/src/Listeners/CharacterFilterDataUpdatedTokens.php b/src/Listeners/CharacterFilterDataUpdatedTokens.php new file mode 100644 index 000000000..0dfee262f --- /dev/null +++ b/src/Listeners/CharacterFilterDataUpdatedTokens.php @@ -0,0 +1,34 @@ +character->refresh_token); + } +} diff --git a/src/Models/CharacterSchedulingRule.php b/src/Models/CharacterSchedulingRule.php new file mode 100644 index 000000000..471a5f6f7 --- /dev/null +++ b/src/Models/CharacterSchedulingRule.php @@ -0,0 +1,93 @@ +filter); + } + + /** + * Recomputes the update interval of a character and saves it in the refresh_token_schedules table. + * + * @param RefreshToken $token + * @return void + */ + public static function updateRefreshTokenSchedule(RefreshToken $token): void + { + $schedule = $token->token_schedule; + + if($schedule === null) { + $schedule = new RefreshTokenSchedule(); + $schedule->character_id = $token->character_id; + } + + $schedule->update_interval = self::getCharacterSchedulingInterval($token->character); + $schedule->save(); + } + + /** + * Computes the scheduling interval from the character scheduling rules for a character. + * + * @param CharacterInfo $character + * @return int + */ + private static function getCharacterSchedulingInterval(CharacterInfo $character): int + { + $scheduling_rules = CharacterSchedulingRule::orderBy('interval', 'asc')->get(); + + foreach ($scheduling_rules as $rule) { + if($rule->isEligible($character)) { + return $rule->interval; + } + } + + return 60 * 60; // 1 hour + } +} diff --git a/src/Observers/AbstractCharacterFilterObserver.php b/src/Observers/AbstractCharacterFilterObserver.php new file mode 100644 index 000000000..c4b16cfad --- /dev/null +++ b/src/Observers/AbstractCharacterFilterObserver.php @@ -0,0 +1,62 @@ +findRelatedCharacter($fired_model); + + if (! $character) + return; + + event(new CharacterFilterDataUpdate($character)); + } +} diff --git a/src/Observers/CharacterAffiliationObserver.php b/src/Observers/CharacterAffiliationObserver.php index 37a1fd4da..116179fa5 100644 --- a/src/Observers/CharacterAffiliationObserver.php +++ b/src/Observers/CharacterAffiliationObserver.php @@ -24,6 +24,7 @@ use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Models\Character\CharacterAffiliation; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Web\Models\User; /** @@ -31,14 +32,14 @@ * * @package Seat\Web\Observers */ -class CharacterAffiliationObserver extends AbstractSquadObserver +class CharacterAffiliationObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\Character\CharacterAffiliation $affiliation */ public function created(CharacterAffiliation $affiliation) { - $this->updateUserSquads($affiliation); + $this->fireCharacterFilterEvent($affiliation); } /** @@ -46,19 +47,18 @@ public function created(CharacterAffiliation $affiliation) */ public function updated(CharacterAffiliation $affiliation) { - $this->updateUserSquads($affiliation); + $this->fireCharacterFilterEvent($affiliation); } /** - * {@inheritdoc} + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update */ - protected function findRelatedUser(Model $fired_model): ?User + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo { - // retrieve user related to the character affiliation - return User::with('squads') - ->standard() - ->whereHas('characters', function ($query) use ($fired_model) { - $query->where('character_infos.character_id', $fired_model->character_id); - })->first(); + // CharacterAffiliation links to UniverseName instead of CharacterInfo + return CharacterInfo::find($fired_model->character_id); } } diff --git a/src/Observers/CharacterAssetObserver.php b/src/Observers/CharacterAssetObserver.php index 2f70f5d70..67f2b9f15 100644 --- a/src/Observers/CharacterAssetObserver.php +++ b/src/Observers/CharacterAssetObserver.php @@ -24,6 +24,7 @@ use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Models\Assets\CharacterAsset; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Web\Models\User; /** @@ -31,14 +32,14 @@ * * @package Seat\Web\Observers */ -class CharacterAssetObserver extends AbstractSquadObserver +class CharacterAssetObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset */ public function created(CharacterAsset $asset) { - $this->updateUserSquads($asset); + $this->fireCharacterFilterEvent($asset); } /** @@ -46,7 +47,7 @@ public function created(CharacterAsset $asset) */ public function updated(CharacterAsset $asset) { - $this->updateUserSquads($asset); + $this->fireCharacterFilterEvent($asset); } /** @@ -54,19 +55,17 @@ public function updated(CharacterAsset $asset) */ public function deleted(CharacterAsset $asset) { - $this->updateUserSquads($asset); + $this->fireCharacterFilterEvent($asset); } /** - * {@inheritdoc} + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update */ - protected function findRelatedUser(Model $fired_model): ?User + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo { - // retrieve user related to the character affiliation - return User::with('squads') - ->standard() - ->whereHas('characters', function ($query) use ($fired_model) { - $query->where('character_infos.character_id', $fired_model->character_id); - })->first(); + return $fired_model->character; } } diff --git a/src/Observers/CharacterRoleObserver.php b/src/Observers/CharacterRoleObserver.php index 82cc1394f..688f6f9b1 100644 --- a/src/Observers/CharacterRoleObserver.php +++ b/src/Observers/CharacterRoleObserver.php @@ -25,6 +25,7 @@ use Exception; use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Bus\Corporation; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Character\CharacterRole; use Seat\Eveapi\Models\RefreshToken; use Seat\Web\Models\User; @@ -34,14 +35,14 @@ * * @package Seat\Web\Observers */ -class CharacterRoleObserver extends AbstractSquadObserver +class CharacterRoleObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\Character\CharacterRole $role */ public function created(CharacterRole $role) { - $this->updateUserSquads($role); + $this->fireCharacterFilterEvent($role); // in case the created role is not a Director role, ignore if ($role->role != 'Director') @@ -67,7 +68,7 @@ public function created(CharacterRole $role) */ public function updated(CharacterRole $role) { - $this->updateUserSquads($role); + $this->fireCharacterFilterEvent($role); } /** @@ -75,19 +76,17 @@ public function updated(CharacterRole $role) */ public function deleted(CharacterRole $role) { - $this->updateUserSquads($role); + $this->fireCharacterFilterEvent($role); } /** - * {@inheritdoc} + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update */ - protected function findRelatedUser(Model $fired_model): ?User + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo { - // retrieve user related to the character affiliation - return User::with('squads') - ->standard() - ->whereHas('characters', function ($query) use ($fired_model) { - $query->where('character_infos.character_id', $fired_model->character_id); - })->first(); + return $fired_model->character; } } diff --git a/src/Observers/CharacterSkillObserver.php b/src/Observers/CharacterSkillObserver.php index eaa579773..f3c7e1820 100644 --- a/src/Observers/CharacterSkillObserver.php +++ b/src/Observers/CharacterSkillObserver.php @@ -23,6 +23,7 @@ namespace Seat\Web\Observers; use Illuminate\Database\Eloquent\Model; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Character\CharacterSkill; use Seat\Web\Models\User; @@ -31,14 +32,14 @@ * * @package Seat\Web\Observers */ -class CharacterSkillObserver extends AbstractSquadObserver +class CharacterSkillObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\Character\CharacterSkill $skill */ public function created(CharacterSkill $skill) { - $this->updateUserSquads($skill); + $this->fireCharacterFilterEvent($skill); } /** @@ -46,7 +47,7 @@ public function created(CharacterSkill $skill) */ public function updated(CharacterSkill $skill) { - $this->updateUserSquads($skill); + $this->fireCharacterFilterEvent($skill); } /** @@ -54,7 +55,7 @@ public function updated(CharacterSkill $skill) */ public function deleted(CharacterSkill $skill) { - $this->updateUserSquads($skill); + $this->fireCharacterFilterEvent($skill); } /** @@ -69,4 +70,15 @@ protected function findRelatedUser(Model $fired_model): ?User $query->where('character_infos.character_id', $fired_model->character_id); })->first(); } + + /** + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update + */ + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo + { + return $fired_model->character; + } } diff --git a/src/Observers/CharacterTitleObserver.php b/src/Observers/CharacterTitleObserver.php index c45385d9b..d01b033fd 100644 --- a/src/Observers/CharacterTitleObserver.php +++ b/src/Observers/CharacterTitleObserver.php @@ -23,6 +23,7 @@ namespace Seat\Web\Observers; use Illuminate\Database\Eloquent\Model; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Pivot\Character\CharacterTitle; use Seat\Web\Models\User; @@ -31,14 +32,14 @@ * * @package Seat\Web\Observers */ -class CharacterTitleObserver extends AbstractSquadObserver +class CharacterTitleObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset */ public function created(CharacterTitle $title) { - $this->updateUserSquads($title); + $this->fireCharacterFilterEvent($title); } /** @@ -46,7 +47,7 @@ public function created(CharacterTitle $title) */ public function updated(CharacterTitle $title) { - $this->updateUserSquads($title); + $this->fireCharacterFilterEvent($title); } /** @@ -54,19 +55,17 @@ public function updated(CharacterTitle $title) */ public function deleted(CharacterTitle $title) { - $this->updateUserSquads($title); + $this->fireCharacterFilterEvent($title); } /** - * {@inheritdoc} + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update */ - protected function findRelatedUser(Model $fired_model): ?User + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo { - // retrieve user related to the character affiliation - return User::with('squads') - ->standard() - ->whereHas('characters', function ($query) use ($fired_model) { - $query->where('character_infos.character_id', $fired_model->character_id); - })->first(); + return CharacterInfo::find($fired_model->character_id); } } diff --git a/src/Observers/RefreshTokenObserver.php b/src/Observers/RefreshTokenObserver.php index 2466db757..901e91bef 100644 --- a/src/Observers/RefreshTokenObserver.php +++ b/src/Observers/RefreshTokenObserver.php @@ -25,6 +25,7 @@ use Exception; use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Bus\Character; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\RefreshToken; use Seat\Web\Models\User; @@ -33,7 +34,7 @@ * * @package Seat\Web\Observers */ -class RefreshTokenObserver extends AbstractSquadObserver +class RefreshTokenObserver extends AbstractCharacterFilterObserver { /** * @param \Seat\Eveapi\Models\RefreshToken $token @@ -45,7 +46,7 @@ public function created(RefreshToken $token) $job->fire(); // enqueue squads update - $this->updateUserSquads($token); + $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } @@ -57,7 +58,7 @@ public function created(RefreshToken $token) public function updated(RefreshToken $token) { try { - $this->updateUserSquads($token); + $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } @@ -77,7 +78,7 @@ public function softDeleted(RefreshToken $token) public function deleted(RefreshToken $token) { try { - $this->updateUserSquads($token); + $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } @@ -93,18 +94,20 @@ public function restored(RefreshToken $token) $job->fire(); // enqueue squads update - $this->updateUserSquads($token); + $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } } /** - * {@inheritdoc} + * Return the User owning the model which fired the catch event. + * + * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event + * @return ?CharacterInfo The character that is affected by this update */ - protected function findRelatedUser(Model $fired_model): ?User + protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo { - return User::with('squads') - ->find($fired_model->user_id); + return $fired_model->character; } } diff --git a/src/WebServiceProvider.php b/src/WebServiceProvider.php index 8c2a918ed..e503a832e 100644 --- a/src/WebServiceProvider.php +++ b/src/WebServiceProvider.php @@ -28,6 +28,7 @@ use Illuminate\Foundation\AliasLoader; use Illuminate\Pagination\Paginator; use Illuminate\Routing\Router; +use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; use Laravel\Horizon\Horizon; @@ -43,11 +44,13 @@ use Seat\Web\Commands\Seat\Admin\Login as AdminLogin; use Seat\Web\Database\Seeders\ScheduleSeeder; use Seat\Web\Events\Attempt; +use Seat\Web\Events\CharacterFilterDataUpdate; use Seat\Web\Events\Login; use Seat\Web\Events\Logout; use Seat\Web\Events\SecLog; use Seat\Web\Http\Composers\AllianceLayout; use Seat\Web\Http\Composers\AllianceMenu; +use Seat\Web\Http\Composers\CharacterFilter; use Seat\Web\Http\Composers\CharacterLayout; use Seat\Web\Http\Composers\CharacterMenu; use Seat\Web\Http\Composers\CorporationLayout; @@ -59,6 +62,8 @@ use Seat\Web\Http\Middleware\Locale; use Seat\Web\Http\Middleware\RegistrationAllowed; use Seat\Web\Http\Middleware\Requirements; +use Seat\Web\Listeners\CharacterFilterDataUpdatedSquads; +use Seat\Web\Listeners\CharacterFilterDataUpdatedTokens; use Seat\Web\Models\Squads\SquadMember; use Seat\Web\Models\Squads\SquadRole; use Seat\Web\Observers\CharacterAffiliationObserver; @@ -243,6 +248,12 @@ private function add_view_composers() 'web::alliance.layouts.view', ], AllianceLayout::class); + // Squad filter rules + $this->app['view']->composer([ + 'web::squads.edit', + 'web::squads.create', + 'web::configuration.schedule.view', + ], CharacterFilter::class); } /** @@ -285,12 +296,14 @@ private function add_events() { // Internal Authentication Events - $this->app->events->listen(LoginEvent::class, Login::class); - $this->app->events->listen(LogoutEvent::class, Logout::class); - $this->app->events->listen(Attempting::class, Attempt::class); + Event::listen(LoginEvent::class, Login::class); + Event::listen(LogoutEvent::class, Logout::class); + Event::listen(Attempting::class, Attempt::class); // Custom Events - $this->app->events->listen('security.log', SecLog::class); + Event::listen('security.log', SecLog::class); + Event::listen(CharacterFilterDataUpdate::class, CharacterFilterDataUpdatedSquads::class); + Event::listen(CharacterFilterDataUpdate::class, CharacterFilterDataUpdatedTokens::class); // Characters / Corporations first auth - Jobs Events CharacterRole::observe(CharacterRoleObserver::class); @@ -346,6 +359,8 @@ public function register() __DIR__ . '/Config/web.locale.php', 'web.locale'); $this->mergeConfigFrom( __DIR__ . '/Config/web.skins.php', 'web.skins'); + $this->mergeConfigFrom( + __DIR__ . '/Config/web.characterfilter.php', 'web.characterfilter'); // Menu Configurations $this->mergeConfigFrom( diff --git a/src/database/migrations/2024_08_15_create_character_scheduling_rules_table.php b/src/database/migrations/2024_08_15_create_character_scheduling_rules_table.php new file mode 100644 index 000000000..37d3b6403 --- /dev/null +++ b/src/database/migrations/2024_08_15_create_character_scheduling_rules_table.php @@ -0,0 +1,52 @@ +bigIncrements('id'); + $table->string('name'); + $table->integer('interval')->unsigned(); + $table->json('filter'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('character_scheduling_rules'); + } +}; diff --git a/src/resources/lang/en/seat.php b/src/resources/lang/en/seat.php index a2ebccd92..3987b986e 100644 --- a/src/resources/lang/en/seat.php +++ b/src/resources/lang/en/seat.php @@ -99,6 +99,11 @@ 'token_status_valid' => 'This character has a valid registered token.', 'token_status_invalid' => 'You don\'t own any valid token for this character.', 'set_default' => 'Set Default', + 'rule' => 'Rule|Rules', + 'hour' => 'hour', + 'week' => 'week', + 'day' => 'day', + 'save' => 'Save', // Requirements 'requirements' => 'Requirements', @@ -375,6 +380,13 @@ 'scheduled_commands' => 'Scheduled Commands', 'choose_prepop' => 'Choose a pre-populated cron expression, or write your own.', 'add_scheduled' => 'Add Scheduled Command', + 'character_scheduling_rule' => 'character scheduling rule', + 'character_scheduling_rules' => 'Character Scheduling Rules', + 'new_character_scheduling_rule' => 'New Character Scheduling Rule', + 'update_interval' => 'Update Interval', + 'name_input_placeholder' => 'Enter a name...', + 'character_scheduling_rules_empty' => 'There are no character scheduling rules defined, using a default of one hour for everyone.', + 'character_scheduling_rules_default' => 'When no rules apply to a character, an update interval of one hour is used.', // Security 'category' => 'Category', diff --git a/src/resources/views/components/filters/buttons/filters.blade.php b/src/resources/views/components/filters/buttons/filters.blade.php index f0722d426..84ab36256 100644 --- a/src/resources/views/components/filters/buttons/filters.blade.php +++ b/src/resources/views/components/filters/buttons/filters.blade.php @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/src/resources/views/configuration/schedule/view.blade.php b/src/resources/views/configuration/schedule/view.blade.php index 69f90a3f1..01724c804 100644 --- a/src/resources/views/configuration/schedule/view.blade.php +++ b/src/resources/views/configuration/schedule/view.blade.php @@ -1,141 +1,266 @@ -@extends('web::layouts.grids.3-9') +@extends('web::layouts.app') @section('title', trans('web::seat.schedule')) @section('page_header', trans('web::seat.schedule')) -@section('left') +@section('content') -
    -
    -

    {{ trans('web::seat.new_schedule') }}

    -
    -
    +
    +
    - - {{ csrf_field() }} +
    +
    +

    {{ trans('web::seat.new_schedule') }}

    +
    +
    -
    + + {{ csrf_field() }} -
    - - - + @foreach($commands as $name => $data) - @endforeach + - -
    + @endforeach -
    - - +
    - @foreach($expressions as $name => $expression) +
    + + -

    -
    - {{ trans('web::seat.choose_prepop') }} -

    -
    + @endforeach + + +

    +
    + {{ trans('web::seat.choose_prepop') }} +

    +
    + +
    + + +
    + +
    +
    - +
    +
    + + {{-- Job Schedule Table --}} -
    - +
    +
    +
    +

    {{ trans('web::seat.current_schedule') }}

    - +
    + + + + + + + + + + + + + + @foreach($schedule as $job) + + + + + + + + + + @endforeach + + +
    {{ trans('web::seat.command') }}{{ trans('web::seat.cron') }}{{ trans('web::seat.allow_overlap') }}{{ trans('web::seat.allow_maintenance') }}
    {{ $job->command }}{{ $job->expression }}{{ $job->allow_overlap }}{{ $job->allow_maintenance }} + + + {{ trans('web::seat.delete') }} + +
    +
    +
    + {{ count($schedule) }} {{ trans('web::seat.scheduled_commands') }} +
    +
    -@stop -@section('right') + {{-- Character scheduling UI --}} +
    -
    -
    -

    {{ trans('web::seat.current_schedule') }}

    +
    +
    +
    +

    {{ trans('web::seat.new_character_scheduling_rule') }}

    +
    +
    +
    + @csrf + +
    + + +
    + +
    + +
    + + +
    +
    + +
    + @include('web::components.filters.buttons.filters', ['rules' => [], 'buttonText'=>'Configure Character Filter']) +
    + + + + +
    +
    +
    -
    - - - - - - - - - - - - - - @foreach($schedule as $job) +
    +
    +
    +

    {{ trans('web::seat.character_scheduling_rules') }}

    +
    +
    +
    {{ trans('web::seat.command') }}{{ trans('web::seat.cron') }}{{ trans('web::seat.allow_overlap') }}{{ trans('web::seat.allow_maintenance') }}
    + - - - - - + + + + + + @foreach($scheduling_rules as $scheduling_rule) + + + + + + @endforeach + + @if($scheduling_rules->isEmpty()) + + + + @endif + +
    {{ $job->command }}{{ $job->expression }}{{ $job->allow_overlap }}{{ $job->allow_maintenance }} - - - {{ trans('web::seat.delete') }} - - {{trans_choice('web::seat.rule', 1)}}{{trans('web::seat.update_interval')}}{{trans('web::seat.action')}}
    {{ $scheduling_rule->name }}{{ \Carbon\CarbonInterval::seconds($scheduling_rule->interval)->cascade() }} + + +
    + @csrf + + +
    +
    + {{trans('web::seat.character_scheduling_rules_empty')}} +
    + @if(!$scheduling_rules->isEmpty()) +

    + {{trans('web::seat.character_scheduling_rules_default')}} +

    + @endif +
    +
    +
    +
    - @endforeach - - -
    -
    - {{ count($schedule) }} {{ trans('web::seat.scheduled_commands') }} -
    -
    + @include('web::components.filters.modals.filters.filters', [ + 'filters' => $characterFilterRules, + ]) @stop @push('javascript') - - - + + + + + @endpush diff --git a/src/resources/views/squads/create.blade.php b/src/resources/views/squads/create.blade.php index 04ab36dc7..85d5491fc 100644 --- a/src/resources/views/squads/create.blade.php +++ b/src/resources/views/squads/create.blade.php @@ -66,17 +66,7 @@ @include('web::components.filters.modals.filters.filters', [ - 'filters' => [ - (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_token', 'field' => 'scopes', 'label' => 'Scopes'], - (object) ['name' => 'character', 'src' => route('seatcore::fastlookup.characters'), 'path' => '', 'field' => 'character_id', 'label' => 'Character'], - (object) ['name' => 'title', 'src' => route('seatcore::fastlookup.titles'), 'path' => 'titles', 'field' => 'id', 'label' => 'Title'], - (object) ['name' => 'corporation', 'src' => route('seatcore::fastlookup.corporations'), 'path' => 'affiliation', 'field' => 'corporation_id', 'label' => 'Corporation'], - (object) ['name' => 'alliance', 'src' => route('seatcore::fastlookup.alliances'), 'path' => 'affiliation', 'field' => 'alliance_id', 'label' => 'Alliance'], - (object) ['name' => 'skill', 'src' => route('seatcore::fastlookup.skills'), 'path' => 'skills', 'field' => 'skill_id', 'label' => 'Skill'], - (object) ['name' => 'skill_level', 'src' => [['id' => 1, 'text' => 'Level 1'], ['id' => 2, 'text' => 'Level 2'], ['id' => 3, 'text' => 'Level 3'], ['id' => 4, 'text' => 'Level 4'], ['id' => 5, 'text' => 'Level 5']], 'path' => 'skills', 'field' => 'trained_skill_level', 'label' => 'Skill Level'], - (object) ['name' => 'type', 'src' => route('seatcore::fastlookup.items'), 'path' => 'assets', 'field' => 'type_id', 'label' => 'Item'], - (object) ['name' => 'role', 'src' => route('seatcore::fastlookup.roles'), 'path' => 'corporation_roles', 'field' => 'role', 'label' => 'Role'], - ], + 'filters' => $characterFilterRules, ]) @endsection diff --git a/src/resources/views/squads/edit.blade.php b/src/resources/views/squads/edit.blade.php index 475f74ea4..6553313d2 100644 --- a/src/resources/views/squads/edit.blade.php +++ b/src/resources/views/squads/edit.blade.php @@ -83,17 +83,7 @@ @include('web::components.filters.modals.filters.filters', [ - 'filters' => [ - (object) ['name' => 'scopes', 'src' => route('seatcore::fastlookup.scopes'), 'path' => 'refresh_token', 'field' => 'scopes', 'label' => 'Scopes'], - (object) ['name' => 'character', 'src' => route('seatcore::fastlookup.characters'), 'path' => '', 'field' => 'character_id', 'label' => 'Character'], - (object) ['name' => 'title', 'src' => route('seatcore::fastlookup.titles'), 'path' => 'titles', 'field' => 'id', 'label' => 'Title'], - (object) ['name' => 'corporation', 'src' => route('seatcore::fastlookup.corporations'), 'path' => 'affiliation', 'field' => 'corporation_id', 'label' => 'Corporation'], - (object) ['name' => 'alliance', 'src' => route('seatcore::fastlookup.alliances'), 'path' => 'affiliation', 'field' => 'alliance_id', 'label' => 'Alliance'], - (object) ['name' => 'skill', 'src' => route('seatcore::fastlookup.skills'), 'path' => 'skills', 'field' => 'skill_id', 'label' => 'Skill'], - (object) ['name' => 'skill_level', 'src' => [['id' => 1, 'text' => 'Level 1'], ['id' => 2, 'text' => 'Level 2'], ['id' => 3, 'text' => 'Level 3'], ['id' => 4, 'text' => 'Level 4'], ['id' => 5, 'text' => 'Level 5']], 'path' => 'skills', 'field' => 'trained_skill_level', 'label' => 'Skill Level'], - (object) ['name' => 'type', 'src' => route('seatcore::fastlookup.items'), 'path' => 'assets', 'field' => 'type_id', 'label' => 'Item'], - (object) ['name' => 'role', 'src' => route('seatcore::fastlookup.roles'), 'path' => 'corporation_roles', 'field' => 'role', 'label' => 'Role'], - ], + 'filters' => $characterFilterRules, ]) @endsection diff --git a/tests/Acl/AlliancePolicyTest.php b/tests/Acl/AlliancePolicyTest.php index c4fbfabf9..8f0162461 100644 --- a/tests/Acl/AlliancePolicyTest.php +++ b/tests/Acl/AlliancePolicyTest.php @@ -149,6 +149,9 @@ public function testAlliancePermissionsAsWildcard() */ public function testAlliancePermissionsAsDelegatedCharacter() { + // make sure this doesn't generate observer events that trigger the squads logic + CharacterAffiliation::unsetEventDispatcher(); + $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/alliance.php'); $user = User::factory()->create(); @@ -199,6 +202,9 @@ public function testAlliancePermissionsAsDelegatedCharacter() */ public function testAlliancePermissionsAsDelegatedCorporation() { + // make sure this doesn't generate observer events that trigger the squads logic + CharacterAffiliation::unsetEventDispatcher(); + $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/alliance.php'); $user = User::factory()->create(); diff --git a/tests/Acl/CharacterPolicyTest.php b/tests/Acl/CharacterPolicyTest.php index b909b1282..906286dec 100644 --- a/tests/Acl/CharacterPolicyTest.php +++ b/tests/Acl/CharacterPolicyTest.php @@ -258,6 +258,9 @@ public function testCharacterPermissionsAsDelegatedCharacter() */ public function testCharacterPermissionsAsDelegatedCorporation() { + // make sure this doesn't generate observer events that trigger the squads logic + CharacterAffiliation::unsetEventDispatcher(); + $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/character.php'); $user = User::factory()->create(); @@ -313,6 +316,9 @@ public function testCharacterPermissionsAsDelegatedCorporation() */ public function testCharacterPermissionsAsDelegatedAlliance() { + // make sure this doesn't generate observer events that trigger the squads logic + CharacterAffiliation::unsetEventDispatcher(); + $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/character.php'); $user = User::factory()->create(); diff --git a/tests/Acl/CorporationPolicyTest.php b/tests/Acl/CorporationPolicyTest.php index 86465b068..81b68b2c2 100644 --- a/tests/Acl/CorporationPolicyTest.php +++ b/tests/Acl/CorporationPolicyTest.php @@ -186,6 +186,9 @@ public function testCorporationPermissionsAsWildcard() */ public function testCorporationPermissionsAsDelegatedCharacter() { + // make sure this doesn't generate observer events that trigger the squads logic + CharacterAffiliation::unsetEventDispatcher(); + $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/corporation.php'); $user = User::factory()->create(); From 8a9790a01e9d5865604cedf0145e2bf18a4054cf Mon Sep 17 00:00:00 2001 From: recursivetree <60423027+recursivetree@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:52:41 +0200 Subject: [PATCH 90/95] More efficient squad updates #2 (#686) * remove character filter observers * forward character batch processed event * add character filter update job * add filter update command to schedule seeder * styleci * chunk character filter updates * styleci --------- Co-authored-by: Crypta Eve --- src/Commands/Seat/Filters/Update.php | 57 +++++++++++++ src/Jobs/UpdateCharacterFilters.php | 55 ++++++++++++ src/Listeners/CharacterBatchProcessed.php | 34 ++++++++ .../CharacterAffiliationObserver.php | 64 -------------- src/Observers/CharacterAssetObserver.php | 71 ---------------- src/Observers/CharacterRoleObserver.php | 34 +------- src/Observers/CharacterSkillObserver.php | 84 ------------------- src/Observers/CharacterTitleObserver.php | 71 ---------------- src/Observers/RefreshTokenObserver.php | 54 +----------- src/WebServiceProvider.php | 20 ++--- src/database/seeders/ScheduleSeeder.php | 8 ++ 11 files changed, 162 insertions(+), 390 deletions(-) create mode 100644 src/Commands/Seat/Filters/Update.php create mode 100644 src/Jobs/UpdateCharacterFilters.php create mode 100644 src/Listeners/CharacterBatchProcessed.php delete mode 100644 src/Observers/CharacterAffiliationObserver.php delete mode 100644 src/Observers/CharacterAssetObserver.php delete mode 100644 src/Observers/CharacterSkillObserver.php delete mode 100644 src/Observers/CharacterTitleObserver.php diff --git a/src/Commands/Seat/Filters/Update.php b/src/Commands/Seat/Filters/Update.php new file mode 100644 index 000000000..e371efda0 --- /dev/null +++ b/src/Commands/Seat/Filters/Update.php @@ -0,0 +1,57 @@ +onQueue('high'); + $this->line('Scheduled character filter updates for all characters!'); + } +} diff --git a/src/Jobs/UpdateCharacterFilters.php b/src/Jobs/UpdateCharacterFilters.php new file mode 100644 index 000000000..d9ad3347f --- /dev/null +++ b/src/Jobs/UpdateCharacterFilters.php @@ -0,0 +1,55 @@ +character)); + } +} diff --git a/src/Observers/CharacterAffiliationObserver.php b/src/Observers/CharacterAffiliationObserver.php deleted file mode 100644 index 116179fa5..000000000 --- a/src/Observers/CharacterAffiliationObserver.php +++ /dev/null @@ -1,64 +0,0 @@ -fireCharacterFilterEvent($affiliation); - } - - /** - * @param \Seat\Eveapi\Models\Character\CharacterAffiliation $affiliation - */ - public function updated(CharacterAffiliation $affiliation) - { - $this->fireCharacterFilterEvent($affiliation); - } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - // CharacterAffiliation links to UniverseName instead of CharacterInfo - return CharacterInfo::find($fired_model->character_id); - } -} diff --git a/src/Observers/CharacterAssetObserver.php b/src/Observers/CharacterAssetObserver.php deleted file mode 100644 index 67f2b9f15..000000000 --- a/src/Observers/CharacterAssetObserver.php +++ /dev/null @@ -1,71 +0,0 @@ -fireCharacterFilterEvent($asset); - } - - /** - * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset - */ - public function updated(CharacterAsset $asset) - { - $this->fireCharacterFilterEvent($asset); - } - - /** - * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset - */ - public function deleted(CharacterAsset $asset) - { - $this->fireCharacterFilterEvent($asset); - } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - return $fired_model->character; - } -} diff --git a/src/Observers/CharacterRoleObserver.php b/src/Observers/CharacterRoleObserver.php index 688f6f9b1..41fb4c431 100644 --- a/src/Observers/CharacterRoleObserver.php +++ b/src/Observers/CharacterRoleObserver.php @@ -23,27 +23,22 @@ namespace Seat\Web\Observers; use Exception; -use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Bus\Corporation; -use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Character\CharacterRole; use Seat\Eveapi\Models\RefreshToken; -use Seat\Web\Models\User; /** * Class CharacterRoleObserver. * * @package Seat\Web\Observers */ -class CharacterRoleObserver extends AbstractCharacterFilterObserver +class CharacterRoleObserver { /** * @param \Seat\Eveapi\Models\Character\CharacterRole $role */ public function created(CharacterRole $role) { - $this->fireCharacterFilterEvent($role); - // in case the created role is not a Director role, ignore if ($role->role != 'Director') return; @@ -62,31 +57,4 @@ public function created(CharacterRole $role) logger()->error($e->getMessage()); } } - - /** - * @param \Seat\Eveapi\Models\Character\CharacterRole $role - */ - public function updated(CharacterRole $role) - { - $this->fireCharacterFilterEvent($role); - } - - /** - * @param \Seat\Eveapi\Models\Character\CharacterRole $role - */ - public function deleted(CharacterRole $role) - { - $this->fireCharacterFilterEvent($role); - } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - return $fired_model->character; - } } diff --git a/src/Observers/CharacterSkillObserver.php b/src/Observers/CharacterSkillObserver.php deleted file mode 100644 index f3c7e1820..000000000 --- a/src/Observers/CharacterSkillObserver.php +++ /dev/null @@ -1,84 +0,0 @@ -fireCharacterFilterEvent($skill); - } - - /** - * @param \Seat\Eveapi\Models\Character\CharacterSkill $skill - */ - public function updated(CharacterSkill $skill) - { - $this->fireCharacterFilterEvent($skill); - } - - /** - * @param \Seat\Eveapi\Models\Character\CharacterSkill $skill - */ - public function deleted(CharacterSkill $skill) - { - $this->fireCharacterFilterEvent($skill); - } - - /** - * {@inheritdoc} - */ - protected function findRelatedUser(Model $fired_model): ?User - { - // retrieve user related to the character affiliation - return User::with('squads') - ->standard() - ->whereHas('characters', function ($query) use ($fired_model) { - $query->where('character_infos.character_id', $fired_model->character_id); - })->first(); - } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - return $fired_model->character; - } -} diff --git a/src/Observers/CharacterTitleObserver.php b/src/Observers/CharacterTitleObserver.php deleted file mode 100644 index d01b033fd..000000000 --- a/src/Observers/CharacterTitleObserver.php +++ /dev/null @@ -1,71 +0,0 @@ -fireCharacterFilterEvent($title); - } - - /** - * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset - */ - public function updated(CharacterTitle $title) - { - $this->fireCharacterFilterEvent($title); - } - - /** - * @param \Seat\Eveapi\Models\Assets\CharacterAsset $asset - */ - public function deleted(CharacterTitle $title) - { - $this->fireCharacterFilterEvent($title); - } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - return CharacterInfo::find($fired_model->character_id); - } -} diff --git a/src/Observers/RefreshTokenObserver.php b/src/Observers/RefreshTokenObserver.php index 901e91bef..1cd581baa 100644 --- a/src/Observers/RefreshTokenObserver.php +++ b/src/Observers/RefreshTokenObserver.php @@ -23,18 +23,15 @@ namespace Seat\Web\Observers; use Exception; -use Illuminate\Database\Eloquent\Model; use Seat\Eveapi\Bus\Character; -use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\RefreshToken; -use Seat\Web\Models\User; /** * Class RefreshTokenObserver. * * @package Seat\Web\Observers */ -class RefreshTokenObserver extends AbstractCharacterFilterObserver +class RefreshTokenObserver { /** * @param \Seat\Eveapi\Models\RefreshToken $token @@ -44,41 +41,6 @@ public function created(RefreshToken $token) try { $job = new Character($token->character_id, $token); $job->fire(); - - // enqueue squads update - $this->fireCharacterFilterEvent($token); - } catch (Exception $e) { - logger()->error($e->getMessage()); - } - } - - /** - * @param \Seat\Eveapi\Models\RefreshToken $token - */ - public function updated(RefreshToken $token) - { - try { - $this->fireCharacterFilterEvent($token); - } catch (Exception $e) { - logger()->error($e->getMessage()); - } - } - - /** - * @param \Seat\Eveapi\Models\RefreshToken $token - */ - public function softDeleted(RefreshToken $token) - { - $this->deleted($token); - } - - /** - * @param \Seat\Eveapi\Models\RefreshToken $token - */ - public function deleted(RefreshToken $token) - { - try { - $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } @@ -92,22 +54,8 @@ public function restored(RefreshToken $token) try { $job = new Character($token->character_id, $token); $job->fire(); - - // enqueue squads update - $this->fireCharacterFilterEvent($token); } catch (Exception $e) { logger()->error($e->getMessage()); } } - - /** - * Return the User owning the model which fired the catch event. - * - * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event - * @return ?CharacterInfo The character that is affected by this update - */ - protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo - { - return $fired_model->character; - } } diff --git a/src/WebServiceProvider.php b/src/WebServiceProvider.php index e503a832e..ba3b9aee1 100644 --- a/src/WebServiceProvider.php +++ b/src/WebServiceProvider.php @@ -32,16 +32,13 @@ use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; use Laravel\Horizon\Horizon; -use Seat\Eveapi\Models\Assets\CharacterAsset; -use Seat\Eveapi\Models\Character\CharacterAffiliation; use Seat\Eveapi\Models\Character\CharacterRole; -use Seat\Eveapi\Models\Character\CharacterSkill; use Seat\Eveapi\Models\RefreshToken; -use Seat\Eveapi\Pivot\Character\CharacterTitle; use Seat\Services\AbstractSeatPlugin; use Seat\Services\Settings\Profile; use Seat\Services\Settings\Seat; -use Seat\Web\Commands\Seat\Admin\Login as AdminLogin; +use Seat\Web\Commands\Seat\Admin\Login as AdminLoginCommand; +use Seat\Web\Commands\Seat\Filters\Update as FilterUpdateCommand; use Seat\Web\Database\Seeders\ScheduleSeeder; use Seat\Web\Events\Attempt; use Seat\Web\Events\CharacterFilterDataUpdate; @@ -62,15 +59,12 @@ use Seat\Web\Http\Middleware\Locale; use Seat\Web\Http\Middleware\RegistrationAllowed; use Seat\Web\Http\Middleware\Requirements; +use Seat\Web\Listeners\CharacterBatchProcessed; use Seat\Web\Listeners\CharacterFilterDataUpdatedSquads; use Seat\Web\Listeners\CharacterFilterDataUpdatedTokens; use Seat\Web\Models\Squads\SquadMember; use Seat\Web\Models\Squads\SquadRole; -use Seat\Web\Observers\CharacterAffiliationObserver; -use Seat\Web\Observers\CharacterAssetObserver; use Seat\Web\Observers\CharacterRoleObserver; -use Seat\Web\Observers\CharacterSkillObserver; -use Seat\Web\Observers\CharacterTitleObserver; use Seat\Web\Observers\RefreshTokenObserver; use Seat\Web\Observers\SquadMemberObserver; use Seat\Web\Observers\SquadRoleObserver; @@ -302,6 +296,7 @@ private function add_events() // Custom Events Event::listen('security.log', SecLog::class); + Event::listen(\Seat\Eveapi\Events\CharacterBatchProcessed::class, CharacterBatchProcessed::class); Event::listen(CharacterFilterDataUpdate::class, CharacterFilterDataUpdatedSquads::class); Event::listen(CharacterFilterDataUpdate::class, CharacterFilterDataUpdatedTokens::class); @@ -310,10 +305,6 @@ private function add_events() RefreshToken::observe(RefreshTokenObserver::class); // Squads Events - CharacterAffiliation::observe(CharacterAffiliationObserver::class); - CharacterAsset::observe(CharacterAssetObserver::class); - CharacterSkill::observe(CharacterSkillObserver::class); - CharacterTitle::observe(CharacterTitleObserver::class); SquadMember::observe(SquadMemberObserver::class); SquadRole::observe(SquadRoleObserver::class); } @@ -422,7 +413,8 @@ private function register_services() private function addCommands() { $this->commands([ - AdminLogin::class, + AdminLoginCommand::class, + FilterUpdateCommand::class, ]); } diff --git a/src/database/seeders/ScheduleSeeder.php b/src/database/seeders/ScheduleSeeder.php index 8db64b1fb..cc9f2d842 100644 --- a/src/database/seeders/ScheduleSeeder.php +++ b/src/database/seeders/ScheduleSeeder.php @@ -47,6 +47,14 @@ public function getSchedules(): array 'ping_before' => null, 'ping_after' => null, ], + [ + 'command' => 'seat:filters:update', + 'expression' => sprintf('%d * * * *', rand(0, 59)), + 'allow_overlap' => false, + 'allow_maintenance' => false, + 'ping_before' => null, + 'ping_after' => null, + ], ]; } From 6c7dd18926b1294575fc8c7b1a352c4767345bc0 Mon Sep 17 00:00:00 2001 From: Crypta Eve Date: Fri, 6 Sep 2024 23:30:06 +0930 Subject: [PATCH 91/95] chore: deps bump --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cea6cdc50..3d8f78267 100644 --- a/composer.json +++ b/composer.json @@ -31,8 +31,8 @@ "doctrine/dbal": "^3.0", "erusev/parsedown": "^1.7", "eveseat/eseye": "^3.0", - "eveseat/eveapi": "^5.0", - "eveseat/services": "^5.0.6", + "eveseat/eveapi": "^5.0.15", + "eveseat/services": "^5.0.8", "guzzlehttp/guzzle": "^7.0", "intervention/image": "^2.0", "laravel/framework": "^10.0", From 7793b746df594b1e6b9f742190da4da92c3bf2ca Mon Sep 17 00:00:00 2001 From: recursivetree <60423027+recursivetree@users.noreply.github.com> Date: Sat, 7 Sep 2024 01:19:02 +0200 Subject: [PATCH 92/95] fix: allow updating scheduling rules for new tokens (#687) --- .../Configuration/ScheduleController.php | 14 ++++++++++---- src/Models/CharacterSchedulingRule.php | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Http/Controllers/Configuration/ScheduleController.php b/src/Http/Controllers/Configuration/ScheduleController.php index 64a9eb6b1..6aef76ebe 100644 --- a/src/Http/Controllers/Configuration/ScheduleController.php +++ b/src/Http/Controllers/Configuration/ScheduleController.php @@ -118,8 +118,11 @@ public function createSchedulingRule(Request $request) $rule->filter = $request->filters; $rule->save(); - RefreshToken::all()->each(function ($token) { - CharacterSchedulingRule::updateRefreshTokenSchedule($token); + // chunk this to avoid out-of-memory issues on large installs + RefreshToken::chunk(200, function ($tokens) { + foreach ($tokens as $token) { + CharacterSchedulingRule::updateRefreshTokenSchedule($token); + } }); return redirect()->back() @@ -134,8 +137,11 @@ public function deleteSchedulingRule(Request $request) CharacterSchedulingRule::destroy($request->rule_id); - RefreshToken::all()->each(function ($token) { - CharacterSchedulingRule::updateRefreshTokenSchedule($token); + // chunk this to avoid out-of-memory issues on large installs + RefreshToken::chunk(200, function ($tokens) { + foreach ($tokens as $token) { + CharacterSchedulingRule::updateRefreshTokenSchedule($token); + } }); return redirect()->back()->with('success', 'Successfully removed character scheduling rule!'); diff --git a/src/Models/CharacterSchedulingRule.php b/src/Models/CharacterSchedulingRule.php index 471a5f6f7..e903f5bd4 100644 --- a/src/Models/CharacterSchedulingRule.php +++ b/src/Models/CharacterSchedulingRule.php @@ -66,6 +66,7 @@ public static function updateRefreshTokenSchedule(RefreshToken $token): void if($schedule === null) { $schedule = new RefreshTokenSchedule(); $schedule->character_id = $token->character_id; + $schedule->last_update = now()->subYears(10); // Hopefully this is far enough in the past to mean never? } $schedule->update_interval = self::getCharacterSchedulingInterval($token->character); From f168045d40a7a3ae1b304a8be6202c29bb7e8747 Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Sun, 8 Sep 2024 00:08:40 +0930 Subject: [PATCH 93/95] fix: only fire refresh token schedule update if token exists --- src/Listeners/CharacterFilterDataUpdatedTokens.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Listeners/CharacterFilterDataUpdatedTokens.php b/src/Listeners/CharacterFilterDataUpdatedTokens.php index 0dfee262f..b8f18a4d6 100644 --- a/src/Listeners/CharacterFilterDataUpdatedTokens.php +++ b/src/Listeners/CharacterFilterDataUpdatedTokens.php @@ -29,6 +29,7 @@ class CharacterFilterDataUpdatedTokens { public static function handle(CharacterFilterDataUpdate $update) { - CharacterSchedulingRule::updateRefreshTokenSchedule($update->character->refresh_token); + if (!is_null($update->character->refresh_token)) + CharacterSchedulingRule::updateRefreshTokenSchedule($update->character->refresh_token); } } From 82c6a0aeb4c854a544a229fb2c1bac2c811707c3 Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Sun, 8 Sep 2024 00:09:23 +0930 Subject: [PATCH 94/95] feat: remove publicData scope when not required --- src/Http/Controllers/Auth/SsoController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Http/Controllers/Auth/SsoController.php b/src/Http/Controllers/Auth/SsoController.php index c35e91b89..2b438007e 100644 --- a/src/Http/Controllers/Auth/SsoController.php +++ b/src/Http/Controllers/Auth/SsoController.php @@ -77,6 +77,11 @@ public function redirectToProvider($profile = null) $used_scopes = $token->scopes; } + if (count($used_scopes) > 1){ + if (($key = array_search('publicData', $used_scopes)) !== false) { + unset($used_scopes[$key]); + } + } // Store the scopes we are sending to CCP in the session so we can // validate the JWT response contains the right scopes. session()->put('scopes', $used_scopes); From a878bd1f0ed1cd74cb6f1ae4d266c877912dfef8 Mon Sep 17 00:00:00 2001 From: Crypta Eve Date: Sun, 8 Sep 2024 00:11:25 +0930 Subject: [PATCH 95/95] Apply fixes from StyleCI (#688) Co-authored-by: StyleCI Bot --- src/Listeners/CharacterFilterDataUpdatedTokens.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Listeners/CharacterFilterDataUpdatedTokens.php b/src/Listeners/CharacterFilterDataUpdatedTokens.php index b8f18a4d6..024996594 100644 --- a/src/Listeners/CharacterFilterDataUpdatedTokens.php +++ b/src/Listeners/CharacterFilterDataUpdatedTokens.php @@ -29,7 +29,7 @@ class CharacterFilterDataUpdatedTokens { public static function handle(CharacterFilterDataUpdate $update) { - if (!is_null($update->character->refresh_token)) + if (! is_null($update->character->refresh_token)) CharacterSchedulingRule::updateRefreshTokenSchedule($update->character->refresh_token); } }