- directory refactor

This commit is contained in:
Krzysztof Rewak
2022-01-26 08:24:48 +01:00
parent 6854c7a9f8
commit 9ac804545b
56 changed files with 144 additions and 163 deletions

View File

@@ -2,11 +2,11 @@
declare(strict_types=1);
namespace Toby\Exceptions;
namespace Toby\Architecture;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Foundation\Exceptions\Handler;
class Handler extends ExceptionHandler
class ExceptionHandler extends Handler
{
protected $dontFlash = [
"current_password",

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Support\Carbon;
use Illuminate\Support\ServiceProvider;
use Toby\Models\VacationLimit;
use Toby\Scopes\SelectedYearPeriodScope;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Eloquent\Scopes\SelectedYearPeriodScope;
class AppServiceProvider extends ServiceProvider
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;

View File

@@ -2,13 +2,13 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Support\ServiceProvider;
use Toby\Models\User;
use Toby\Models\YearPeriod;
use Toby\Observers\UserObserver;
use Toby\Observers\YearPeriodObserver;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\YearPeriod;
use Toby\Eloquent\Observers\UserObserver;
use Toby\Eloquent\Observers\YearPeriodObserver;
class ObserverServiceProvider extends ServiceProvider
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Providers;
namespace Toby\Architecture\Providers;
use Illuminate\Support\ServiceProvider;
use Laravel\Telescope\TelescopeApplicationServiceProvider;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Enums;
namespace Toby\Domain;
enum EmploymentForm: string
{

View File

@@ -2,13 +2,13 @@
declare(strict_types=1);
namespace Toby\Helpers;
namespace Toby\Eloquent\Helpers;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use LasseRafn\InitialAvatarGenerator\InitialAvatar;
use SVG\SVG;
use Toby\Models\User;
use Toby\Eloquent\Models\User;
class UserAvatarGenerator
{

View File

@@ -2,10 +2,10 @@
declare(strict_types=1);
namespace Toby\Helpers;
namespace Toby\Eloquent\Helpers;
use Illuminate\Contracts\Session\Session;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Models\YearPeriod;
class YearPeriodRetriever
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Models;
namespace Toby\Eloquent\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Toby\Enums\EmploymentForm;
use Toby\Domain\EmploymentForm;
/**
* @property int $id

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Models;
namespace Toby\Eloquent\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Models;
namespace Toby\Eloquent\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Observers;
namespace Toby\Eloquent\Observers;
use Illuminate\Support\Facades\Storage;
use Toby\Helpers\UserAvatarGenerator;
use Toby\Helpers\YearPeriodRetriever;
use Toby\Models\User;
use Toby\Eloquent\Helpers\UserAvatarGenerator;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User;
class UserObserver
{

View File

@@ -2,11 +2,11 @@
declare(strict_types=1);
namespace Toby\Observers;
namespace Toby\Eloquent\Observers;
use Toby\Helpers\UserAvatarGenerator;
use Toby\Models\User;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Helpers\UserAvatarGenerator;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\YearPeriod;
class YearPeriodObserver
{

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Scopes;
namespace Toby\Eloquent\Scopes;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Scope;
use Toby\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
class SelectedYearPeriodScope implements Scope
{

View File

@@ -2,15 +2,14 @@
declare(strict_types=1);
namespace Toby\Console\Commands;
namespace Toby\Infrastructure\Console\Commands;
use Illuminate\Console\Command;
use Toby\Models\User;
use Toby\Eloquent\Models\User;
class CreateUserCommand extends Command
{
protected $signature = "user:create
{email : an email for the user}";
protected $signature = "user:create {email : an email for the user}";
protected $description = "Creates a user";
public function handle(): void

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Console;
namespace Toby\Infrastructure\Console;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;

View File

@@ -2,13 +2,13 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Contracts\Auth\Factory as AuthFactory;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Laravel\Socialite\SocialiteManager;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Toby\Models\User;
use Toby\Eloquent\Models\User;
class GoogleController extends Controller
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Toby\Helpers\YearPeriodRetriever;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\YearPeriod;
class SelectYearPeriodController extends Controller
{

View File

@@ -2,16 +2,16 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Response;
use Toby\Enums\EmploymentForm;
use Toby\Http\Requests\UserRequest;
use Toby\Http\Resources\UserFormDataResource;
use Toby\Http\Resources\UserResource;
use Toby\Models\User;
use Toby\Domain\EmploymentForm;
use Toby\Eloquent\Models\User;
use Toby\Infrastructure\Http\Requests\UserRequest;
use Toby\Infrastructure\Http\Resources\UserFormDataResource;
use Toby\Infrastructure\Http\Resources\UserResource;
class UserController extends Controller
{

View File

@@ -2,13 +2,13 @@
declare(strict_types=1);
namespace Toby\Http\Controllers;
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Inertia\Response;
use Toby\Http\Requests\VacationLimitRequest;
use Toby\Http\Resources\VacationLimitResource;
use Toby\Models\VacationLimit;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
use Toby\Infrastructure\Http\Resources\VacationLimitResource;
class VacationLimitController extends Controller
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http;
namespace Toby\Infrastructure\Http;
use Fruitcake\Cors\HandleCors;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
@@ -23,11 +23,11 @@ use Illuminate\Routing\Middleware\ValidateSignature;
use Illuminate\Session\Middleware\AuthenticateSession;
use Illuminate\Session\Middleware\StartSession;
use Illuminate\View\Middleware\ShareErrorsFromSession;
use Toby\Http\Middleware\Authenticate;
use Toby\Http\Middleware\HandleInertiaRequests;
use Toby\Http\Middleware\RedirectIfAuthenticated;
use Toby\Http\Middleware\TrimStrings;
use Toby\Http\Middleware\TrustProxies;
use Toby\Infrastructure\Http\Middleware\Authenticate;
use Toby\Infrastructure\Http\Middleware\HandleInertiaRequests;
use Toby\Infrastructure\Http\Middleware\RedirectIfAuthenticated;
use Toby\Infrastructure\Http\Middleware\TrimStrings;
use Toby\Infrastructure\Http\Middleware\TrustProxies;
class Kernel extends HttpKernel
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Middleware;
namespace Toby\Infrastructure\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Http\Middleware;
namespace Toby\Infrastructure\Http\Middleware;
use Illuminate\Http\Request;
use Inertia\Middleware;
use Toby\Helpers\YearPeriodRetriever;
use Toby\Http\Resources\UserResource;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Infrastructure\Http\Resources\UserResource;
class HandleInertiaRequests extends Middleware
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Middleware;
namespace Toby\Infrastructure\Http\Middleware;
use Closure;
use Illuminate\Http\Request;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Middleware;
namespace Toby\Infrastructure\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Middleware;
namespace Toby\Infrastructure\Http\Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Symfony\Component\HttpFoundation\Request;

View File

@@ -2,12 +2,12 @@
declare(strict_types=1);
namespace Toby\Http\Requests;
namespace Toby\Infrastructure\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Rules\Enum;
use Toby\Enums\EmploymentForm;
use Toby\Domain\EmploymentForm;
class UserRequest extends FormRequest
{

View File

@@ -2,11 +2,11 @@
declare(strict_types=1);
namespace Toby\Http\Requests;
namespace Toby\Infrastructure\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Collection;
use Toby\Models\VacationLimit;
use Toby\Eloquent\Models\VacationLimit;
class VacationLimitRequest extends FormRequest
{

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Resources;
namespace Toby\Infrastructure\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Resources;
namespace Toby\Infrastructure\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;

View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace Toby\Http\Resources;
namespace Toby\Infrastructure\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;

View File

@@ -2,13 +2,13 @@
declare(strict_types=1);
namespace Toby\Jobs;
namespace Toby\Infrastructure\Jobs;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Carbon;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Models\YearPeriod;
class CheckYearPeriod implements ShouldQueue
{