namespaces refactoring part 2

src/App/Console/Commands/SetupDevEnvironment.php

@@ -1,12 +1,12 @@
 <?php
 namespace App\Console\Commands;
 
+use App\Users\Models\User;
 use Illuminate\Support\Str;
+use Domain\Files\Models\File;
 use Illuminate\Console\Command;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Domain\Settings\Models\Setting;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Foundation\Testing\WithFaker;

src/App/Console/Commands/SetupProdEnvironment.php

@@ -1,8 +1,8 @@
 <?php
 namespace App\Console\Commands;
 
+use App\Users\Models\User;
 use Illuminate\Console\Command;
-use Domain\Settings\Models\User;
 use Domain\Settings\Models\Setting;
 use Domain\SetupWizard\Services\SetupService;
 

src/App/Users/Actions/CreateNewUserAction.php

@@ -1,14 +1,14 @@
 <?php
 namespace App\Users\Actions;
 
+use App\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
-use Domain\Settings\Models\User;
+use App\Users\Models\UserSettings;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Registered;
-use Domain\Settings\Models\UserSettings;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Contracts\Auth\StatefulGuard;
 

src/App/Users/Controllers/AccountController.php

@@ -1,19 +1,19 @@
 <?php
 namespace App\Users\Controllers;
 
+use App\Users\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use App\Users\Resources\UserResource;
 use Illuminate\Http\RedirectResponse;
-use Domain\Admin\Resources\UserResource;
+use Support\Demo\Actions\DemoService;
 use Laravel\Sanctum\PersonalAccessToken;
 use Illuminate\Support\Facades\Validator;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\Admin\Resources\InvoiceCollection;
-use Domain\Admin\Resources\UserStorageResource;
+use App\Users\Resources\UserStorageResource;
+use Domain\Invoices\Resources\InvoiceCollection;
 use App\Users\Requests\UpdateUserPasswordRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use App\Users\Requests\UserCreateAccessTokenRequest;

src/App/Users/Controllers/AuthController.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Users\Controllers;
 
-use Domain\Settings\Models\User;
+use App\Users\Models\User;
 use App\Http\Controllers\Controller;
 use App\Users\Requests\CheckAccountRequest;
 

src/App/Users/Models/User.php

@@ -2,17 +2,21 @@
 namespace App\Users\Models;
 
 use ByteUnits\Metric;
+use Database\Factories\UserFactory;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Domain\Traffic\Models\Traffic;
 use Illuminate\Support\Str;
 use Laravel\Cashier\Billable;
 use Laravel\Sanctum\HasApiTokens;
 use Kyslik\ColumnSortable\Sortable;
+use Support\Services\HelperService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
+use App\Users\Notifications\ResetPassword;
 use Laravel\Fortify\TwoFactorAuthenticatable;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Domain\Sharing\Notifications\ResetPassword;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
@@ -60,6 +64,11 @@ class User extends Authenticatable implements MustVerifyEmail
 
     protected $keyType = 'string';
 
