diff --git a/src/Mod/Hub/Boot.php b/src/Mod/Hub/Boot.php index 5f09f3c..5b6f339 100644 --- a/src/Mod/Hub/Boot.php +++ b/src/Mod/Hub/Boot.php @@ -9,7 +9,7 @@ use Core\Front\Admin\AdminMenuRegistry; use Core\Front\Admin\Concerns\HasMenuPermissions; use Core\Front\Admin\Contracts\AdminMenuProvider; use Illuminate\Support\ServiceProvider; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Services\WorkspaceService; class Boot extends ServiceProvider implements AdminMenuProvider { @@ -262,7 +262,7 @@ class Boot extends ServiceProvider implements AdminMenuProvider $event->livewire('hub.admin.honeypot', View\Modal\Admin\Honeypot::class); // Workspace management (Tenant module) - $event->livewire('tenant.admin.workspace-manager', \Core\Mod\Tenant\View\Modal\Admin\WorkspaceManager::class); - $event->livewire('tenant.admin.workspace-details', \Core\Mod\Tenant\View\Modal\Admin\WorkspaceDetails::class); + $event->livewire('tenant.admin.workspace-manager', \Core\Tenant\View\Modal\Admin\WorkspaceManager::class); + $event->livewire('tenant.admin.workspace-details', \Core\Tenant\View\Modal\Admin\WorkspaceDetails::class); } } diff --git a/src/Mod/Hub/Tests/Feature/HubRoutesTest.php b/src/Mod/Hub/Tests/Feature/HubRoutesTest.php index 0c5ea59..555d0e4 100644 --- a/src/Mod/Hub/Tests/Feature/HubRoutesTest.php +++ b/src/Mod/Hub/Tests/Feature/HubRoutesTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); * Each test asserts meaningful HTML content, not just status codes. */ -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; beforeEach(function () { $this->user = User::factory()->create([ diff --git a/src/Mod/Hub/Tests/Feature/WorkspaceSwitcherTest.php b/src/Mod/Hub/Tests/Feature/WorkspaceSwitcherTest.php index 8c75be6..53d76f1 100644 --- a/src/Mod/Hub/Tests/Feature/WorkspaceSwitcherTest.php +++ b/src/Mod/Hub/Tests/Feature/WorkspaceSwitcherTest.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace Core\Mod\Hub\Tests\Feature; use Core\Mod\Hub\View\Modal\Admin\WorkspaceSwitcher; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\WorkspaceService; use Illuminate\Foundation\Testing\RefreshDatabase; use Livewire\Livewire; use Tests\TestCase; diff --git a/src/Mod/Hub/Tests/UseCase/DashboardBasic.php b/src/Mod/Hub/Tests/UseCase/DashboardBasic.php index d7021f3..6db1ba4 100644 --- a/src/Mod/Hub/Tests/UseCase/DashboardBasic.php +++ b/src/Mod/Hub/Tests/UseCase/DashboardBasic.php @@ -9,8 +9,8 @@ * Uses translation keys to get expected values - tests won't break on copy changes. */ -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; describe('Hub Dashboard', function () { beforeEach(function () { diff --git a/src/Website/Hub/Routes/admin.php b/src/Website/Hub/Routes/admin.php index 5b615bd..ce7a023 100644 --- a/src/Website/Hub/Routes/admin.php +++ b/src/Website/Hub/Routes/admin.php @@ -57,8 +57,8 @@ Route::get('/entitlements/features', \Website\Hub\View\Modal\Admin\Entitlement\F Route::get('/admin/waitlist', \Website\Hub\View\Modal\Admin\WaitlistManager::class)->name('admin.waitlist'); // Workspace management (admin only - Hades tier) -// Route::get('/admin/workspaces', \Core\Mod\Tenant\View\Modal\Admin\WorkspaceManager::class)->name('admin.workspaces'); -// Route::get('/admin/workspaces/{id}', \Core\Mod\Tenant\View\Modal\Admin\WorkspaceDetails::class)->name('admin.workspaces.details') +// Route::get('/admin/workspaces', \Core\Tenant\View\Modal\Admin\WorkspaceManager::class)->name('admin.workspaces'); +// Route::get('/admin/workspaces/{id}', \Core\Tenant\View\Modal\Admin\WorkspaceDetails::class)->name('admin.workspaces.details') // ->where('id', '[0-9]+'); // Service management (admin only - Hades tier) diff --git a/src/Website/Hub/View/Blade/admin/account-usage.blade.php b/src/Website/Hub/View/Blade/admin/account-usage.blade.php index 5aafc3a..5327147 100644 --- a/src/Website/Hub/View/Blade/admin/account-usage.blade.php +++ b/src/Website/Hub/View/Blade/admin/account-usage.blade.php @@ -416,7 +416,7 @@ @foreach($features as $feature) @php $workspace = auth()->user()?->defaultHostWorkspace(); - $check = $workspace ? app(\Core\Mod\Tenant\Services\EntitlementService::class)->can($workspace, $feature['code']) : null; + $check = $workspace ? app(\Core\Tenant\Services\EntitlementService::class)->can($workspace, $feature['code']) : null; $allowed = $check?->isAllowed() ?? false; $limit = $check?->effectiveLimit ?? null; $unlimited = $check?->isUnlimited ?? false; diff --git a/src/Website/Hub/View/Blade/admin/content-editor.blade.php b/src/Website/Hub/View/Blade/admin/content-editor.blade.php index 7f6d9c8..a8d5eb0 100644 --- a/src/Website/Hub/View/Blade/admin/content-editor.blade.php +++ b/src/Website/Hub/View/Blade/admin/content-editor.blade.php @@ -34,7 +34,7 @@
- diff --git a/src/Website/Hub/View/Blade/admin/dashboard.blade.php b/src/Website/Hub/View/Blade/admin/dashboard.blade.php index 66d2440..41836ef 100644 --- a/src/Website/Hub/View/Blade/admin/dashboard.blade.php +++ b/src/Website/Hub/View/Blade/admin/dashboard.blade.php @@ -16,7 +16,7 @@

Users

-

{{ \Core\Mod\Tenant\Models\User::count() }}

+

{{ \Core\Tenant\Models\User::count() }}

diff --git a/src/Website/Hub/View/Modal/Admin/AccountUsage.php b/src/Website/Hub/View/Modal/Admin/AccountUsage.php index f1b17ed..d7712fa 100644 --- a/src/Website/Hub/View/Modal/Admin/AccountUsage.php +++ b/src/Website/Hub/View/Modal/Admin/AccountUsage.php @@ -10,9 +10,9 @@ use Livewire\Attributes\Url; use Livewire\Component; use Core\Mod\Social\Actions\Common\UpdateOrCreateService; use Core\Mod\Social\Services\ServiceManager; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; class AccountUsage extends Component { diff --git a/src/Website/Hub/View/Modal/Admin/BoostPurchase.php b/src/Website/Hub/View/Modal/Admin/BoostPurchase.php index 0f7943b..a54a024 100644 --- a/src/Website/Hub/View/Modal/Admin/BoostPurchase.php +++ b/src/Website/Hub/View/Modal/Admin/BoostPurchase.php @@ -2,7 +2,7 @@ namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Models\Feature; +use Core\Tenant\Models\Feature; use Livewire\Component; class BoostPurchase extends Component diff --git a/src/Website/Hub/View/Modal/Admin/Content.php b/src/Website/Hub/View/Modal/Admin/Content.php index fa709b6..4984cc7 100644 --- a/src/Website/Hub/View/Modal/Admin/Content.php +++ b/src/Website/Hub/View/Modal/Admin/Content.php @@ -2,7 +2,7 @@ namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Services\WorkspaceService; use Illuminate\Pagination\LengthAwarePaginator; use Livewire\Attributes\Computed; use Livewire\Attributes\On; diff --git a/src/Website/Hub/View/Modal/Admin/ContentEditor.php b/src/Website/Hub/View/Modal/Admin/ContentEditor.php index 01af915..cb4637a 100644 --- a/src/Website/Hub/View/Modal/Admin/ContentEditor.php +++ b/src/Website/Hub/View/Modal/Admin/ContentEditor.php @@ -9,8 +9,8 @@ use Core\Mod\Content\Models\ContentMedia; use Core\Mod\Content\Models\ContentRevision; use Core\Mod\Content\Models\ContentTaxonomy; use Core\Mod\Agentic\Models\Prompt; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; use Illuminate\Support\Str; use Livewire\Attributes\Computed; use Livewire\Attributes\On; diff --git a/src/Website/Hub/View/Modal/Admin/ContentManager.php b/src/Website/Hub/View/Modal/Admin/ContentManager.php index df9fa98..5b73a5f 100644 --- a/src/Website/Hub/View/Modal/Admin/ContentManager.php +++ b/src/Website/Hub/View/Modal/Admin/ContentManager.php @@ -11,8 +11,8 @@ use Livewire\WithPagination; use Core\Mod\Content\Models\ContentItem; use Core\Mod\Content\Models\ContentTaxonomy; use Core\Mod\Content\Models\ContentWebhookLog; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\WorkspaceService; /** * Content Manager component. diff --git a/src/Website/Hub/View/Modal/Admin/Databases.php b/src/Website/Hub/View/Modal/Admin/Databases.php index d1e4012..27eb67e 100644 --- a/src/Website/Hub/View/Modal/Admin/Databases.php +++ b/src/Website/Hub/View/Modal/Admin/Databases.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\WorkspaceService; use Flux\Flux; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Cache; diff --git a/src/Website/Hub/View/Modal/Admin/Entitlement/Dashboard.php b/src/Website/Hub/View/Modal/Admin/Entitlement/Dashboard.php index 324ea8e..4ee30e5 100644 --- a/src/Website/Hub/View/Modal/Admin/Entitlement/Dashboard.php +++ b/src/Website/Hub/View/Modal/Admin/Entitlement/Dashboard.php @@ -11,10 +11,10 @@ use Livewire\Attributes\Title; use Livewire\Attributes\Url; use Livewire\Component; use Livewire\WithPagination; -use Core\Mod\Tenant\Models\Boost; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Boost; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\WorkspacePackage; #[Title('Entitlements')] #[Layout('hub::admin.layouts.app')] diff --git a/src/Website/Hub/View/Modal/Admin/Entitlement/FeatureManager.php b/src/Website/Hub/View/Modal/Admin/Entitlement/FeatureManager.php index a94e87a..e760bc2 100644 --- a/src/Website/Hub/View/Modal/Admin/Entitlement/FeatureManager.php +++ b/src/Website/Hub/View/Modal/Admin/Entitlement/FeatureManager.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin\Entitlement; -use Core\Mod\Tenant\Models\Feature; +use Core\Tenant\Models\Feature; use Livewire\Attributes\Computed; use Livewire\Attributes\Layout; use Livewire\Attributes\Title; diff --git a/src/Website/Hub/View/Modal/Admin/Entitlement/PackageManager.php b/src/Website/Hub/View/Modal/Admin/Entitlement/PackageManager.php index 60bd27a..1c87f93 100644 --- a/src/Website/Hub/View/Modal/Admin/Entitlement/PackageManager.php +++ b/src/Website/Hub/View/Modal/Admin/Entitlement/PackageManager.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin\Entitlement; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; use Livewire\Attributes\Computed; use Livewire\Attributes\Layout; use Livewire\Attributes\Title; diff --git a/src/Website/Hub/View/Modal/Admin/Platform.php b/src/Website/Hub/View/Modal/Admin/Platform.php index d44ff9f..448ab56 100644 --- a/src/Website/Hub/View/Modal/Admin/Platform.php +++ b/src/Website/Hub/View/Modal/Admin/Platform.php @@ -2,8 +2,8 @@ namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Enums\UserTier; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Enums\UserTier; +use Core\Tenant\Models\User; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Cache; use Livewire\Component; diff --git a/src/Website/Hub/View/Modal/Admin/PlatformUser.php b/src/Website/Hub/View/Modal/Admin/PlatformUser.php index 94587f0..7eec991 100644 --- a/src/Website/Hub/View/Modal/Admin/PlatformUser.php +++ b/src/Website/Hub/View/Modal/Admin/PlatformUser.php @@ -6,14 +6,14 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Livewire\Attributes\Computed; use Livewire\Component; -use Core\Mod\Tenant\Enums\UserTier; -use Core\Mod\Tenant\Models\AccountDeletionRequest; -use Core\Mod\Tenant\Models\Boost; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Enums\UserTier; +use Core\Tenant\Models\AccountDeletionRequest; +use Core\Tenant\Models\Boost; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; class PlatformUser extends Component { diff --git a/src/Website/Hub/View/Modal/Admin/Profile.php b/src/Website/Hub/View/Modal/Admin/Profile.php index eba7aa4..bf82e7d 100644 --- a/src/Website/Hub/View/Modal/Admin/Profile.php +++ b/src/Website/Hub/View/Modal/Admin/Profile.php @@ -2,8 +2,8 @@ namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Enums\UserTier; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Enums\UserTier; +use Core\Tenant\Models\User; use Illuminate\Support\Facades\Auth; use Livewire\Component; @@ -33,7 +33,7 @@ class Profile extends Component public function mount(): void { $user = User::findOrFail(Auth::id()); - $appUser = \Core\Mod\Tenant\Models\User::find(Auth::id()); + $appUser = \Core\Tenant\Models\User::find(Auth::id()); $this->userName = $user->name ?? 'User'; $this->userEmail = $user->email ?? ''; diff --git a/src/Website/Hub/View/Modal/Admin/ServicesAdmin.php b/src/Website/Hub/View/Modal/Admin/ServicesAdmin.php index 244457e..51b79c3 100644 --- a/src/Website/Hub/View/Modal/Admin/ServicesAdmin.php +++ b/src/Website/Hub/View/Modal/Admin/ServicesAdmin.php @@ -27,8 +27,8 @@ use Core\Mod\Social\Models\Post as SocialPost; use Core\Mod\Support\Models\Conversation; use Core\Mod\Support\Models\Mailbox; use Core\Mod\Support\Models\Thread; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\WorkspaceService; use Core\Mod\Trust\Models\Campaign as TrustCampaign; use Core\Mod\Trust\Models\Notification as TrustNotification; // TODO: Bio service admin moved to Host UK app (Mod\Bio) diff --git a/src/Website/Hub/View/Modal/Admin/Settings.php b/src/Website/Hub/View/Modal/Admin/Settings.php index 95fde1d..fd4de13 100644 --- a/src/Website/Hub/View/Modal/Admin/Settings.php +++ b/src/Website/Hub/View/Modal/Admin/Settings.php @@ -11,10 +11,10 @@ use Livewire\Attributes\Url; use Livewire\Attributes\Validate; use Livewire\Component; use Core\Mod\Social\Models\Setting; -use Core\Mod\Tenant\Mail\AccountDeletionRequested; -use Core\Mod\Tenant\Models\AccountDeletionRequest; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Services\UserStatsService; +use Core\Tenant\Mail\AccountDeletionRequested; +use Core\Tenant\Models\AccountDeletionRequest; +use Core\Tenant\Models\User; +use Core\Tenant\Services\UserStatsService; class Settings extends Component { @@ -214,7 +214,7 @@ class Settings extends Component public function requestAccountDeletion(): void { // Get the base user model for the app - $user = \Core\Mod\Tenant\Models\User::findOrFail(Auth::id()); + $user = \Core\Tenant\Models\User::findOrFail(Auth::id()); // Create the deletion request $deletionRequest = AccountDeletionRequest::createForUser($user, $this->deleteReason ?: null); diff --git a/src/Website/Hub/View/Modal/Admin/SiteSettings.php b/src/Website/Hub/View/Modal/Admin/SiteSettings.php index 4502db2..de40f7c 100644 --- a/src/Website/Hub/View/Modal/Admin/SiteSettings.php +++ b/src/Website/Hub/View/Modal/Admin/SiteSettings.php @@ -10,10 +10,10 @@ use Livewire\Attributes\Computed; use Livewire\Attributes\Layout; use Livewire\Attributes\Title; use Livewire\Component; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; #[Title('Site Settings')] #[Layout('hub::admin.layouts.app')] diff --git a/src/Website/Hub/View/Modal/Admin/Sites.php b/src/Website/Hub/View/Modal/Admin/Sites.php index e6f2a5f..69a03ec 100644 --- a/src/Website/Hub/View/Modal/Admin/Sites.php +++ b/src/Website/Hub/View/Modal/Admin/Sites.php @@ -11,11 +11,11 @@ use Livewire\Attributes\Layout; use Livewire\Attributes\On; use Livewire\Attributes\Title; use Livewire\Component; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; +use Core\Tenant\Services\WorkspaceService; /** * Workspace settings page at /hub/workspaces. diff --git a/src/Website/Hub/View/Modal/Admin/UsageDashboard.php b/src/Website/Hub/View/Modal/Admin/UsageDashboard.php index 169cccb..7739e17 100644 --- a/src/Website/Hub/View/Modal/Admin/UsageDashboard.php +++ b/src/Website/Hub/View/Modal/Admin/UsageDashboard.php @@ -2,7 +2,7 @@ namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Services\EntitlementService; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Component; diff --git a/src/Website/Hub/View/Modal/Admin/WaitlistManager.php b/src/Website/Hub/View/Modal/Admin/WaitlistManager.php index 1d68f98..ea35ac2 100644 --- a/src/Website/Hub/View/Modal/Admin/WaitlistManager.php +++ b/src/Website/Hub/View/Modal/Admin/WaitlistManager.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Models\WaitlistEntry; -use Core\Mod\Tenant\Notifications\WaitlistInviteNotification; +use Core\Tenant\Models\WaitlistEntry; +use Core\Tenant\Notifications\WaitlistInviteNotification; use Livewire\Attributes\Computed; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/src/Website/Hub/View/Modal/Admin/WorkspaceSwitcher.php b/src/Website/Hub/View/Modal/Admin/WorkspaceSwitcher.php index d5d2d53..9b3dc8a 100644 --- a/src/Website/Hub/View/Modal/Admin/WorkspaceSwitcher.php +++ b/src/Website/Hub/View/Modal/Admin/WorkspaceSwitcher.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin; use Livewire\Attributes\On; -use Core\Mod\Tenant\Services\WorkspaceService; +use Core\Tenant\Services\WorkspaceService; use Livewire\Component; class WorkspaceSwitcher extends Component diff --git a/src/Website/Hub/View/Modal/Admin/WpConnectorSettings.php b/src/Website/Hub/View/Modal/Admin/WpConnectorSettings.php index a1fb540..35969d2 100644 --- a/src/Website/Hub/View/Modal/Admin/WpConnectorSettings.php +++ b/src/Website/Hub/View/Modal/Admin/WpConnectorSettings.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Website\Hub\View\Modal\Admin; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Flux\Flux; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Http;