namespaces refactoring

src/App/Console/Commands/SetupDevEnvironment.php

@@ -1,16 +1,16 @@
 <?php
 namespace App\Console\Commands;
 
+use Illuminate\Support\Str;
+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\Settings\Models\Setting;
-use Illuminate\Support\Str;
-use Domain\SetupWizard\Services\SetupService;
-use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Foundation\Testing\WithFaker;
+use Domain\SetupWizard\Services\SetupService;
 
 class SetupDevEnvironment extends Command
 {

src/App/Console/Commands/SetupProdEnvironment.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Console\Commands;
 
+use Illuminate\Console\Command;
 use Domain\Settings\Models\User;
 use Domain\Settings\Models\Setting;
 use Domain\SetupWizard\Services\SetupService;
-use Illuminate\Console\Command;
 
 class SetupProdEnvironment extends Command
 {

src/App/Console/Kernel.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Console;
 
-use Domain\SetupWizard\Services\SchedulerService;
 use Illuminate\Console\Scheduling\Schedule;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProdEnvironment;
+use Domain\SetupWizard\Services\SchedulerService;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel

src/App/Http/Kernel.php

@@ -15,11 +15,11 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
-        \App\Http\Middleware\TrustProxies::class,
+        \Support\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
-        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+        \Support\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        \Support\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
@@ -30,12 +30,12 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \Support\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Support\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -55,11 +55,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'             => \App\Http\Middleware\Authenticate::class,
+        'auth'             => \Support\Middleware\Authenticate::class,
         'auth.basic'       => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'cache.headers'    => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can'              => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest'            => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest'            => \Support\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed'           => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle'         => \Illuminate\Routing\Middleware\ThrottleRequests::class,

src/App/Providers/AuthServiceProvider.php

@@ -4,8 +4,6 @@ namespace App\Providers;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
-//use Laravel\Passport\Passport;
-
 class AuthServiceProvider extends ServiceProvider
 {
     /**

src/App/Providers/FortifyServiceProvider.php

@@ -4,11 +4,11 @@ namespace App\Providers;
 use Illuminate\Http\Request;
 use Laravel\Fortify\Fortify;
 use Illuminate\Support\ServiceProvider;
+use App\Users\Actions\ResetUserPassword;
 use Illuminate\Cache\RateLimiting\Limit;
-use App\Actions\Fortify\ResetUserPassword;
-use App\Actions\Fortify\UpdateUserPassword;
+use App\Users\Actions\UpdateUserPassword;
 use Illuminate\Support\Facades\RateLimiter;
-use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Users\Actions\UpdateUserProfileInformation;
 
 class FortifyServiceProvider extends ServiceProvider
 {

src/App/Users/Actions/CreateNewUserAction.php

@@ -1,14 +1,14 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\UserSettings;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
+use Domain\Settings\Models\User;
+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/Actions/PasswordValidationRules.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Laravel\Fortify\Rules\Password;
 

src/App/Users/Actions/ResetUserPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;

src/App/Users/Actions/UpdateUserPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;

src/App/Users/Actions/UpdateUserProfileInformation.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Validator;

src/App/Users/Controllers/AccountController.php

@@ -1,31 +1,28 @@
 <?php
-namespace App\Http\Controllers\User;
+namespace App\Users\Controllers;
 
-use Domain\Settings\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\UserResource;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\RedirectResponse;
+use Domain\Admin\Resources\UserResource;
 use Laravel\Sanctum\PersonalAccessToken;
-use App\Http\Resources\InvoiceCollection;
 use Illuminate\Support\Facades\Validator;
-use App\Http\Resources\UserStorageResource;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\Admin\Resources\InvoiceCollection;
+use Domain\Admin\Resources\UserStorageResource;
+use App\Users\Requests\UpdateUserPasswordRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\User\UpdateUserPasswordRequest;
-use App\Http\Requests\User\UserCreateAccessTokenRequest;
+use App\Users\Requests\UserCreateAccessTokenRequest;
 
 class AccountController extends Controller
 {
-    /**
-     * AccountController constructor.
-     */
-    public function __construct()
-    {
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        public DemoService $demo,
+    ) {
     }
 
     /**

src/App/Users/Controllers/AuthController.php

@@ -1,9 +1,9 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Auth\CheckAccountRequest;
+use App\Users\Requests\CheckAccountRequest;
 
 class AuthController extends Controller
 {

src/App/Users/Controllers/ConfirmPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Controllers/ForgotPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

src/App/Users/Controllers/LoginController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Controllers/ResetPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

src/App/Users/Controllers/VerificationController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Models/User.php

@@ -1,18 +1,18 @@
 <?php
-namespace App\Models;
+namespace App\Users\Models;
 
 use ByteUnits\Metric;
 use Illuminate\Support\Str;
 use Laravel\Cashier\Billable;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\SetupWizard\Services\StripeService;
 use Laravel\Sanctum\HasApiTokens;
 use Kyslik\ColumnSortable\Sortable;
-use App\Notifications\ResetPassword;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
 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 Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 

src/App/Users/Models/UserSettings.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace App\Users\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;

src/App/Users/Notifications/ResetPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Notifications;
+namespace App\Users\Notifications;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;

src/App/Users/Requests/CheckAccountRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Auth;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Requests/UpdateUserPasswordRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\User;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Requests/UserCreateAccessTokenRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\User;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Resources/UserResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/App/Users/Resources/UserStorageResource.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
-use Domain\Settings\Models\File;
 use ByteUnits\Metric;
+use Domain\Settings\Models\File;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserStorageResource extends JsonResource

src/App/Users/Resources/UserSubscription.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/App/Users/Resources/UsersCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;