+    protected static function newFactory(): UserFactory
+    {
+        return UserFactory::new();
+    }
+
     /**
      * Get tax rate id for user
      *

src/App/Users/Resources/UserStorageResource.php

@@ -2,7 +2,7 @@
 namespace App\Users\Resources;
 
 use ByteUnits\Metric;
-use Domain\Settings\Models\File;
+use Domain\Files\Models\File;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserStorageResource extends JsonResource

src/Domain/Admin/Controllers/DashboardController.php

@@ -1,20 +1,19 @@
 <?php
 namespace Domain\Admin\Controllers;
 
-use Domain\Settings\Models\User;
 use ByteUnits\Metric;
-use Domain\SetupWizard\Services\StripeService;
+use App\Users\Models\User;
 use Laravel\Cashier\Subscription;
 use App\Http\Controllers\Controller;
-use Domain\Admin\Resources\UsersCollection;
+use App\Users\Resources\UsersCollection;
+use Domain\Subscriptions\Services\StripeService;
 
 class DashboardController extends Controller
 {
-    ;
-
     public function __construct(
         private StripeService $stripe
-    ) {}
+    ) {
+    }
 
     /**
      * Get data for dashboard

src/Domain/Admin/Controllers/InvoiceController.php

@@ -1,10 +1,9 @@
 <?php
 namespace Domain\Admin\Controllers;
 
-use Domain\Settings\Models\Invoice;
 use App\Http\Controllers\Controller;
-use Domain\Admin\Resources\InvoiceResource;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Invoices\Resources\InvoiceResource;
+use Domain\Subscriptions\Services\StripeService;
 use Domain\Admin\Resources\InvoiceAdminCollection;
 
 class InvoiceController extends Controller

src/Domain/Admin/Controllers/UserController.php

@@ -1,22 +1,21 @@
 <?php
 namespace Domain\Admin\Controllers;
 
-use Storage;
+use App\Users\Models\User;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\User;
+use App\Users\Models\UserSettings;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use Domain\Admin\Resources\UserResource;
-use Domain\Settings\Models\UserSettings;
+use App\Users\Resources\UserResource;
+use App\Users\Resources\UsersCollection;
 use Illuminate\Support\Facades\Password;
-use Domain\Admin\Resources\UsersCollection;
+use App\Users\Resources\UserSubscription;
+use App\Users\Resources\UserStorageResource;
 use Domain\Admin\Requests\ChangeRoleRequest;
 use Domain\Admin\Requests\CreateUserByAdmin;
 use Domain\Admin\Requests\DeleteUserRequest;
-use Domain\Admin\Resources\UserSubscription;
-use Domain\Admin\Resources\InvoiceCollection;
-use Domain\SetupWizard\Services\StripeService;
-use Domain\Admin\Resources\UserStorageResource;
+use Domain\Invoices\Resources\InvoiceCollection;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Admin\Requests\ChangeStorageCapacityRequest;

src/Domain/Admin/Resources/InvoiceAdminResource.php

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Admin\Resources;
 
+use App\Users\Models\User;
 use Laravel\Cashier\Cashier;
-use Domain\Settings\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class InvoiceAdminResource extends JsonResource

src/Domain/Browsing/Controllers/BrowseController.php

@@ -1,11 +1,11 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use App\Users\Models\User;
 use Illuminate\Http\Request;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Illuminate\Support\Collection;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;

src/Domain/Files/Controllers/FileAccessController.php

@@ -2,12 +2,12 @@
 namespace Domain\Files\Controllers;
 
 use Illuminate\Http\Request;
-use Domain\Settings\Models\Zip;
+use Domain\Zipping\Models\Zip;
+use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Domain\Settings\Models\File as UserFile;
-use Domain\SetupWizard\Services\HelperService;
+use Domain\Files\Models\File as UserFile;
 
 class FileAccessController extends Controller
 {

src/Domain/Files/Models/File.php

@@ -2,6 +2,9 @@
 namespace Domain\Files\Models;
 
 use ByteUnits\Metric;
+use Database\Factories\FileFactory;
+use Domain\Folders\Models\Folder;
+use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
 use Kyslik\ColumnSortable\Sortable;
@@ -51,6 +54,11 @@ class File extends Model
 
     protected $keyType = 'string';
 
+    protected static function newFactory(): FileFactory
+    {
+        return FileFactory::new();
+    }
+
     /**
      * Set routes with public access
      *

src/Domain/Folders/Controllers/FavouriteController.php

@@ -2,11 +2,9 @@
 namespace Domain\Folders\Controllers;
 
 use Illuminate\Http\Request;
-use Domain\Settings\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Validator;
-use Domain\SetupWizard\Services\DemoService;
+use Support\Demo\Actions\DemoService;
 
 class FavouriteController extends Controller
 {

src/Domain/Folders/Models/Folder.php

@@ -1,6 +1,9 @@
 <?php
 namespace Domain\Folders\Models;
 
+use Database\Factories\FolderFactory;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
 use Kyslik\ColumnSortable\Sortable;
@@ -48,6 +51,11 @@ class Folder extends Model
 
     protected $keyType = 'string';
 
+    protected static function newFactory(): FolderFactory
+    {
+        return FolderFactory::new();
+    }
+
     public function getTypeAttribute()
     {
         return 'folder';

src/Domain/Homepage/Controllers/AppFunctionsController.php

@@ -2,20 +2,20 @@
 namespace Domain\Homepage\Controllers;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Domain\Pages\Models\Page;
+use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
-use Domain\Languages\Models\Language;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Cache;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Database\QueryException;
+use Domain\Localization\Models\Language;
 use Domain\Pages\Resources\PageResource;
 use Domain\Homepage\Mail\SendContactMessage;
-use Domain\Subscriptions\Resources\PricingCollection;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Plans\Resources\PricingCollection;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Homepage\Requests\SendContactMessageRequest;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

src/Domain/Invoices/Resources/InvoiceCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Invoices\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Invoices/Resources/InvoiceResource.php

@@ -1,7 +1,7 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Invoices\Resources;
 
-use Domain\Settings\Models\User;
+use App\Users\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class InvoiceResource extends JsonResource

src/Domain/Items/Controllers/EditItemsController.php

@@ -3,20 +3,20 @@ namespace Domain\Items\Controllers;
 
 use Exception;
 use Illuminate\Http\Request;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use Support\Demo\Actions\DemoService;
 use Illuminate\Database\Eloquent\Model;
 use Domain\Files\Requests\UploadRequest;
-use Domain\Files\Requests\MoveItemRequest;
-use Domain\Files\Requests\DeleteItemRequest;
-use Domain\Files\Requests\RenameItemRequest;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\Files\Requests\CreateFolderRequest;
-use Domain\SetupWizard\Services\HelperService;
+use Support\Services\FileManagerService;
+use Domain\Items\Requests\MoveItemRequest;
+use Domain\Items\Requests\DeleteItemRequest;
+use Domain\Items\Requests\RenameItemRequest;
+use Domain\Folders\Requests\CreateFolderRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Domain\SetupWizard\Services\FileManagerService;
 
 class EditItemsController extends Controller
 {

src/Domain/Localization/Controllers/LanguageController.php

@@ -1,17 +1,17 @@
 <?php
-namespace Domain\Languages\Controllers;
+namespace Domain\Localization\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
-use Domain\Settings\Models\Language;
-use Domain\Admin\Resources\LanguageResource;
-use Domain\Admin\Resources\LanguageCollection;
+use Domain\Localization\Models\Language;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Domain\Languages\Requests\UpdateStringRequest;
-use Domain\Languages\Requests\CreateLanguageRequest;
-use Domain\Languages\Requests\UpdateLanguageRequest;
+use Domain\Localization\Resources\LanguageResource;
+use Domain\Localization\Requests\UpdateStringRequest;
+use Domain\Localization\Resources\LanguageCollection;
+use Domain\Localization\Requests\CreateLanguageRequest;
+use Domain\Localization\Requests\UpdateLanguageRequest;
 
 class LanguageController extends Controller
 {

src/Domain/Localization/Models/Language.php

@@ -1,11 +1,11 @@
 <?php
-namespace Domain\Languages\Models;
+namespace Domain\Localization\Models;
 
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\DB;
 use Kyslik\ColumnSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;
-use Domain\SetupWizard\Services\LanguageService;
+use Domain\Localization\Services\LanguageService;
 
 /**
  * @method static whereLocale(string $param)

src/Domain/Localization/Models/LanguageTranslation.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Languages\Models;
+namespace Domain\Localization\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

src/Domain/Localization/Requests/CreateLanguageRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Languages\Requests;
+namespace Domain\Localization\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Localization/Requests/UpdateLanguageRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Languages\Requests;
+namespace Domain\Localization\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Localization/Requests/UpdateStringRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Languages\Requests;
+namespace Domain\Localization\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Localization/Resources/LanguageCollection.php

@@ -1,7 +1,7 @@
 <?php
-namespace Domain\Languages\Resources;
+namespace Domain\Localization\Resources;
 
-use Domain\Settings\Models\Language;
+use Domain\Localization\Models\Language;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
 class LanguageCollection extends ResourceCollection

src/Domain/Localization/Resources/LanguageResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Languages\Resources;
+namespace Domain\Localization\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Localization/Services/LanguageService.php

@@ -1,9 +1,9 @@
 <?php
-namespace Domain\Languages\Services;
+namespace Domain\Localization\Services;
 
 use DB;
-use Domain\Settings\Models\Language;
-use Domain\Settings\Models\LanguageTranslation;
+use Domain\Localization\Models\Language;
+use Domain\Localization\Models\LanguageTranslation;
 
 class LanguageService
 {

src/Domain/Maintenance/Controllers/MaintenanceController.php

@@ -5,9 +5,8 @@ use Gate;
 use Artisan;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
-use Domain\Settings\Models\Language;
-use Domain\SetupWizard\Services\LanguageService;
 use Illuminate\Contracts\Foundation\Application;
+use Domain\Localization\Services\LanguageService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class MaintenanceController extends Controller

src/Domain/Pages/Controllers/PagesController.php

@@ -2,12 +2,12 @@
 namespace Domain\Pages\Controllers;
 
 use Illuminate\Http\Request;
+use Domain\Pages\Models\Page;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\Page;
 use App\Http\Controllers\Controller;
-use Domain\Admin\Resources\PageResource;
-use Domain\Admin\Resources\PageCollection;
-use Domain\SetupWizard\Services\DemoService;
+use Support\Demo\Actions\DemoService;
+use Domain\Pages\Resources\PageResource;
+use Domain\Pages\Resources\PageCollection;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PagesController extends Controller

src/Domain/Payments/Controllers/PaymentMethodsController.php

@@ -1,17 +1,17 @@
 <?php
-namespace Domain\Subscriptions\Controllers;
+namespace Domain\Payments\Controllers;
 
 use Auth;
 use Illuminate\Http\Request;
 use Laravel\Cashier\PaymentMethod;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\StripeService;
-use Domain\Admin\Resources\PaymentCardResource;
-use Domain\Admin\Resources\PaymentCardCollection;
-use Domain\Admin\Resources\PaymentDefaultCardResource;
-use Domain\Subscriptions\Requests\RegisterNewPaymentMethodRequest;
+use Support\Demo\Actions\DemoService;
+use Domain\Subscriptions\Services\StripeService;
+use Domain\Payments\Resources\PaymentCardResource;
+use Domain\Payments\Resources\PaymentCardCollection;
+use Domain\Payments\Resources\PaymentDefaultCardResource;
+use Domain\Payments\Requests\RegisterNewPaymentMethodRequest;
 
 class PaymentMethodsController extends Controller
 {

src/Domain/Payments/Notifications/ConfirmPayment.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Notifications;
+namespace Domain\Payments\Notifications;
 
 use Laravel\Cashier\Payment;
 use Illuminate\Bus\Queueable;

src/Domain/Payments/Requests/RegisterNewPaymentMethodRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Requests;
+namespace Domain\Payments\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Payments/Resources/PaymentCardCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Payments\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Payments/Resources/PaymentCardResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Payments\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Payments/Resources/PaymentDefaultCardResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Payments\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Plans/Controllers/PlansController.php

@@ -1,18 +1,17 @@
 <?php
 namespace Domain\Plans\Controllers;
 
+use App\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\Plan;
-use Domain\Settings\Models\User;
 use Laravel\Cashier\Subscription;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use Domain\Admin\Resources\PlanResource;
-use Domain\Admin\Resources\PlanCollection;
-use Domain\Admin\Resources\UsersCollection;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\StripeService;
+use Support\Demo\Actions\DemoService;
+use App\Users\Resources\UsersCollection;
+use Domain\Plans\Resources\PlanResource;
+use Domain\Plans\Resources\PlanCollection;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 

src/Domain/Plans/Resources/PlanCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Plans\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Plans/Resources/PlanResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Plans\Resources;
 
 use Laravel\Cashier\Cashier;
 use Laravel\Cashier\Subscription;

src/Domain/Plans/Resources/PricingCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Plans\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Plans/Resources/PricingResource.php

@@ -1,8 +1,8 @@
 <?php
-namespace Domain\Subscriptions\Resources;
+namespace Domain\Plans\Resources;
 
 use Laravel\Cashier\Cashier;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class PricingResource extends JsonResource

src/Domain/Settings/Controllers/SettingController.php

@@ -6,7 +6,7 @@ use Artisan;
 use Illuminate\Http\Request;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
-use Domain\SetupWizard\Services\DemoService;
+use Support\Demo\Actions\DemoService;
 use Cartalyst\Stripe\Exception\UnauthorizedException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 

src/Domain/SetupWizard/Controllers/SetupWizardController.php

@@ -4,10 +4,9 @@ namespace Domain\SetupWizard\Controllers;
 use Schema;
 use Stripe;
 use Artisan;
+use App\Users\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Domain\Settings\Models\User;
 use Illuminate\Support\Facades\DB;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
@@ -15,7 +14,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Http;
 use Doctrine\DBAL\Driver\PDOException;
 use Domain\SetupWizard\Services\SetupService;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Cartalyst\Stripe\Exception\UnauthorizedException;
 use Domain\SetupWizard\Requests\StoreAppSetupRequest;

src/Domain/SetupWizard/Services/SetupService.php

@@ -1,10 +1,10 @@
 <?php
 namespace Domain\SetupWizard\Services;
 
-use Domain\Settings\Models\Page;
+use Domain\Pages\Models\Page;
 use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\Language;
 use Illuminate\Support\Facades\Storage;
+use Domain\Localization\Models\Language;
 
 class SetupService
 {

src/Domain/Sharing/Controllers/BrowseShareController.php

@@ -3,16 +3,16 @@ namespace Domain\Sharing\Controllers;
 
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Illuminate\Support\Collection;
+use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
-use Domain\Admin\Resources\FileResource;
-use Domain\Admin\Resources\ShareResource;
-use Domain\SetupWizard\Services\HelperService;
+use Domain\Files\Resources\FileResource;
+use Domain\Sharing\Resources\ShareResource;
 use Domain\Sharing\Requests\AuthenticateShareRequest;
 
 class BrowseShareController extends Controller

src/Domain/Sharing/Controllers/FileSharedAccessController.php

@@ -1,12 +1,12 @@
 <?php
 namespace Domain\Sharing\Controllers;
 
-use Domain\Settings\Models\Zip;
-use Domain\Settings\Models\Share;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
+use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
-use Domain\Settings\Models\File as UserFile;
-use Domain\SetupWizard\Services\HelperService;
+use Domain\Files\Models\File as UserFile;
 
 class FileSharedAccessController extends Controller
 {

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -2,20 +2,20 @@
 namespace Domain\Sharing\Controllers;
 
 use Illuminate\Http\Request;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
+use Support\Demo\Actions\DemoService;
 use Illuminate\Database\Eloquent\Model;
 use Domain\Files\Requests\UploadRequest;
-use Domain\Files\Requests\MoveItemRequest;
-use Domain\Files\Requests\DeleteItemRequest;
-use Domain\Files\Requests\RenameItemRequest;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\Files\Requests\CreateFolderRequest;
-use Domain\SetupWizard\Services\HelperService;
+use Support\Services\FileManagerService;
+use Domain\Items\Requests\MoveItemRequest;
+use Domain\Items\Requests\DeleteItemRequest;
+use Domain\Items\Requests\RenameItemRequest;
+use Domain\Folders\Requests\CreateFolderRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Domain\SetupWizard\Services\FileManagerService;
 
 class ManipulateShareItemsController extends Controller
 {

src/Domain/Sharing/Controllers/ShareController.php

@@ -3,11 +3,11 @@ namespace Domain\Sharing\Controllers;
 
 use Validator;
 use Illuminate\Http\Request;
-use Domain\Settings\Models\Zip;
-use Domain\Settings\Models\Share;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use Domain\Admin\Resources\ShareResource;
+use Domain\Sharing\Resources\ShareResource;
 use Illuminate\Support\Facades\Notification;
 use Domain\Sharing\Requests\CreateShareRequest;
 use Domain\Sharing\Requests\UpdateShareRequest;

src/Domain/Sharing/Models/Share.php

@@ -1,6 +1,7 @@
 <?php
 namespace Domain\Sharing\Models;
 
+use Database\Factories\ShareFactory;
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
@@ -27,6 +28,11 @@ class Share extends Model
         'is_protected' => 'boolean',
     ];
 
+    protected static function newFactory(): ShareFactory
+    {
+        return ShareFactory::new();
+    }
+
     /**
      * Generate share link
      *

src/Domain/Subscriptions/Controllers/StripeWebhookController.php

@@ -1,8 +1,8 @@
 <?php
 namespace Domain\Subscriptions\Controllers;
 
-use Domain\Settings\Models\User;
-use Domain\SetupWizard\Services\StripeService;
+use App\Users\Models\User;
+use Domain\Subscriptions\Services\StripeService;
 use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
 
 class StripeWebhookController extends CashierController

src/Domain/Subscriptions/Controllers/SubscriptionController.php

@@ -3,13 +3,13 @@ namespace Domain\Subscriptions\Controllers;
 
 use Auth;
 use Stripe\SetupIntent;
+use App\Users\Models\User;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use Domain\Admin\Resources\UserSubscription;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\StripeService;
+use Support\Demo\Actions\DemoService;
+use App\Users\Resources\UserSubscription;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Subscriptions\Requests\StoreUpgradeAccountRequest;

src/Domain/Subscriptions/Services/StripeService.php

@@ -1,11 +1,11 @@
 <?php
-namespace App\Services;
+namespace Domain\Subscriptions\Services;
 
 use Stripe;
+use App\Users\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Laravel\Cashier\Cashier;
-use Domain\Settings\Models\User;
 use Illuminate\Support\Facades\Cache;
 use Laravel\Cashier\Exceptions\IncompletePayment;
 use Laravel\Cashier\Exceptions\PaymentActionRequired;

src/Domain/Traffic/Models/Traffic.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Settings\Models;
+namespace Domain\Traffic\Models;
 
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;

src/Domain/Trash/Controllers/TrashController.php

@@ -2,13 +2,13 @@
 namespace Domain\Trash\Controllers;
 
 use Illuminate\Http\Request;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use Support\Demo\Actions\DemoService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class TrashController extends Controller

src/Domain/Zipping/Models/Zip.php

@@ -1,7 +1,8 @@
 <?php
-namespace Domain\Zipping;
+namespace Domain\Zipping\Models;
 
 use App\Users\Models\User;
+use Database\Factories\ZipFactory;
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -17,6 +18,11 @@ class Zip extends Model
 
     protected $keyType = 'string';
 
+    protected static function newFactory(): ZipFactory
+    {
+        return ZipFactory::new();
+    }
+
     public function user(): HasOne
     {
         return $this->hasOne(User::class, 'id', 'user_id');

src/Support/Demo/Actions/DemoService.php

@@ -3,9 +3,9 @@ namespace Support\Demo\Actions;
 
 use ByteUnits\Metric;
 use Illuminate\Support\Str;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Folder;
-use Domain\Files\Requests\RenameItemRequest;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Domain\Items\Requests\RenameItemRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class DemoService

src/Support/Scheduler/Actions/SchedulerService.php

@@ -2,9 +2,9 @@
 namespace Support\Scheduler\Actions;
 
 use Carbon\Carbon;
-use Domain\Settings\Models\Zip;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
+use App\Users\Models\User;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 

src/Support/Services/FileManagerService.php

@@ -2,18 +2,18 @@
 namespace Support\Services;
 
 use DB;
+use App\Users\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Domain\Settings\Models\Zip;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
+use Domain\Files\Models\File as UserFile;
 use League\Flysystem\FileNotFoundException;
-use Domain\Files\Requests\RenameItemRequest;
-use Domain\Settings\Models\File as UserFile;
+use Domain\Items\Requests\RenameItemRequest;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class FileManagerService

src/Support/Services/HelperService.php

@@ -4,9 +4,9 @@ namespace Support\Services;
 use DB;
 use Illuminate\Support\Arr;
 use Aws\S3\MultipartUploader;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Aws\Exception\MultipartUploadException;

src/Support/helpers.php

@@ -2,17 +2,15 @@
 
 use Carbon\Carbon;
 use ByteUnits\Metric;
+use App\Users\Models\User;
 use Illuminate\Support\Str;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Sharing\Models\Share;
 use Illuminate\Support\Collection;
 use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\Language;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Storage;
+use Domain\Localization\Models\Language;
 use Intervention\Image\ImageManagerStatic as Image;
 use Illuminate\Database\Eloquent\ModelNotFoundException;