app/Auth/ResetPassword.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Auth\Mails;
+namespace App\Auth;
 
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Lang;
@@ -17,7 +17,7 @@ class ResetPassword extends BaseResetPassword
     protected function buildMailMessage($url)
     {
         return (new MailMessage)
-            ->subject(Lang::get('Passwort zurücksetzen | ' . config('app.name')))
+            ->subject(Lang::get('Passwort zurücksetzen | Adrema'))
             ->line(Lang::get('Du erhälst diese E-Mail, weil du eine Anfrage zum zurücksetzen deines Account-Passworts gestellt hast.'))
             ->action(Lang::get('Passwort zurücksetzen'), $url)
             ->line(Lang::get('Dieser Link wird in :count Minuten ablaufen.', ['count' => config('auth.passwords.' . config('auth.defaults.passwords') . '.expire')]))

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -6,7 +6,7 @@ use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use Modules\Invoice\InvoiceSettings;
+use App\Invoice\InvoiceSettings;
 use Illuminate\Support\Collection;
 
 class CityFrankfurtMainDocument extends ContributionDocument

app/Contribution/Documents/CitySolingenDocument.php

@@ -3,7 +3,7 @@
 namespace App\Contribution\Documents;
 
 use App\Contribution\Data\MemberData;
-use Modules\Invoice\InvoiceSettings;
+use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Zoomyboy\Tex\Engine;

app/Efz/EfzPendingBlock.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Efz;
+
+use App\Dashboard\Blocks\Block;
+use App\Member\Member;
+use Illuminate\Database\Eloquent\Builder;
+
+class EfzPendingBlock extends Block
+{
+    /**
+     * @return Builder<Member>
+     */
+    public function query(): Builder
+    {
+        return Member::where(function ($query) {
+            return $query->where('efz', '<=', now()->subYears(5)->endOfYear())
+                ->orWhereNull('efz');
+        })
+            ->whereCurrentGroup()
+            ->orderByRaw('lastname, firstname')
+            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
+    }
+
+    /**
+     * @return array{members: array<int, string>}
+     */
+    public function data(): array
+    {
+        return [
+            'members' => $this->query()->get()->map(fn ($member) => $member->fullname)->toArray(),
+        ];
+    }
+
+    public function component(): string
+    {
+        return 'efz-pending';
+    }
+
+    public function title(): string
+    {
+        return 'Ausstehende Führungszeugnisse';
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Inertia\Response;
+
+class LoginController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest')->except('logout');
+    }
+
+    public function showLoginForm(): Response
+    {
+        session()->put('title', 'Anmelden');
+
+        return \Inertia::render('authentication/VLogin');
+    }
+
+    /**
+     * Validate the user login request.
+     */
+    protected function validateLogin(Request $request): void
+    {
+        $request->validate([
+            $this->username() => 'required|max:255|string|email',
+            'password' => 'required|string',
+        ]);
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use App\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+
+class RegisterController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+
+    /**
+     * Where to redirect users after registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @return \App\User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => Hash::make($data['password']),
+        ]);
+    }
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Inertia\Response;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Display the password reset view for the given token.
+     *
+     * If no token is present, display the link request form.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     */
+    public function showResetForm(Request $request): Response
+    {
+        $token = $request->route()->parameter('token');
+
+        return Inertia::render('authentication/PasswordResetConfirm', [
+            'token' => $token,
+            'email' => $request->email,
+        ]);
+    }
+}

app/Http/Middleware/HandleInertiaRequests.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Http\Resources\UserResource;
-use Modules\Module\ModuleSettings;
+use App\Module\ModuleSettings;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Session;
 use Inertia\Middleware;

app/Invoice/InvoiceDocument.php

@@ -6,7 +6,6 @@ use App\Invoice\Models\Invoice;
 use App\Payment\Payment;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Str;
-use Modules\Invoice\InvoiceSettings;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Engine;
 use Zoomyboy\Tex\Template;

app/Invoice/InvoiceSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Invoice;
+namespace App\Invoice;
 
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;

app/Invoice/MemberPaymentBlock.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Invoice;
+
+use App\Dashboard\Blocks\Block;
+use App\Invoice\Models\InvoicePosition;
+use App\Member\Member;
+
+class MemberPaymentBlock extends Block
+{
+    /**
+     * @return array<string, string|int>
+     */
+    public function data(): array
+    {
+        $amount = InvoicePosition::whereHas('invoice', fn ($query) => $query->whereNeedsPayment())
+            ->selectRaw('sum(price) AS price')
+            ->first();
+        $members = Member::whereHasPendingPayment()->count();
+
+        return [
+            'members' => $members,
+            'total_members' => Member::count(),
+            'amount' => number_format((int) $amount->price / 100, 2, ',', '.') . ' €',
+        ];
+    }
+
+    public function component(): string
+    {
+        return 'member-payment';
+    }
+
+    public function title(): string
+    {
+        return 'Ausstehende Mitgliedsbeiträge';
+    }
+}

app/Invoice/Models/Invoice.php

@@ -6,7 +6,7 @@ use App\Invoice\BillDocument;
 use App\Invoice\BillKind;
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\InvoiceDocument;
-use Modules\Invoice\InvoiceSettings;
+use App\Invoice\InvoiceSettings;
 use App\Invoice\RememberDocument;
 use App\Invoice\Scopes\InvoiceFilterScope;
 use App\Member\Member;

app/Lib/Editor/EditorData.php

@@ -2,16 +2,12 @@
 
 namespace App\Lib\Editor;
 
-use Livewire\Wireable;
-use Spatie\LaravelData\Concerns\WireableData;
 use Spatie\LaravelData\Data;
 
 /** @todo replace blocks with actual block data classes */
-class EditorData extends Data implements Editorable, Wireable
+class EditorData extends Data implements Editorable
 {
 
-    use WireableData;
-
     /** @param array<int, mixed> $blocks */
     public function __construct(
         public string $version,

app/Maildispatcher/Models/Maildispatcher.php

@@ -2,7 +2,7 @@
 
 namespace App\Maildispatcher\Models;
 
-use Modules\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Models\Mailgateway;
 use Database\Factories\Maildispatcher\Models\MaildispatcherFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Maildispatcher/Resources/MaildispatcherResource.php

@@ -4,7 +4,8 @@ namespace App\Maildispatcher\Resources;
 
 use App\Lib\HasMeta;
 use App\Maildispatcher\Models\Maildispatcher;
-use Modules\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Resources\MailgatewayResource;
 use App\Member\FilterScope;
 use App\Member\Member;
 use Illuminate\Http\Resources\Json\JsonResource;

app/Mailgateway/Actions/StoreAction.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Mailgateway\Actions;
+
+use App\Mailgateway\Models\Mailgateway;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StoreAction
+{
+    use AsAction;
+    use ValidatesRequests;
+
+    /**
+     * @param array<string, mixed> $input
+     */
+    public function handle(array $input): void
+    {
+        $this->checkIfWorks($input);
+        Mailgateway::create($input);
+    }
+
+    public function asController(ActionRequest $request): void
+    {
+        $this->handle($request->validated());
+    }
+}

app/Mailgateway/Actions/UpdateAction.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Mailgateway\Actions;
+
+use App\Mailgateway\Models\Mailgateway;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class UpdateAction
+{
+    use AsAction;
+    use ValidatesRequests;
+
+    /**
+     * @param array<string, mixed> $input
+     */
+    public function handle(Mailgateway $mailgateway, array $input): void
+    {
+        $this->checkIfWorks($input);
+
+        $mailgateway->update($input);
+    }
+
+    public function asController(Mailgateway $mailgateway, ActionRequest $request): void
+    {
+        $this->handle($mailgateway, $request->validated());
+    }
+}

app/Mailgateway/Actions/ValidatesRequests.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Mailgateway\Actions;
+
+use App\Mailgateway\Types\Type;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+use Lorisleiva\Actions\ActionRequest;
+
+trait ValidatesRequests
+{
+    /**
+     * @param array<string, mixed> $input
+     */
+    public function checkIfWorks(array $input): void
+    {
+        if (!app(data_get($input, 'type.cls'))->setParams($input['type']['params'])->works()) {
+            throw ValidationException::withMessages(['connection' => 'Verbindung fehlgeschlagen.']);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'domain' => 'required|string|max:255',
+            ...$this->typeValidation(),
+            'type.params' => 'present|array',
+            ...collect(request()->input('type.cls')::rules('storeValidator'))->mapWithKeys(fn ($rules, $key) => ["type.params.{$key}" => $rules]),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getValidationAttributes(): array
+    {
+        return [
+            'type.cls' => 'Typ',
+            'name' => 'Beschreibung',
+            'domain' => 'Domain',
+            ...collect(request()->input('type.cls')::fieldNames())->mapWithKeys(fn ($attribute, $key) => ["type.params.{$key}" => $attribute]),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function typeValidation(): array
+    {
+        return [
+            'type.cls' => ['required', 'string', 'max:255', Rule::in(app('mail-gateways'))],
+        ];
+    }
+
+    public function prepareForValidation(ActionRequest $request): void
+    {
+        if (!is_subclass_of(request()->input('type.cls'), Type::class)) {
+            throw ValidationException::withMessages(['type.cls' => 'Typ ist nicht valide.']);
+        }
+    }
+}

app/Mailgateway/Casts/TypeCast.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Mailgateway\Casts;
+
+use App\Mailgateway\Types\Type;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+/**
+ * @implements CastsAttributes<Type, Type>
+ */
+class TypeCast implements CastsAttributes
+{
+    /**
+     * Cast the given value.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param mixed                               $value
+     * @param array<string, mixed>                $attributes
+     *
+     * @return mixed
+     */
+    public function get($model, string $key, $value, array $attributes)
+    {
+        $value = json_decode($value, true);
+
+        return app($value['cls'])->setParams($value['params']);
+    }
+
+    /**
+     * Prepare the given value for storage.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param mixed                               $value
+     * @param array<string, mixed>                $attributes
+     *
+     * @return mixed
+     */
+    public function set($model, string $key, $value, array $attributes)
+    {
+        return json_encode($value);
+    }
+}

app/Mailgateway/MailgatewaySettings.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Modules\Mailgateway;
+namespace App\Mailgateway;
 
+use App\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Resources\MailgatewayResource;
 use App\Setting\LocalSettings;
 
 class MailgatewaySettings extends LocalSettings
@@ -21,6 +23,8 @@ class MailgatewaySettings extends LocalSettings
      */
     public function viewData(): array
     {
-        return [];
+        return [
+            'data' => MailgatewayResource::collection(Mailgateway::paginate(10)),
+        ];
     }
 }

app/Mailgateway/Models/Mailgateway.php

@@ -1,21 +1,19 @@
 <?php
 
-namespace Modules\Mailgateway\Models;
+namespace App\Mailgateway\Models;
 
-use Modules\Mailgateway\Types\Type;
+use App\Mailgateway\Casts\TypeCast;
+use Database\Factories\Mailgateway\Models\MailgatewayFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Mailgateway extends Model
 {
-
-    public static $factory = MailgatewayFactory::class;
-
     /** @use HasFactory<MailgatewayFactory> */
     use HasFactory;
     use HasUuids;
 
-    public $casts = ['type' => Type::class];
+    public $casts = ['type' => TypeCast::class];
     public $guarded = [];
 }

app/Mailgateway/Resources/MailgatewayResource.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Mailgateway\Resources;
+
+use App\Lib\HasMeta;
+use App\Mailgateway\Models\Mailgateway;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin Mailgateway
+ */
+class MailgatewayResource extends JsonResource
+{
+    use HasMeta;
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray($request)
+    {
+        return [
+            'name' => $this->name,
+            'domain' => $this->domain,
+            'type_human' => $this->type::name(),
+            'works' => $this->type->works(),
+            'type' => $this->type->toResource(),
+            'id' => $this->id,
+            'links' => [
+                'update' => route('mailgateway.update', ['mailgateway' => $this->getModel()]),
+            ],
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function meta(): array
+    {
+        return [
+            'links' => [
+                'store' => route('mailgateway.store'),
+            ],
+            'types' => app('mail-gateways')->map(fn ($gateway) => [
+                'id' => $gateway,
+                'name' => $gateway::name(),
+                'fields' => $gateway::presentFields('storeValidator'),
+                'defaults' => (object) $gateway::defaults(),
+            ])->prepend([
+                'id' => null,
+                'name' => '-- kein --',
+                'fields' => [],
+                'defaults' => (object) [],
+            ]),
+            'default' => [
+                'domain' => '',
+                'name' => '',
+                'type' => [
+                    'params' => [],
+                    'cls' => null,
+                ],
+            ],
+        ];
+    }
+}

app/Mailgateway/Types/LocalType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Mailgateway\Types;
+namespace App\Mailgateway\Types;
 
 use App\Maildispatcher\Data\MailEntry;
 use App\Maildispatcher\Models\Localmaildispatcher;

app/Mailgateway/Types/MailmanType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Mailgateway\Types;
+namespace App\Mailgateway\Types;
 
 use App\Maildispatcher\Data\MailEntry;
 use App\Mailman\Data\MailingList;
@@ -45,28 +45,32 @@ class MailmanType extends Type
                 'name' => 'url',
                 'label' => 'URL',
                 'type' => 'text',
-                'validator' => 'required|max:255',
+                'storeValidator' => 'required|max:255',
+                'updateValidator' => 'required|max:255',
                 'default' => '',
             ],
             [
                 'name' => 'user',
                 'label' => 'Benutzer',
                 'type' => 'text',
-                'validator' => 'required|max:255',
+                'storeValidator' => 'required|max:255',
+                'updateValidator' => 'required|max:255',
                 'default' => '',
             ],
             [
                 'name' => 'password',
                 'label' => 'Passwort',
                 'type' => 'password',
-                'validator' => 'required|max:255',
+                'storeValidator' => 'required|max:255',
+                'updateValidator' => 'nullable|max:255',
                 'default' => '',
             ],
             [
                 'name' => 'owner',
                 'label' => 'E-Mail-Adresse des Eigentümers',
                 'type' => 'email',
-                'validator' => 'required|email|max:255',
+                'storeValidator' => 'required|email|max:255',
+                'updateValidator' => 'required|email|max:255',
                 'default' => '',
             ],
         ];

app/Mailgateway/Types/Type.php

@@ -1,18 +1,12 @@
 <?php
 
-namespace Modules\Mailgateway\Types;
+namespace App\Mailgateway\Types;
 
 use App\Maildispatcher\Data\MailEntry;
 use Illuminate\Support\Collection;
-use Livewire\Wireable;
-use Spatie\LaravelData\Concerns\WireableData;
-use Spatie\LaravelData\Data;
 
-abstract class Type extends Data implements Wireable
+abstract class Type
 {
-
-    use WireableData;
-
     abstract public static function name(): string;
 
     /**
@@ -66,13 +60,24 @@ abstract class Type extends Data implements Wireable
     /**
      * @return array<string, mixed>
      */
-    public static function rules(): array
+    public static function rules(string $validator): array
     {
         return collect(static::fields())->mapWithKeys(fn ($field) => [
-            $field['name'] => $field['validator'],
+            $field['name'] => $field[$validator],
         ])->toArray();
     }
 
+    /**
+     * @return array<string, array<string, mixed>>
+     */
+    public function toResource(): array
+    {
+        return [
+            'cls' => get_class($this),
+            'params' => get_object_vars($this),
+        ];
+    }
+
     /**
      * @param Collection<int, MailEntry> $results
      */

app/Member/PsPendingBlock.php

@@ -1,23 +1,18 @@
 <?php
 
-namespace Modules\Prevention;
+namespace App\Member;
 
-use App\Member\Member;
-use Modules\Dashboard\Block;
+use App\Dashboard\Blocks\Block;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 
 class PsPendingBlock extends Block
 {
-
     /**
-     * @var Collection<Member>
+     * @return Builder<Member>
      */
-    public Collection $members;
-
-    public function mount(): void
+    public function query(): Builder
     {
-        $this->members = Member::where(function ($query) {
+        return Member::where(function ($query) {
             $time = now()->subYears(5)->endOfYear();
 
             return $query
@@ -28,25 +23,28 @@ class PsPendingBlock extends Block
         })
             ->whereCurrentGroup()
             ->orderByRaw('lastname, firstname')
-            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active())
-            ->get();
+            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
+    }
+
+    /**
+     * @return array{members: array{fullname: string}}
+     */
+    public function data(): array
+    {
+        return [
+            'members' => $this->query()->get()->map(fn ($member) => [
+                'fullname' => $member->fullname,
+            ])->toArray(),
+        ];
+    }
+
+    public function component(): string
+    {
+        return 'ps-pending';
     }
 
     public function title(): string
     {
         return 'Ausstehende Präventionsschulungen';
     }
-
-    public function render(): string
-    {
-        return <<<'HTML'
-            <div>
-                @foreach ($members as $member)
-                <div class="flex mt-2 items-center leading-none text-gray-100">
-                    <span class="grow">{{ $member->fullname }}</span>
-                </div>
-                @endforeach
-            </div>
-        HTML;
-    }
 }

app/Membership/TestersBlock.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Membership;
+
+use App\Dashboard\Blocks\Block;
+use App\Member\Member;
+use Illuminate\Database\Eloquent\Builder;
+
+class TestersBlock extends Block
+{
+    /**
+     * @return Builder<Member>
+     */
+    public function query(): Builder
+    {
+        return Member::whereHas('memberships', fn ($q) => $q->isTrying())
+            ->with('memberships', fn ($q) => $q->isTrying());
+    }
+
+    /**
+     * @return array{members: array<int, array{name: string, try_ends_at: string, try_ends_at_human: string}>}
+     */
+    public function data(): array
+    {
+        return [
+            'members' => $this->query()->get()->map(fn ($member) => [
+                'name' => $member->fullname,
+                'try_ends_at' => $member->memberships->first()->from->addWeeks(8)->format('d.m.Y'),
+                'try_ends_at_human' => $member->memberships->first()->from->addWeeks(8)->diffForHumans(),
+            ])->toArray(),
+        ];
+    }
+
+    public function component(): string
+    {
+        return 'testers';
+    }
+
+    public function title(): string
+    {
+        return 'Endende Schhnupperzeiten';
+    }
+}

app/Module/ModuleSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Module;
+namespace App\Module;
 
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;

app/Prevention/Actions/SettingApiAction.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Prevention\Actions;
+
+use App\Prevention\PreventionSettings;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingApiAction
+{
+    use AsAction;
+
+    public function handle(): JsonResponse
+    {
+        return response()->json([
+            'data' => app(PreventionSettings::class)->toArray(),
+        ]);
+    }
+}

app/Prevention/Actions/SettingStoreAction.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Prevention\Actions;
+
+use App\Lib\Editor\EditorData;
+use App\Lib\Events\Succeeded;
+use App\Prevention\PreventionSettings;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingStoreAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, string>
+     */
+    public function rules(): array
+    {
+        return [
+            'formmail' => 'array',
+        ];
+    }
+
+    public function handle(ActionRequest $request): void
+    {
+        $settings = app(PreventionSettings::class);
+        $settings->formmail = EditorData::from($request->formmail);
+        $settings->save();
+
+        Succeeded::message('Einstellungen gespeichert.')->dispatch();
+    }
+}

app/Prevention/Mails/PreventionRememberMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Prevention\Mails;
 
+use App\Invoice\InvoiceSettings;
 use App\Lib\Editor\EditorData;
 use App\Prevention\Contracts\Preventable;
 use Illuminate\Bus\Queueable;
@@ -10,7 +11,6 @@ use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
-use Modules\Invoice\InvoiceSettings;
 
 class PreventionRememberMail extends Mailable
 {

app/Providers/AppServiceProvider.php

@@ -3,10 +3,13 @@
 namespace App\Providers;
 
 use App\Form\Models\Form;
+use App\Mailgateway\Types\LocalType;
+use App\Mailgateway\Types\MailmanType;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Laravel\Telescope\Telescope;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -27,6 +30,11 @@ class AppServiceProvider extends ServiceProvider
             return $this;
         });
 
+        app()->bind('mail-gateways', fn () => collect([
+            LocalType::class,
+            MailmanType::class,
+        ]));
+
         app()->extend('media-library-helpers', fn ($p) => $p->put('form', Form::class));
 
         Blade::componentNamespace('App\\View\\Mail', 'mail-view');

app/Providers/BaseServiceProvider.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\View\ComponentAttributeBag;
-use Livewire\Livewire;
-
-class BaseServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     */
-    public function register(): void
-    {
-        Blade::componentNamespace('App\\View\\Ui', 'ui');
-        Blade::componentNamespace('App\\View\\Page', 'page');
-        Blade::componentNamespace('App\\View\\Form', 'form');
-
-        ComponentAttributeBag::macro('mergeWhen', function ($condition, $key, $attributes) {
-            /** @var ComponentAttributeBag */
-            $self = $this;
-            return $condition ? $self->merge([$key => $attributes]) : $self;
-        });
-
-        Livewire::resolveMissingComponent(function ($name) {
-            'modules.dashboard.components.dashboard-component';
-            if (str($name)->startsWith('modules.')) {
-                return str($name)->explode('.')->map(fn ($name) => str($name)->studly()->toString())->implode('\\');
-            }
-
-            return null;
-        });
-    }
-
-    /**
-     * Bootstrap services.
-     */
-    public function boot(): void
-    {
-    }
-}

app/Setting/Actions/StoreAction.php

@@ -7,7 +7,6 @@ use Illuminate\Http\RedirectResponse;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
-/** @deprecated */
 class StoreAction
 {
     use AsAction;

app/Setting/Actions/ViewAction.php

@@ -8,7 +8,6 @@ use Inertia\Inertia;
 use Inertia\Response;
 use Lorisleiva\Actions\Concerns\AsAction;
 
-/** @deprecated */
 class ViewAction
 {
     use AsAction;

app/Setting/Data/SettingSynthesizer.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Setting\Data;
-
-use Livewire\Mechanisms\HandleComponents\Synthesizers\Synth;
-use Spatie\LaravelSettings\Settings;
-
-class SettingSynthesizer extends Synth
-{
-    public static $key = 'setting-class';
-
-    public static function match($target)
-    {
-        return $target instanceof Settings;
-    }
-
-    public function dehydrate($target)
-    {
-        return [$target->toArray(), ['setting_class' => get_class($target)]];
-    }
-
-    public function hydrate($value, $meta)
-    {
-        return app($meta['setting_class'])->fill($value);
-    }
-
-    public function get(&$target, $key)
-    {
-        return $target->{$key};
-    }
-
-    public function set(&$target, $key, $value)
-    {
-        $target->{$key} = $value;
-    }
-}

app/Setting/LocalSettings.php

@@ -10,7 +10,7 @@ abstract class LocalSettings extends Settings
 
     public function url(): string
     {
-        return url('setting/' . $this->group());
+        return route('setting.view', ['settingGroup' => $this->group()]);
     }
 
     /**

app/Setting/NamiSettings.php

@@ -3,10 +3,14 @@
 namespace App\Setting;
 
 use App\Group;
+use App\Initialize\Actions\NamiLoginCheckAction;
+use App\Nami\Actions\SettingSaveAction;
+use App\Setting\Contracts\Storeable;
+use Lorisleiva\Actions\ActionRequest;
 use Zoomyboy\LaravelNami\Api;
 use Zoomyboy\LaravelNami\Nami;
 
-class NamiSettings extends LocalSettings
+class NamiSettings extends LocalSettings implements Storeable
 {
     public int $mglnr;
 
@@ -39,6 +43,14 @@ class NamiSettings extends LocalSettings
         ];
     }
 
+    public function beforeSave(ActionRequest $request): void
+    {
+        NamiLoginCheckAction::run([
+            'mglnr' => $request->mglnr,
+            'password' => $request->password,
+        ]);
+    }
+
     public function localGroup(): ?Group
     {
         return Group::firstWhere('nami_id', $this->default_group_id);

app/Setting/SettingFactory.php

@@ -2,8 +2,9 @@
 
 namespace App\Setting;
 
+use App\Invoice\InvoiceSettings;
+use App\Setting\Contracts\Storeable;
 use Illuminate\Routing\Router;
-use Illuminate\Support\Collection;
 
 class SettingFactory
 {
@@ -25,11 +26,16 @@ class SettingFactory
     }
 
     /**
-     * @return Collection<int, LocalSettings>
+     * @return array<int, array{url: string, is_active: bool}>
      */
-    public function all(): Collection
+    public function getShare(): array
     {
-        return collect($this->settings)->map(fn ($setting) => new $setting);
+        return collect($this->settings)->map(fn ($setting) => [
+            'url' => (new $setting)->url(),
+            'is_active' => url(request()->path()) === (new $setting)->url(),
+            'title' => $setting::title(),
+        ])
+            ->toArray();
     }
 
     public function resolveGroupName(string $name): LocalSettings

app/Setting/SettingServiceProvider.php

@@ -2,12 +2,16 @@
 
 namespace App\Setting;
 
-use Modules\Module\ModuleSettings;
-use App\Setting\Data\SettingSynthesizer;
+use App\Fileshare\FileshareSettings;
+use App\Form\FormSettings;
+use App\Invoice\InvoiceSettings;
+use App\Mailgateway\MailgatewaySettings;
+use App\Module\ModuleSettings;
+use App\Prevention\PreventionSettings;
+use App\Setting\Actions\StoreAction;
+use App\Setting\Actions\ViewAction;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
-use Livewire\Livewire;
-use Modules\Invoice\InvoiceSettings;
 
 class SettingServiceProvider extends ServiceProvider
 {
@@ -20,6 +24,9 @@ class SettingServiceProvider extends ServiceProvider
     {
         app()->singleton(SettingFactory::class, fn () => new SettingFactory());
         app(Router::class)->bind('settingGroup', fn ($param) => app(SettingFactory::class)->resolveGroupName($param));
+        app(Router::class)->middleware(['web', 'auth:web'])->name('setting.view')->get('/setting/{settingGroup}', ViewAction::class);
+        app(Router::class)->middleware(['web', 'auth:web'])->name('setting.data')->get('/setting/{settingGroup}/data', ViewAction::class);
+        app(Router::class)->middleware(['web', 'auth:web'])->name('setting.store')->post('/setting/{settingGroup}', StoreAction::class);
     }
 
     /**
@@ -31,8 +38,10 @@ class SettingServiceProvider extends ServiceProvider
     {
         app(SettingFactory::class)->register(ModuleSettings::class);
         app(SettingFactory::class)->register(InvoiceSettings::class);
+        app(SettingFactory::class)->register(MailgatewaySettings::class);
         app(SettingFactory::class)->register(NamiSettings::class);
-
-        Livewire::propertySynthesizer(SettingSynthesizer::class);
+        app(SettingFactory::class)->register(FormSettings::class);
+        app(SettingFactory::class)->register(FileshareSettings::class);
+        app(SettingFactory::class)->register(PreventionSettings::class);
     }
 }

app/User.php

@@ -2,11 +2,11 @@
 
 namespace App;
 
+use App\Auth\ResetPassword;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Modules\Auth\Mails\ResetPassword;
 
 class User extends Authenticatable
 {

app/View/Enums/Variant.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\View\Enums;
-
-use Illuminate\Support\Collection;
-use InvalidArgumentException;
-
-enum Variant: string
-{
-
-    case PRIMARY = 'primary';
-    case SECONDARY = 'secondary';
-    case PRIMARYLIGHT = 'primary-light';
-    case WARNING = 'warning';
-    case INFO = 'info';
-    case DANGER = 'danger';
-
-    public function foreground(): string
-    {
-        return match ($this) {
-            self::PRIMARY => 'text-primary-300',
-            self::SECONDARY => 'text-primary-400',
-            self::PRIMARYLIGHT => 'text-primary-200',
-            self::WARNING => 'text-yellow-300',
-            self::INFO => 'text-blue-300',
-            self::DANGER => 'text-red-100',
-        };
-    }
-
-    public function background(): string
-    {
-        return match ($this) {
-            self::PRIMARY => 'bg-primary-700',
-            self::SECONDARY => 'bg-primary-800',
-            self::PRIMARYLIGHT => 'bg-primary-600',
-            self::WARNING => 'bg-yellow-700',
-            self::INFO => 'bg-blue-700',
-            self::DANGER => 'bg-red-400',
-        };
-    }
-
-    public function hoverForeground(): string
-    {
-        return match ($this) {
-            self::PRIMARY => 'hover:text-primary-100',
-            self::SECONDARY => 'hover:text-primary-200',
-            self::PRIMARYLIGHT => 'hover:text-primary-100',
-            self::WARNING => 'hover:text-yellow-100',
-            self::INFO => 'hover:text-blue-100',
-            self::DANGER => 'hover:text-red-100',
-        };
-    }
-
-    public function hoverBackground(): string
-    {
-        return match ($this) {
-            self::PRIMARY => 'hover:bg-primary-500',
-            self::SECONDARY => 'hover:bg-primary-600',
-            self::PRIMARYLIGHT => 'hover:bg-primary-500',
-            self::WARNING => 'hover:bg-yellow-500',
-            self::INFO => 'hover:bg-blue-500',
-            self::DANGER => 'hover:bg-red-500',
-        };
-    }
-
-    public static function fromString(string $input): self
-    {
-        return collect(static::cases())
-            ->first(fn ($variant) => $variant->value === $input)
-            ?: throw new InvalidArgumentException("Unknown variant: {$input} - Available Variants: " . self::values()->implode(', '));
-    }
-
-    public static function values(): Collection
-    {
-        return collect(static::cases())->map(fn ($variant) => $variant->value);
-    }
-}

app/View/Form/Editor.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Editor extends Component
-{
-
-    use HasFormDimensions;
-
-    public string $id;
-
-    public function __construct(
-        public string $name,
-        public string $size = 'default',
-        public ?string $hint = null,
-        public bool $required = false,
-        public string $label = '',
-    ) {
-        $this->id = str()->uuid()->toString();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="flex flex-col group {{$heightClass}}">
-                @if ($label)
-                <x-form::label :required="$required">{{$label}}</x-form::label>
-                @endif
-
-                <div class="relative w-full h-full">
-                    <div class="
-                        w-full border-gray-600 border-solid text-gray-300 bg-gray-700 leading-none rounded-lg
-                        group-[.size-default]:border-2 group-[.size-sm]:border
-                        group-[.size-default]:text-sm group-[.size-sm]:text-xs
-                        group-[.size-default]:p-2 group-[.size-sm]:p-1
-                        " @updated="$wire.{{$attributes->wire('model')->value}} = $event.detail" x-bind="editor"x-data="{
-                            value: $wire.{{$attributes->wire('model')->value}},
-                        }" id="{{$id}}" {{$attributes}}></div>
-                    <x-ui::errors :for="$name" />
-                    @if($hint)
-                    <x-form::hint>{{$hint}}</x-form::hint>
-                    @endif
-                </div>
-            </div>
-        HTML;
-    }
-}

app/View/Form/Hint.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Hint extends Component
-{
-
-    use HasFormDimensions;
-
-    public function __construct(
-        public bool $required = false,
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div {{ $attributes->merge(['class' => 'h-full items-center flex absolute top-0 right-0']) }}>
-                <div x-tooltip.raw="{{$slot}}" class="mr-2">
-                    <x-ui::sprite src="info-button" class="w-5 h-5 text-primary-700"></x-ui::sprite>
-                </div>
-            </div>
-        HTML;
-    }
-}

app/View/Form/Label.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Label extends Component
-{
-
-    use HasFormDimensions;
-
-    public function __construct(
-        public bool $required = false,
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <span class="font-semibold leading-none text-gray-400 group-[.size-default]:text-sm group-[.size-sm]:text-xs">
-                {{ $slot }}
-                @if ($required)
-                <span class="text-red-800">&nbsp;*</span>
-                @endif
-            </span>
-        HTML;
-    }
-}

app/View/Form/Lever.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Lever extends Component
-{
-
-    use HasFormDimensions;
-
-    public string $id;
-
-    public function __construct(
-        public string $name,
-        public string $size = 'default',
-        public $value = null,
-        public ?string $hint = null,
-        public bool $disabled = false,
-        public bool $required = false,
-        public string $label = '',
-    ) {
-        $this->id = str()->uuid()->toString();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <label class="flex flex-col items-start group {{$heightClass}} " for="{{$id}}" style="{{$heightVars}}">
-                @if ($label)
-                <x-form::label :required="$required">{{$label}}</x-form::label>
-                @endif
-                <span class="relative flex-none flex h-[var(--height)] @if($hint) pr-8 @endif">
-                    <input id="{{$id}}" type="checkbox" name="{{$name}}" value="{{$value}}" @if($disabled) disabled="disabled" @endif class="absolute peer opacity-0" {{ $attributes }} />
-                    <span class="relative cursor-pointer h-full w-[calc(var(--height)*2)] rounded peer-focus:bg-red-500 duration-300 bg-gray-700 peer-checked:bg-primary-700"></span>
-                    <span class="absolute h-full top-0 left-0 flex-none flex justify-center items-center aspect-square">
-                        <x-ui::sprite
-                            class="relative text-gray-400 flex-none text-white duration-300 group-[.size-default]:size-3 group-[.size-sm]:size-2"
-                            src="check"
-                        ></x-ui::sprite>
-                    </span>
-                    <span class="absolute h-full top-0 left-[var(--height)] flex-none flex justify-center items-center aspect-square">
-                        <x-ui::sprite
-                            class="relative text-gray-400 flex-none text-white duration-300 group-[.size-default]:size-3 group-[.size-sm]:size-2"
-                            src="close"
-                        ></x-ui::sprite>
-                    </span>
-                    <var class="absolute duration-300 bg-gray-400 rounded
-                        top-[var(--padding)] left-[var(--padding)]
-                        size-[calc(var(--height)-var(--padding)*2)] peer-checked:left-[calc(var(--height)+var(--padding))]"
-                    ></var>
-                    @if($hint)
-                    <x-form::hint>{{$hint}}</x-form::hint>
-                    @endif
-                </span>
-            </label>
-        HTML;
-    }
-}

app/View/Form/SaveButton.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use Illuminate\View\Component;
-
-class SaveButton extends Component
-{
-
-    public function __construct(public string $form = '')
-    {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <button @if($form) form="{{$form}}" @endif type="submit" class="flex items-center transition-all justify-center w-8 h-8 bg-primary-700 hover:bg-primary-600 rounded" x-tooltip="`speichern`">
-                <x-ui::sprite class="w-4 h-4 text-white" src="save"></x-ui::sprite>
-            </button>
-        HTML;
-    }
-}

app/View/Form/Select.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Select extends Component
-{
-
-    use HasFormDimensions;
-
-    public string $id;
-
-    public function __construct(
-        public string $name,
-        public string $size = 'default',
-        public ?string $hint = null,
-        public bool $required = false,
-        public string $label = '',
-        public $options = [],
-        public bool $disabled = false,
-    ) {
-        $this->id = str()->uuid()->toString();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <label class="flex flex-col group {{$heightClass}}" for="{{$id}}" style="{{$heightVars}}">
-                @if ($label)
-                <x-form::label :required="$required">{{$label}}</x-form::label>
-                @endif
-
-                <div class="relative flex-none flex">
-                    <select {{$attributes}} @if($disabled) disabled @endif name="{{$name}}" id="{{$id}}"
-                        class="
-                            w-full h-[var(--height)] border-gray-600 border-solid text-gray-300 bg-gray-700 leading-none rounded-lg
-                            group-[.size-default]:border-2 group-[.size-sm]:border
-                            group-[.size-default]:text-sm group-[.size-sm]:text-xs
-                            group-[.size-default]:px-2 group-[.size-sm]:px-1
-                            py-0
-                        "
-                    >
-                        <option value="">-- kein --</option>
-                        @foreach ($options as $option)
-                        <option value="{{$option['id']}}">{{ $option['name'] }}</option>
-                        @endforeach
-                    </select>
-                    <x-ui::errors :for="$name" />
-                    @if($hint)
-                    <x-form::hint class="right-6">{{$hint}}</x-form::hint>
-                    @endif
-                </div>
-
-            </label>
-        HTML;
-    }
-}

app/View/Form/Text.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\View\Form;
-
-use App\View\Traits\HasFormDimensions;
-use Illuminate\View\Component;
-
-class Text extends Component
-{
-
-    use HasFormDimensions;
-
-    public string $id;
-
-    public function __construct(
-        public string $name,
-        public string $size = 'default',
-        public ?string $hint = null,
-        public bool $required = false,
-        public string $label = '',
-        public string $type = 'text'
-    ) {
-        $this->id = str()->uuid()->toString();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <label class="flex flex-col group {{$heightClass}}" for="{{$id}}" style="{{$heightVars}}">
-                @if ($label)
-                <x-form::label :required="$required">{{$label}}</x-form::label>
-                @endif
-                <div class="relative flex-none flex">
-                    <input
-                        id="{{$id}}"
-                        type="{{$type}}"
-                        @if ($type === 'password') autocomplete="off" @endif
-                        placeholder=""
-                        class="
-                            w-full h-[var(--height)] border-gray-600 border-solid text-gray-300 bg-gray-700 leading-none rounded-lg
-                            group-[.size-default]:border-2 group-[.size-sm]:border
-                            group-[.size-default]:text-sm group-[.size-sm]:text-xs
-                            group-[.size-default]:p-2 group-[.size-sm]:p-1
-                        "
-                        {{ $attributes }}
-                    />
-                    <x-ui::errors :for="$name" />
-                    @if($hint)
-                    <x-form::hint>{{$hint}}</x-form::hint>
-                    @endif
-                </div>
-            </label>
-        HTML;
-    }
-}

app/View/Page/Full.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Illuminate\View\Component;
-
-class Full extends Component
-{
-
-    public function __construct(public string $title = '', public ?string $heading = null)
-    {
-        session()->put('title', $title);
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="min-w-[16rem] sm:min-w-[18rem] md:min-w-[24rem] bg-gray-800 rounded-xl overflow-hidden shadow-lg @if($heading === null) p-6 md:p-10 @endif">
-                @if ($heading)
-                <div class="h-24 p-6 md:px-10 bg-primary-800 flex justify-between items-center w-full">
-                    <span class="text-primary-500 text-xl">{{$heading}}</span>
-                    <img src="{{asset('img/dpsg.gif')}}" class="w-24" />
-                </div>
-                @endif
-
-                <div @if($heading !== null) class="p-6 md:p-10" @endif>
-                    {{ $slot }}
-                </div>
-            </div>
-        HTML;
-    }
-}

app/View/Page/Header.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Illuminate\View\Component;
-
-class Header extends Component
-{
-
-    public function __construct(public string $title)
-    {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="h-16 px-6 flex items-center justify-between border-b border-solid border-gray-600 group-[.is-bright]:border-gray-500">
-                <div class="flex items-center space-x-4">
-                    {{ $beforeTitle ?? ''}}
-                    <span class="text-sm md:text-xl font-semibold leading-none text-white">{{ $title }}</span>
-                    {{ $toolbar ?? '' }}
-                </div>
-                <div class="flex items-center space-x-4 ml-2">
-                    {{ $right ?? '' }}
-                </div>
-            </div>
-        HTML;
-    }
-}

app/View/Page/Layout.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Illuminate\View\Component;
-
-class Layout extends Component
-{
-
-    public function __construct(public string $pageClass = '', public string $title = '', public string $menu = '')
-    {
-        session()->put('title', $title);
-        session()->put('menu', $menu);
-    }
-
-    public function userName(): string
-    {
-        return auth()->user()->firstname . ' ' . auth()->user()->lastname;
-    }
-
-    public function userAvatar(): string
-    {
-        return auth()->user()->getGravatarUrl();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="grow flex flex-col" @refresh-page.window="$wire.$refresh">
-                <div class="grow bg-gray-900 flex flex-col duration-300 navbar:ml-60">
-                    <x-page::header :title="$title">
-                        <x-slot:beforeTitle>
-                            <a href="#" class="lg:hidden" wire:click.prevent="dispatch('toggle-sidebar')">
-                                <x-ui::sprite src="menu" class="text-gray-100 w-5 h-5"></x-ui::sprite>
-                            </a>
-                        </x-slot:beforeTitle>
-                        <x-slot:toolbar>
-                            {{ $toolbar ?? ''}}
-                        </x-slot:toolbar>
-                        <x-slot:right>
-                            {{ $right ?? '' }}
-                            <div class="flex items-center space-x-2">
-                                <div class="rounded-full overflow-hidden border-2 border-solid border-gray-300">
-                                    <img src="{{ $userAvatar() }}" class="w-8 h-8 object-cover" />
-                                </div>
-                                <div class="text-gray-300"">{{ $userName() }}</div>
-                            </div>
-                        </x-slot:right>
-                    </x-page::header>
-
-                    <div class="grow flex flex-col {{$pageClass}}">
-                        {{ $slot }}
-                    </div>
-                </div>
-                <livewire:page.sidebar :mobile="true" />
-            </div>
-        HTML;
-    }
-}

app/View/Page/MenuEntry.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Illuminate\View\Component;
-
-class MenuEntry extends Component
-{
-
-    public function __construct(
-        public string $href,
-        public string $menu,
-        public string $icon,
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <a class="flex text-white py-2 px-3 rounded-lg hover:bg-gray-600 {{ $menu === session('menu') ? 'bg-gray-700' : '' }}" href="{{$href}}">
-                <x-ui::sprite class="text-white w-6 h-6 mr-4" src="{{$icon}}"></x-ui::sprite>
-                <span class="font-semibold">
-                    {{ $slot }}
-                </span>
-            </a>
-        HTML;
-    }
-}

app/View/Page/Modal.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Livewire\Attributes\On;
-use Livewire\Component;
-
-class Modal extends Component
-{
-
-    public ?string $component = null;
-    public array $props = [];
-    public string $key = '';
-    public array $actions = [];
-    public ?string $size = null;
-    public string $title = '';
-
-    public function __construct()
-    {
-    }
-
-    #[On('openModal')]
-    public function onOpenModal(string $component, string $title, array $props = [], array $actions = ['storeable', 'closeable'], string $size = "xl"): void
-    {
-        $this->component = $component;
-        $this->props = $props;
-        $this->size = $size;
-        $this->title = $title;
-        $this->key = md5(json_encode(['component' => $component, 'props' => $props]));
-        $this->actions = $this->parseActions($actions);
-    }
-
-    public function parseActions(array $actions): array
-    {
-        return collect($actions)->map(function ($action) {
-            if ($action === 'closeable') {
-                return ['event' => 'closeModal', 'icon' => 'close', 'label' => 'Schließen'];
-            }
-
-            if ($action === 'storeable') {
-                return ['event' => 'onStoreFromModal', 'icon' => 'save', 'label' => 'Speichern'];
-            }
-
-            return $action;
-        })->toArray();
-    }
-
-    #[On('closeModal')]
-    public function onCloseModal(): void
-    {
-        $this->reset();
-    }
-
-    public function sizeClass(): string
-    {
-        if ($this->size === 'lg') {
-            return 'max-w-lg';
-        }
-
-        if ($this->size === 'xl') {
-            return 'max-w-xl';
-        }
-
-        return '';
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div>
-                @if($component)
-                <div class="fixed z-40 top-0 left-0 w-full h-full flex items-center justify-center p-6 bg-black/60 backdrop-blur-sm" @click.self="$dispatch('closeModal')">
-                    <div
-                        class="relative rounded-lg p-8 bg-zinc-800 shadow-2xl shadow-black border border-zinc-700 border-solid w-full max-h-full flex flex-col overflow-auto {{$this->sizeClass()}}"
-                    >
-                        <div class="flex">
-                            <h3 class="font-semibold text-primary-200 text-xl grow">{{$title}}</h3>
-                            <div class="flex space-x-6">
-                                @foreach ($this->actions as $action)
-                                <a x-tooltip.raw="{{$action['label']}}" href="#" @click.prevent="$dispatch('{{$action['event']}}')">
-                                    <x-ui::sprite :src="$action['icon']" class="text-zinc-400 w-6 h-6"></x-ui::sprite>
-                                </a>
-                                @endforeach
-                            </div>
-                        </div>
-                        <div class="text-primary-100 group is-popup grow flex flex-col mt-3">
-                            <div>
-                                @if ($component)
-                                @livewire($component, $props, key($key))
-                                @endif
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                @else
-                <div></div>
-                @endif
-            </div>
-        HTML;
-    }
-}

app/View/Page/SettingLayout.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use App\Setting\SettingFactory;
-use Illuminate\View\Component;
-
-class SettingLayout extends Component
-{
-
-    public array $entries;
-
-    public function __construct(public string $active)
-    {
-        $this->entries = app(SettingFactory::class)->all()
-            ->map(fn ($setting) => [
-                'url' => $setting->url(),
-                'is_active' => get_class($setting) === $active,
-                'title' => $setting->title(),
-            ])->toArray();
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <x-page::layout :title="$active::title()" menu="setting">
-                <x-slot:right>
-                    {{ $right ?? '' }}
-                </x-slot:right>
-                <x-slot:toolbar>
-                    {{ $toolbar ?? '' }}
-                </x-slot:toolbar>
-                <div class="flex grow relative">
-                    <x-ui::menulist :entries="$entries"></x-ui::menulist>
-                    <div class="grow">
-                        {{ $slot }}
-                    </div>
-                </div>
-            </x-page::layout>
-        HTML;
-    }
-}

app/View/Page/Sidebar.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\View\Page;
-
-use Livewire\Component;
-
-class Sidebar extends Component
-{
-
-    public $mobile = false;
-
-    public function render()
-    {
-        return <<<'HTML'
-        <div
-            class="fixed z-40 bg-gray-800 p-6 w-60 top-0 h-screen border-r border-gray-600 border-solid flex flex-col justify-between duration-300
-                @if (!$mobile) left-[-16rem] navbar:left-0 @endif"
-            @if($mobile)
-                x-data="{ visible: false }"
-                x-on:toggle-sidebar.window="visible = true"
-                :class="{'left-[-16rem]' : !visible, 'left-0': visible}"
-            @endif
-        >
-            <div class="grid gap-2">
-                <x-page::menu-entry href="/" menu="dashboard" icon="loss">Dashboard</x-page::menu-entry>
-                <x-page::menu-entry href="/member" menu="member" icon="user">Mitglieder</x-page::menu-entry>
-                <x-page::menu-entry v-show="hasModule('bill')" href="/subscription" menu="subscription" icon="money">Beiträge</x-page::menu-entry>
-                <x-page::menu-entry v-show="hasModule('bill')" href="/invoice" menu="invoice" icon="moneypaper">Rechnungen</x-page::menu-entry>
-                <x-page::menu-entry href="/contribution" menu="contribution" icon="contribution">Zuschüsse</x-page::menu-entry>
-                <x-page::menu-entry href="/activity" menu="activity" icon="activity">Tätigkeiten</x-page::menu-entry>
-                <x-page::menu-entry href="/group" menu="group" icon="group">Gruppierungen</x-page::menu-entry>
-                <x-page::menu-entry v-if="hasModule('event')" href="/form" menu="form" icon="event">Veranstaltungen</x-page::menu-entry>
-                <x-page::menu-entry href="/maildispatcher" menu="maildispatcher" icon="at">Mail-Verteiler</x-page::menu-entry>
-            </div>
-            <div class="grid gap-2">
-                <a href="#" class="flex w-full px-3 py-2 rounded-xl text-gray-300 bg-gray-700" @click.prevent="dispatch('show-search')">
-                    <x-ui::sprite class="text-white w-6 h-6 mr-4" src="search"></x-ui::sprite>
-                    <div class="">Suchen</div>
-                </a>
-                <x-page::menu-entry href="/setting" menu="setting" icon="setting">Einstellungen</x-page::menu-entry>
-                <x-page::menu-entry href="/logout" menu="" icon="logout">Abmelden</x-page::menu-entry>
-            </div>
-            @if($mobile)
-            <a href="#" class="absolute right-0 top-0 mr-2 mt-2" @click.prevent="visible = false">
-                <x-ui::sprite src="close" class="w-5 h-5 text-gray-300"></x-ui::sprite>
-            </a>
-            @endif
-        </div>
-        HTML;
-    }
-}

app/View/Traits/HasColors.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\View\Traits;
-
-use App\View\Enums\Variant;
-
-trait HasColors
-{
-    public function bgColor(string $variant): string
-    {
-        $variant = Variant::fromString($variant);
-
-        return implode(' ', [
-            $variant->background(),
-            $variant->hoverBackground(),
-        ]);
-    }
-
-    public function fgColor(string $variant): string
-    {
-        $variant = Variant::fromString($variant);
-
-        return implode(' ', [
-            $variant->foreground(),
-            $variant->hoverForeground(),
-        ]);
-    }
-
-    public function allColors(string $variant): string
-    {
-        return "{$this->bgColor($variant)} {$this->fgColor($variant)}";
-    }
-}

app/View/Traits/HasFormDimensions.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\View\Traits;
-
-trait HasFormDimensions
-{
-
-    public function heightVars(): string
-    {
-        return data_get([
-            'default' => '--height: 35px; --padding: 3px;',
-            'sm' => '--height: 23px; --padding: 2px;',
-        ], $this->size);
-    }
-
-    public function heightClass(): string
-    {
-        return data_get([
-            'default' => 'size-default',
-            'sm' => 'size-sm',
-        ], $this->size);
-    }
-}

app/View/Ui/Action.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use App\View\Traits\HasColors;
-use Illuminate\View\Component;
-
-class Action extends Component
-{
-
-    use HasColors;
-
-    public function __construct(
-        public string $icon,
-        public string $variant = 'primary'
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <a x-tooltip.raw="{{$slot}}" href="#" {{ $attributes }} class="inline-flex
-                w-6 h-5 flex items-center justify-center rounded {{ $allColors($variant) }}
-            ">
-                <x-ui::sprite class="w-3 h-3 flex-none" :src="$icon"></x-ui::sprite>
-            </a>
-        HTML;
-    }
-}

app/View/Ui/Badge.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use App\View\Traits\HasColors;
-use Illuminate\View\Component;
-
-class Badge extends Component
-{
-
-    use HasColors;
-
-    public function __construct(
-        public string $icon,
-        public string $variant = 'primary'
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <button type="button" href="#" {{ $attributes }} class="h-6 px-3 space-x-2 items-center rounded-full {{ $allColors($variant) }} hidden lg:flex">
-                <x-ui::sprite class="w-3 h-3 flex-none" :src="$icon"></x-ui::sprite>
-                <span class="text-sm">
-                    {{$slot}}
-                </span>
-            </button>
-            <button type="button" x-tooltip.raw="{{$slot}}" href="#" {{ $attributes }} class="h-6 px-3 space-x-2 flex items-center rounded-full {{ $allColors($variant) }} lg:hidden">
-                <x-ui::sprite class="w-3 h-3 flex-none" :src="$icon"></x-ui::sprite>
-            </button>
-        HTML;
-    }
-}

app/View/Ui/BooleanDisplay.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class BooleanDisplay extends Component
-{
-
-    public function __construct(
-        public bool $value,
-        public string $hint,
-        public string $right,
-        public string $wrong,
-        public bool $dark = false,
-    ) {
-    }
-
-    public function spriteClass(): string
-    {
-        return $this->value ? 'text-green-800 group-[.dark]:text-green-600' : 'text-red-800 group-[.dark]:text-red-600';
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div x-tooltip.raw="{{$hint}}" class="flex space-x-2 items-center group @if($dark) dark @endif">
-                <div class="border-2 rounded-full w-5 h-5 flex items-center justify-center
-                    @if ($value) border-green-700 group-[.dark]:border-green-500
-                    @else border-red-700 group-[.dark]:border-red-500
-                    @endif
-                    "
-                >
-                    <x-ui::sprite :src="$value ? 'check ' :'close'" class="w-3 h-3 flex-none {{$spriteClass}}"></x-ui::sprite>
-                </div>
-                <div class="text-gray-400 text-xs">{{ $value ? $right : $wrong }}</div>
-            </div>
-        HTML;
-    }
-}

app/View/Ui/Box.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class Box extends Component
-{
-
-    public function __construct(
-        public string $containerClass = '',
-        public bool $second = false,
-        public string $title = '',
-        public string $inTitle = '',
-    ) {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <section {!! $attributes
-                ->mergeWhen($second, 'class', 'bg-gray-700 group-[.is-popup]:bg-zinc-600')
-                ->mergeWhen(!$second, 'class', 'bg-gray-800 group-[.is-popup]:bg-zinc-700')
-                ->mergeWhen(true, 'class', 'p-3 rounded-lg flex flex-col')
-            !!}>
-                <div class="flex items-center">
-                    @if($title)
-                    <div class="col-span-full font-semibold text-gray-300 group-[.is-popup]:text-zinc-300">{{$title}}</div>
-                    @endif
-                    {{$inTitle}}
-                </div>
-                <main class="{{ $title ? 'mt-2' : '' }} {{ $containerClass }}">
-                    {{ $slot }}
-                </main>
-            </section>
-        HTML;
-    }
-}

app/View/Ui/Button.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class Button extends Component
-{
-
-    public function __construct(public string $type = 'button')
-    {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <button type="{{$type}}" class="px-3 py-2 uppercase no-underline text-sm items-center justify-center bg-primary-700 rounded text-primary-300">
-                {{$slot}}
-            </button>
-        HTML;
-    }
-}

app/View/Ui/Errors.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class Errors extends Component
-{
-
-    public function __construct(
-        public string $for,
-    ) {
-    }
-
-    public function id(): string
-    {
-        return 'errors-' . str_replace('.', '--', $this->for);
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            @error($for)
-            <div x-data="{error: ''}" x-init="window.setTimeout(() => document.querySelector('#{{$id()}}') ? document.querySelector('#{{$id()}}').remove() : null, 2000)" class="absolute bottom-[calc(100%+0.5rem)] right-0" id="{{$id}}">
-                <div class="tippy-box" tabindex="-1" data-theme="danger" data-placement="top">
-                    <div class="tippy-content">{{$message}}</div>
-                    <div class="tippy-arrow absolute right-0 mr-2"></div>
-                </div>
-            </div>
-            @enderror
-        HTML;
-    }
-}

app/View/Ui/Menulist.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class Menulist extends Component
-{
-
-    public function __construct(public array $entries)
-    {
-    }
-
-    public function activeClass($entry): string
-    {
-        return $entry['is_active'] ? 'bg-gray-600' : '';
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="p-6 bg-gray-700 border-r border-gray-600 flex-none w-maxc flex flex-col justify-between">
-                <div class="grid gap-1">
-                    @foreach($entries as $entry)
-                    <a href="{{$entry['url']}}" class="rounded py-1 px-3 text-gray-400 duration-200 hover:bg-gray-600 {{$activeClass($entry)}}" @if($entry['is_active']) data-active @endif>
-                        {{$entry['title']}}
-                    </a>
-                    @endforeach
-                </div>
-                <slot name="bottom"></slot>
-            </div>
-        HTML;
-    }
-}

app/View/Ui/SettingIntro.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class SettingIntro extends Component
-{
-
-    public function __construct(public ?string $title = null)
-    {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div {{$attributes}}>
-                @if ($title) <h2 class="text-lg font-semibold text-gray-300">{{$title}}</h2> @endif
-                <div class="text-gray-100 text-sm">
-                    {{ $slot }}
-                </div>
-            </div>
-        HTML;
-    }
-}

app/View/Ui/Sprite.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\Support\Facades\Cache;
-use Illuminate\View\Component;
-
-class Sprite extends Component
-{
-
-    public string $spritemapFile;
-
-    public function __construct(
-        public string $src = '',
-    ) {
-        $this->spritemapFile = Cache::rememberForever('spritemap_file', function () {
-            $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
-            return asset('build/' . $manifest['spritemap.svg']['file']);
-        });
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <svg {{ $attributes->merge(['class' => 'fill-current']) }}><use xlink:href="{{$spritemapFile}}#sprite-{{$src}}" /></svg>
-        HTML;
-    }
-}

app/View/Ui/Table.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\View\Ui;
-
-use Illuminate\View\Component;
-
-class Table extends Component
-{
-
-    public function __construct(public string $mode = 'dark')
-    {
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div class="@container/table">
-                <table cellpadding="0" cellspacing="0" border="0" class="w-full @if ($mode === 'dark') table-dark @else table-light @endif
-                    [&_th]:text-left [&_th]:px-2 [&_th]:@4xl/table:px-6 [&_th]:text-gray-200 [&_th]:font-semibold [&_th]:py-3 [&_th]:border-gray-600 [&_th]:border-b
-                    [&_tbody_tr]:text-gray-200 [&_tbody_tr]:duration-300 [&_tbody_tr]:rounded [&_tbody_tr:hover]:bg-gray-800
-                    [&_tr_td]:py-1 [&_tr_td]:px-2 [&_tr_td]:@4xl/table:px-6
-                    [&.table-light_th]:border-gray-500 [&.table-light_tbody_tr:hover]:bg-gray-700
-
-
-                    ">
-                    {{ $slot }}
-                </table>
-            </div>
-        HTML;
-    }
-}

composer.json

@@ -61,7 +61,6 @@
         "laravel/ui": "^4.0",
         "league/csv": "^9.9",
         "league/flysystem-webdav": "dev-master as 3.28.0",
-        "livewire/livewire": "^3.5",
         "lorisleiva/laravel-actions": "^2.4",
         "meilisearch/meilisearch-php": "^1.6",
         "monicahq/laravel-sabre": "^1.6",
@@ -86,8 +85,7 @@
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench": "^9.0",
         "pestphp/pest": "^3.0",
-        "phpstan/phpstan-mockery": "^1.1",
-        "qossmic/deptrac": "^2.0"
+        "phpstan/phpstan-mockery": "^1.1"
     },
     "config": {
         "optimize-autoloader": true,
@@ -106,7 +104,6 @@
     "autoload": {
         "psr-4": {
             "App\\": "app/",
-            "Modules\\": "modules/",
             "Plugins\\": "plugins/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
@@ -114,7 +111,6 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Modules\\Dashboard\\Tests\\": "modules/dashboard/tests/",
             "Tests\\": "tests/",
             "Zoomyboy\\LaravelNami\\Tests\\": "packages/laravel-nami/tests/"
         }
@@ -122,10 +118,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
-        "archtest": [
-            "./vendor/bin/deptrac analyze",
-            "./vendor/bin/pest tests/Arch.php"
-        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3ffa3d4a189ba5d296ca71166298a74f",
+    "content-hash": "10f0b0d2a8dee4a8dad4821de9935f85",
     "packages": [
         {
             "name": "amphp/amp",
@@ -5153,82 +5153,6 @@
             ],
             "time": "2024-03-23T07:42:40+00:00"
         },
-        {
-            "name": "livewire/livewire",
-            "version": "v3.5.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/livewire/livewire.git",
-                "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae",
-                "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/database": "^10.0|^11.0",
-                "illuminate/routing": "^10.0|^11.0",
-                "illuminate/support": "^10.0|^11.0",
-                "illuminate/validation": "^10.0|^11.0",
-                "laravel/prompts": "^0.1.24",
-                "league/mime-type-detection": "^1.9",
-                "php": "^8.1",
-                "symfony/console": "^6.0|^7.0",
-                "symfony/http-kernel": "^6.2|^7.0"
-            },
-            "require-dev": {
-                "calebporzio/sushi": "^2.1",
-                "laravel/framework": "^10.15.0|^11.0",
-                "mockery/mockery": "^1.3.1",
-                "orchestra/testbench": "^8.21.0|^9.0",
-                "orchestra/testbench-dusk": "^8.24|^9.1",
-                "phpunit/phpunit": "^10.4",
-                "psy/psysh": "^0.11.22|^0.12"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Livewire\\LivewireServiceProvider"
-                    ],
-                    "aliases": {
-                        "Livewire": "Livewire\\Livewire"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Livewire\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Caleb Porzio",
-                    "email": "calebporzio@gmail.com"
-                }
-            ],
-            "description": "A front-end framework for Laravel.",
-            "support": {
-                "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.8"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/livewire",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-09-20T19:41:19+00:00"
-        },
         {
             "name": "lorisleiva/laravel-actions",
             "version": "v2.8.4",
@@ -15743,51 +15667,6 @@
             },
             "time": "2024-09-11T15:47:29+00:00"
         },
-        {
-            "name": "qossmic/deptrac",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/qossmic/deptrac.git",
-                "reference": "f646695c1468051138e1347d89590f9084fa6256"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/qossmic/deptrac/zipball/f646695c1468051138e1347d89590f9084fa6256",
-                "reference": "f646695c1468051138e1347d89590f9084fa6256",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": "^8.1"
-            },
-            "suggest": {
-                "ext-dom": "For using the JUnit output formatter"
-            },
-            "bin": [
-                "bin/deptrac",
-                "deptrac.phar"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Qossmic\\Deptrac\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Deptrac is a static code analysis tool that helps to enforce rules for dependencies between software layers.",
-            "support": {
-                "issues": "https://github.com/qossmic/deptrac/issues",
-                "source": "https://github.com/qossmic/deptrac/tree/2.0.1"
-            },
-            "time": "2024-06-17T10:43:11+00:00"
-        },
         {
             "name": "rector/rector",
             "version": "1.2.5",

config/app.php

@@ -168,6 +168,7 @@ return [
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
+        // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\HorizonServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
@@ -175,17 +176,8 @@ return [
         App\Tex\TexServiceProvider::class,
         App\Dav\ServiceProvider::class,
         App\Setting\SettingServiceProvider::class,
-        // App\Dashboard\DashboardServiceProvider::class,
+        App\Dashboard\DashboardServiceProvider::class,
         App\Providers\PluginServiceProvider::class,
-        App\Providers\BaseServiceProvider::class,
-        Modules\Dashboard\DashboardServiceProvider::class,
-        Modules\Module\ModuleServiceProvider::class,
-        Modules\Invoice\InvoiceServiceProvider::class,
-        Modules\Mailgateway\MailgatewayServiceProvider::class,
-        Modules\Nami\NamiServiceProvider::class,
-        Modules\Auth\AuthServiceProvider::class,
-        Modules\Form\FormServiceProvider::class,
-        Modules\Fileshare\FileshareServiceProvider::class,
     ],
 
     /*
@@ -236,7 +228,6 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
-        'Vite' => Illuminate\Support\Facades\Vite::class,
         'Inertia' => \Inertia\Inertia::class,
     ],
 ];

config/livewire.php

@@ -1,160 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |---------------------------------------------------------------------------
-    | Class Namespace
-    |---------------------------------------------------------------------------
-    |
-    | This value sets the root class namespace for Livewire component classes in
-    | your application. This value will change where component auto-discovery
-    | finds components. It's also referenced by the file creation commands.
-    |
-    */
-
-    'class_namespace' => 'App\\View',
-
-    /*
-    |---------------------------------------------------------------------------
-    | View Path
-    |---------------------------------------------------------------------------
-    |
-    | This value is used to specify where Livewire component Blade templates are
-    | stored when running file creation commands like `artisan make:livewire`.
-    | It is also used if you choose to omit a component's render() method.
-    |
-    */
-
-    'view_path' => resource_path('views/livewire'),
-
-    /*
-    |---------------------------------------------------------------------------
-    | Layout
-    |---------------------------------------------------------------------------
-    | The view that will be used as the layout when rendering a single component
-    | as an entire page via `Route::get('/post/create', CreatePost::class);`.
-    | In this case, the view returned by CreatePost will render into $slot.
-    |
-    */
-
-    'layout' => 'components.layouts.app',
-
-    /*
-    |---------------------------------------------------------------------------
-    | Lazy Loading Placeholder
-    |---------------------------------------------------------------------------
-    | Livewire allows you to lazy load components that would otherwise slow down
-    | the initial page load. Every component can have a custom placeholder or
-    | you can define the default placeholder view for all components below.
-    |
-    */
-
-    'lazy_placeholder' => null,
-
-    /*
-    |---------------------------------------------------------------------------
-    | Temporary File Uploads
-    |---------------------------------------------------------------------------
-    |
-    | Livewire handles file uploads by storing uploads in a temporary directory
-    | before the file is stored permanently. All file uploads are directed to
-    | a global endpoint for temporary storage. You may configure this below:
-    |
-    */
-
-    'temporary_file_upload' => [
-        'disk' => null,        // Example: 'local', 's3'              | Default: 'default'
-        'rules' => null,       // Example: ['file', 'mimes:png,jpg']  | Default: ['required', 'file', 'max:12288'] (12MB)
-        'directory' => null,   // Example: 'tmp'                      | Default: 'livewire-tmp'
-        'middleware' => null,  // Example: 'throttle:5,1'             | Default: 'throttle:60,1'
-        'preview_mimes' => [   // Supported file types for temporary pre-signed file URLs...
-            'png', 'gif', 'bmp', 'svg', 'wav', 'mp4',
-            'mov', 'avi', 'wmv', 'mp3', 'm4a',
-            'jpg', 'jpeg', 'mpga', 'webp', 'wma',
-        ],
-        'max_upload_time' => 5, // Max duration (in minutes) before an upload is invalidated...
-        'cleanup' => true, // Should cleanup temporary uploads older than 24 hrs...
-    ],
-
-    /*
-    |---------------------------------------------------------------------------
-    | Render On Redirect
-    |---------------------------------------------------------------------------
-    |
-    | This value determines if Livewire will run a component's `render()` method
-    | after a redirect has been triggered using something like `redirect(...)`
-    | Setting this to true will render the view once more before redirecting
-    |
-    */
-
-    'render_on_redirect' => false,
-
-    /*
-    |---------------------------------------------------------------------------
-    | Eloquent Model Binding
-    |---------------------------------------------------------------------------
-    |
-    | Previous versions of Livewire supported binding directly to eloquent model
-    | properties using wire:model by default. However, this behavior has been
-    | deemed too "magical" and has therefore been put under a feature flag.
-    |
-    */
-
-    'legacy_model_binding' => false,
-
-    /*
-    |---------------------------------------------------------------------------
-    | Auto-inject Frontend Assets
-    |---------------------------------------------------------------------------
-    |
-    | By default, Livewire automatically injects its JavaScript and CSS into the
-    | <head> and <body> of pages containing Livewire components. By disabling
-    | this behavior, you need to use @livewireStyles and @livewireScripts.
-    |
-    */
-
-    'inject_assets' => true,
-
-    /*
-    |---------------------------------------------------------------------------
-    | Navigate (SPA mode)
-    |---------------------------------------------------------------------------
-    |
-    | By adding `wire:navigate` to links in your Livewire application, Livewire
-    | will prevent the default link handling and instead request those pages
-    | via AJAX, creating an SPA-like effect. Configure this behavior here.
-    |
-    */
-
-    'navigate' => [
-        'show_progress_bar' => true,
-        'progress_bar_color' => '#2299dd',
-    ],
-
-    /*
-    |---------------------------------------------------------------------------
-    | HTML Morph Markers
-    |---------------------------------------------------------------------------
-    |
-    | Livewire intelligently "morphs" existing HTML into the newly rendered HTML
-    | after each update. To make this process more reliable, Livewire injects
-    | "markers" into the rendered Blade surrounding @if, @class & @foreach.
-    |
-    */
-
-    'inject_morph_markers' => true,
-
-    /*
-    |---------------------------------------------------------------------------
-    | Pagination Theme
-    |---------------------------------------------------------------------------
-    |
-    | When enabling Livewire's pagination feature by using the `WithPagination`
-    | trait, Livewire will use Tailwind templates to render pagination views
-    | on the page. If you want Bootstrap CSS, you can specify: "bootstrap"
-    |
-    */
-
-    'pagination_theme' => 'tailwind',
-];

database/factories/Mailgateway/Models/MailgatewayFactory.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Modules\Mailgateway\Models;
+namespace Database\Factories\Mailgateway\Models;
 
-use Modules\Mailgateway\Types\Type;
-use Modules\Mailgateway\Types\LocalType;
+use App\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Types\Type;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<Mailgateway>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Mailgateway\Models\Mailgateway>
  */
 class MailgatewayFactory extends Factory
 {
@@ -22,14 +22,24 @@ class MailgatewayFactory extends Factory
     {
         return [
             'name' => $this->faker->words(5, true),
-            'type' => new LocalType(),
+            'type' => [
+                'cls' => app('mail-gateways')->random(),
+                'params' => [],
+            ],
             'domain' => $this->faker->safeEmailDomain(),
         ];
     }
 
-    public function type(Type $type): self
+    /**
+     * @param class-string<Type>   $type
+     * @param array<string, mixed> $params
+     */
+    public function type(string $type, array $params): self
     {
-        return $this->state(['type' => $type]);
+        return $this->state(['type' => [
+            'cls' => $type,
+            'params' => $params,
+        ]]);
     }
 
     public function name(string $name): self

database/factories/UserFactory.php

@@ -27,9 +27,4 @@ class UserFactory extends Factory
             'lastname' => $this->faker->lastName,
         ];
     }
-
-    public function loginData(string $email, string $password): self
-    {
-        return $this->state(['email' => $email, 'password' => Hash::make($password)]);
-    }
 }

deptrac.yaml

@@ -1,30 +0,0 @@
-deptrac:
-    paths:
-        - ./app
-        - ./modules
-    exclude_files:
-        - '#.*Test.php$#'
-    layers:
-        - name: AppFiles
-          collectors:
-              - type: bool
-                must:
-                    - type: classLike
-                      value: .*
-                    - type: directory
-                      value: app/.*
-
-        - name: ModuleFiles
-          collectors:
-              - type: bool
-                must:
-                    - type: classLike
-                      value: .*
-                    - type: directory
-                      value: modules/.*
-
-    ruleset:
-        ModuleFiles:
-            - AppFiles
-        AppFiles:
-            - ModuleFiles

modules/Auth/AuthServiceProvider.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Modules\Auth;
-
-use Illuminate\Routing\Router;
-use Illuminate\Support\ServiceProvider;
-use Modules\Auth\Components\LoginForm;
-use Modules\Auth\Components\PasswordReset;
-use Modules\Auth\Components\PasswordResetConfirm;
-
-class AuthServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        app(Router::class)->middleware(['web', 'guest'])->group(function ($router) {
-            $router->get('/login', LoginForm::class)->name('login');
-            $router->get('/password/reset', PasswordReset::class)->name('password.request');
-            $router->get('/password/reset/{token}', PasswordResetConfirm::class)->name('password.reset');
-        });
-    }
-}

modules/Auth/Components/LoginForm.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace Modules\Auth\Components;
-
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
-use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
-use Livewire\Attributes\Layout;
-use Livewire\Component;
-
-class LoginForm extends Component
-{
-
-    use AuthenticatesUsers;
-    use ThrottlesLogins;
-
-    public string $email = '';
-    public string $password = '';
-
-    public function validateLogin(Request $request)
-    {
-        $this->validate([
-            'email' => 'required|max:255|string|email',
-            'password' => 'required|string',
-        ]);
-    }
-
-    protected function credentials(Request $request)
-    {
-        return ['email' => $this->email, 'password' => $this->password];
-    }
-
-    protected function sendLoginResponse(Request $request)
-    {
-        return redirect()->intended('/');
-    }
-
-    public function submit()
-    {
-        return $this->login(request());
-    }
-
-    #[Layout('components.layouts.full')]
-    public function render(): string
-    {
-        return <<<'HTML'
-            <x-page::full heading="Login" title="Login">
-                <form wire:submit="submit">
-                    <div class="grid gap-5">
-                        <x-form::text name="email" wire:model="email" label="E-Mail-Adresse"></x-form::text>
-                        <x-form::text name="password" wire:model="password" type="password" label="Passwort"></x-form::text>
-                        <x-ui::button type="submit">Login</x-ui::button>
-                        <div class="flex justify-center">
-                            <a href="{{route('password.request')}}" class="text-gray-500 text-sm hover:text-gray-300">Passwort vergessen?</a>
-                        </div>
-                    </div>
-                </form>
-            </x-page::full>
-        HTML;
-    }
-}

modules/Auth/Components/LoginFormTest.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace Modules\Auth\Components;
-
-use App\User;
-use Illuminate\Auth\Events\Lockout;
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Support\Facades\Event;
-use Livewire\Livewire;
-
-uses(TestCase::class);
-uses(DatabaseTransactions::class);
-
-it('redirects to login', function () {
-    test()->get('/')->assertRedirect('/login');
-});
-
-it('displays component', function () {
-    test()->get('/login')->assertSeeLivewire(LoginForm::class)->assertDontSee('Dashboard');
-});
-
-it('displays form', function () {
-    Livewire::test(LoginForm::class)
-        ->assertSee('Login')
-        ->assertSee('Passwort vergessen')
-        ->assertSee(route('password.request'));
-});
-
-it('loggs in', function () {
-    User::factory()->loginData('admin@example.com', 'secret')->create();
-    Livewire::test(LoginForm::class)
-        ->set('email', 'admin@example.com')
-        ->set('password', 'secret')
-        ->call('submit')
-        ->assertRedirect('/');
-
-    $this->assertEquals('admin@example.com', auth()->user()->email);
-});
-
-it('displays failed login response', function () {
-    Livewire::test(LoginForm::class)
-        ->set('email', 'admin@example.com')
-        ->set('password', 'secret')
-        ->call('submit')
-        ->assertHasErrors(['email' => 'Login fehlgeschlagen.']);
-});
-
-it('increments login attempts', function () {
-    Event::fake([Lockout::class]);
-    Livewire::test(LoginForm::class)
-        ->set('email', 'admin@example.com')
-        ->set('password', 'secret')
-        ->call('submit')
-        ->call('submit')
-        ->call('submit')
-        ->call('submit')
-        ->call('submit')
-        ->call('submit');
-    Event::assertDispatchedTimes(Lockout::class);
-});
-
-it('requires email and password', function () {
-    User::factory()->loginData('admin@example.com', 'secret')->create();
-    Livewire::test(LoginForm::class)
-        ->set('email', '')
-        ->set('password', '')
-        ->call('submit')
-        ->assertHasErrors(['email', 'password']);
-});

modules/Auth/Components/PasswordReset.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace Modules\Auth\Components;
-
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
-use Livewire\Attributes\Layout;
-use Livewire\Component;
-
-class PasswordReset extends Component
-{
-
-    use SendsPasswordResetEmails;
-
-    public string $email = '';
-
-    protected function validateEmail(Request $request)
-    {
-        $this->validate([
-            'email' => 'required|max:255|string|email',
-        ]);
-    }
-
-    protected function sendResetLinkFailedResponse(Request $request, $response)
-    {
-        throw ValidationException::withMessages([
-            'email' => [trans($response)],
-        ]);
-    }
-
-    protected function credentials(Request $request)
-    {
-        return ['email' => $this->email];
-    }
-
-    public function submit()
-    {
-        $this->sendResetLinkEmail(request());
-        $this->dispatch('success', 'Du hast weitere Instruktionen per E-Mail erhalten.');
-    }
-
-    #[Layout('components.layouts.full')]
-    public function render(): string
-    {
-        return <<<'HTML'
-            <x-page::full heading="Passwort vergessen" title="Passwort vergessen">
-                <form wire:submit.prevent="submit">
-                    <div class="grid gap-5">
-                        <span class="text-gray-500 text-sm"
-                            >Hier kannst du dein Passwort zurücksetzen.<br />
-                            Gebe dafür die E-Mail-Adresse deines Benutzerkontos ein.<br />
-                            Anschließend bekommst du eine E-Mail<br />
-                            mit weiteren Anweisungen.</span
-                        >
-                        <x-form::text name="email" wire:model="email" label="E-Mail-Adresse"></x-form::text>
-                        <x-ui::button type="submit">Passwort zurücksetzen</x-ui::button>
-                        <div class="flex justify-center">
-                            <a href="/login" class="text-gray-500 text-sm hover:text-gray-300">Zurück zum Login</a>
-                        </div>
-                    </div>
-                </form>
-            </x-page::full>
-        HTML;
-    }
-}

modules/Auth/Components/PasswordResetConfirm.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace Modules\Auth\Components;
-
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Validation\Rules\Password as PasswordRule;
-use Illuminate\Validation\ValidationException;
-use Livewire\Attributes\Layout;
-use Livewire\Component;
-
-class PasswordResetConfirm extends Component
-{
-
-    public string $password = '';
-    public string $password_confirmation = '';
-    public string $token = '';
-    public string $email = '';
-
-    public function mount(string $token): void
-    {
-        $this->email = request()->query('email');
-        $this->token = $token;
-    }
-
-    public function submit()
-    {
-        $this->validate([
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => ['required', 'confirmed', PasswordRule::defaults()],
-        ]);
-
-        $response = Password::broker()->reset([
-            'email' => $this->email,
-            'password' => $this->password,
-            'password_confirmation' => $this->password_confirmation,
-            'token' => $this->token
-        ], fn ($user, $password) => $this->resetPassword($user, $password));
-
-        if ($response == Password::PASSWORD_RESET) {
-            $this->dispatch('success', 'Passwort erfolgreich geändert.');
-            return redirect()->route('home');
-        }
-
-        ValidationException::withMessages([
-            'password' => 'Passwort konnte nicht geändert werden.',
-        ]);
-    }
-
-    protected function resetPassword($user, $password)
-    {
-        $user->password = Hash::make($password);
-        $user->setRememberToken(Str::random(60));
-        $user->save();
-        event(new PasswordReset($user));
-        auth()->login($user);
-    }
-
-    #[Layout('components.layouts.full')]
-    public function render(): string
-    {
-        return <<<'HTML'
-            <x-page::full heading="Passwort vergessen" title="Passwort vergessen">
-                <form wire:submit.prevent="submit">
-                    <div class="grid gap-5">
-                        <span class="text-gray-500 text-sm">
-                            Hier kannst du dein Passwort zurücksetzen.<br />
-                            Gebe dafür ein neues Passwort ein.<br />
-                            Merke oder notiere dir dieses Passwort, bevor du das Formular absendest.<br />
-                            Danach wirst du zum Dashboard weitergeleitet.
-                        </span>
-
-                        <x-form::text type="password" name="password" wire:model="password" label="Neues Passwort"></x-form::text>
-                        <x-form::text type="password" name="password_confirmation" wire:model="password_confirmation" label="Neues Passwort widerholen"></x-form::text>
-                        <x-ui::button type="submit">Passwort zurücksetzen</x-ui::button>
-                        <div class="flex justify-center">
-                            <a href="/login" class="text-gray-500 text-sm hover:text-gray-300">Zurück zum Login</a>
-                        </div>
-                    </div>
-                </form>
-            </x-page::full>
-        HTML;
-    }
-}

modules/Auth/Components/PasswordResetTest.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Modules\Auth\Components;
-
-use Modules\Auth\Mails\ResetPassword;
-use App\User;
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Support\Facades\Notification;
-use Livewire\Livewire;
-
-uses(TestCase::class);
-uses(DatabaseTransactions::class);
-
-it('displays component', function () {
-    test()->get(route('password.request'))->assertSeeLivewire(PasswordReset::class)->assertDontSee('Dashboard');
-});
-
-it('shows intro', function () {
-    Livewire::test(PasswordReset::class)->assertSee('Hier kannst du dein Passwort zurücksetzen.');
-});
-
-it('it needs email address', function (string $email, string $error) {
-    Livewire::test(PasswordReset::class)
-        ->set('email', $email)
-        ->call('submit')
-        ->assertHasErrors(['email' => $error]);
-})
-    ->with([
-        ['', 'E-Mail Adresse ist erforderlich.'],
-        ['aaa', 'E-Mail Adresse muss eine gültige E-Mail-Adresse sein.'],
-    ]);
-
-it('displays error when user doesnt exsst', function () {
-    Livewire::test(PasswordReset::class)
-        ->set('email', 'nowhere@example.com')
-        ->call('submit')
-        ->assertHasErrors(['email' => 'Es konnte leider kein Nutzer mit dieser E-Mail-Adresse gefunden werden.']);
-});
-
-it('requests link', function () {
-    Notification::fake();
-    $user = User::factory()->loginData('admin@example.com', 'secret')->create();
-    Livewire::test(PasswordReset::class)
-        ->set('email', 'admin@example.com')
-        ->call('submit')
-        ->assertDispatched('success', 'Du hast weitere Instruktionen per E-Mail erhalten.');
-
-    Notification::assertSentTo($user, ResetPassword::class);
-});

modules/Dashboard/Block.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Modules\Dashboard;
-
-use Livewire\Component;
-
-abstract class Block extends Component
-{
-    abstract protected function title(): string;
-
-    abstract public function render(): string;
-}

modules/Dashboard/Components/DashboardComponent.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace Modules\Dashboard\Components;
-
-use Livewire\Component;
-use Modules\Dashboard\DashboardFactory;
-
-class DashboardComponent extends Component
-{
-
-    private array $blocks = [];
-
-    public function mount(DashboardFactory $factory): void
-    {
-        $this->blocks = $factory->load();
-    }
-
-    public function render(): string
-    {
-        return <<<'HTML'
-            <x-page::layout title="Dashboard" menu="dashboard">
-                <div class="gap-6 md:grid-cols-2 xl:grid-cols-4 grid p-6">
-                    @foreach($this->blocks as $block)
-                        <x-ui::box title="{{$block->title()}}" :second="true">
-                            <livewire:dynamic-component is="{{ get_class($block) }}" lazy></livewire:dynamic-component>
-                        </x-ui::box>
-                    @endforeach
-                </div>
-            </x-page::layout>
-        HTML;
-    }
-}

modules/Dashboard/DashboardFactory.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace Modules\Dashboard;
-
-use Livewire\Livewire;
-
-class DashboardFactory
-{
-    /**
-     * @var array<int, class-string<Block>>
-     */
-    private array $blocks = [];
-
-    /**
-     * @return array<int, Block>
-     */
-    public function load(): array
-    {
-        return collect($this->blocks)->map(fn ($block) => app($block))->toArray();
-    }
-
-    /**
-     * @param class-string<Block> $block
-     */
-    public function register(string $block): self
-    {
-        $this->blocks[] = $block;
-
-        $componentName = str($block)->replace('\\', '.')->explode('.')->map(fn ($part) => str($part)->lcfirst()->kebab())->implode('.');
-        Livewire::component($componentName, $block);
-
-        return $this;
-    }
-
-    public function purge(): self
-    {
-        $this->blocks = [];
-
-        return $this;
-    }
-}

modules/Dashboard/DashboardServiceProvider.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace Modules\Dashboard;
-
-use Illuminate\Routing\Router;
-use Illuminate\Support\ServiceProvider;
-use Modules\Dashboard\Components\DashboardComponent;
-use Modules\Invoice\MemberPaymentBlock;
-use Modules\Member\AgeGroupCountBlock;
-use Modules\Member\TestersBlock;
-use Modules\Prevention\EfzPendingBlock;
-use Modules\Prevention\PsPendingBlock;
-
-class DashboardServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        app()->singleton(DashboardFactory::class, fn () => new DashboardFactory());
-    }
-
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/', DashboardComponent::class)->name('home');
-        });
-
-        app(DashboardFactory::class)->register(AgeGroupCountBlock::class);
-        app(DashboardFactory::class)->register(MemberPaymentBlock::class);
-        app(DashboardFactory::class)->register(TestersBlock::class);
-        app(DashboardFactory::class)->register(EfzPendingBlock::class);
-        app(DashboardFactory::class)->register(PsPendingBlock::class);
-    }
-}

modules/Dashboard/tests/DashboardComponentTest.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace Modules\Dashboard\Tests;
-
-use Modules\Dashboard\Block;
-use Modules\Dashboard\Components\DashboardComponent;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Modules\Dashboard\DashboardFactory;
-use Tests\TestCase;
-
-uses(DatabaseTransactions::class);
-uses(TestCase::class);
-
-it('renders successfully', function () {
-    $this->login()->loginNami();
-
-    app(DashboardFactory::class)->purge();
-    app(DashboardFactory::class)->register(ExampleBlock::class);
-
-    Livewire::test(DashboardComponent::class)
-        ->assertSee('ExampleTitle');
-});
-
-it('renders page successfully', function () {
-    $this->login()->loginNami();
-
-    $this->get('/')->assertSeeLivewire(DashboardComponent::class)->assertSee('Dashboard');
-});
-
-it('shows member component', function () {
-    $this->login()->loginNami();
-
-    Livewire::test(DashboardComponent::class)
-        ->assertSee('Gruppierungs-Verteilung');
-});
-
-class ExampleBlock extends Block
-{
-
-    public function title(): string
-    {
-        return 'ExampleTitle';
-    }
-
-    public function render(): string
-    {
-        return <<<'HTML'
-            <div>
-                Example Content
-            </div>
-        HTML;
-    }
-}

modules/Fileshare/Components/Form.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace Modules\Fileshare\Components;
-
-use App\Fileshare\ConnectionTypes\ConnectionType;
-use App\Fileshare\Models\Fileshare;
-use Modules\Mailgateway\Models\Mailgateway;
-use Modules\Mailgateway\Types\Type;
-use Illuminate\Support\Collection;
-use Illuminate\Validation\ValidationException;
-use Livewire\Attributes\On;
-use Livewire\Attributes\Validate;
-use Livewire\Component;
-
-class Form extends Component
-{
-
-    public string $name = '';
-    public array $type = [];
-    #[Validate('required|string|max:255|exclude')]
-    public ?string $typeClass = null;
-    public array $types;
-    public ?Fileshare $model = null;
-
-    public function rules()
-    {
-        return [
-            'name' => 'required|string|max:255',
-            'type' => 'array|exclude',
-        ];
-    }
-
-    public function validationAttributes(): array
-    {
-        return [
-            'typeClass' => 'Typ',
-            'name' => 'Bezeichnung',
-        ];
-    }
-
-    public function mount(?string $id = null): void
-    {
-        $this->types = ConnectionType::forSelect();
-
-        if ($id) {
-            $this->model = Fileshare::findOrFail($id);
-            $this->name = $this->model->name;
-            $this->typeClass = get_class($this->model->type);
-            $this->type = $this->model->type->toArray();
-        }
-    }
-
-    public function fields(): array
-    {
-        return $this->typeClass ? $this->typeClass::fields() : [];
-    }
-
-    public function updatedTypeClass(?string $type): void
-    {
-        if (!$type) {
-            return;
-        }
-
-        $this->type = $type::defaults();
-    }
-
-    #[On('onStoreFromModal')]
-    public function onSave(): void
-    {
-        $payload = $this->validate();
-        $type = $this->typeClass::from($this->type);
-
-        if (!$type->check()) {
-            throw ValidationException::withMessages(['typeClass' => 'Verbindung fehlgeschlagen']);
-        }
-
-        if ($this->model) {
-            $this->model->update([...$payload, 'type' => $type]);
-        } else {
-            Fileshare::create([
-                ...$payload,
-                'type' => $type,
-            ]);
-        }
-
-        $this->dispatch('closeModal');
-        $this->dispatch('refresh-page');
-        $this->dispatch('success', $this->model ? 'Verbindung aktualisiert.' : 'Verbindung erstellt.');
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <div>
-                <form class="grid grid-cols-2 gap-3">
-                    <x-form::text name="name" wire:model="name" label="Bezeichnung" required />
-                    <x-form::select name="typeClass" wire:model.live="typeClass" label="Typ" :options="$types" required />
-                    @foreach($this->fields() as $index => $field)
-                        <x-form::text
-                            wire:key="$index"
-                            wire:model="type.{{$field['key']}}"
-                            :label="$field['label']"
-                            :type="$field['type']"
-                            :name="'type.'.$field['key']"
-                            required
-                        ></x-form::text>
-                    @endforeach
-                </form>
-            </div>
-        HTML;
-    }
-}

modules/Fileshare/Components/FormTest.php

@@ -1,155 +0,0 @@
-<?php
-
-namespace Modules\Fileshare\Components;
-
-use App\Fileshare\ConnectionTypes\NextcloudConnection;
-use App\Fileshare\ConnectionTypes\OwncloudConnection;
-use App\Fileshare\Models\Fileshare;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Tests\FileshareTestCase;
-
-uses(FileshareTestCase::class);
-uses(DatabaseTransactions::class);
-
-it('it displays values', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    Livewire::test(Form::class)
-        ->assertSet('name', '')
-        ->assertSee('Bezeichnung')
-        ->assertSee('Owncloud')
-        ->assertSee('Nextcloud')
-        ->assertSet('type', []);
-});
-
-it('it displays owncloud connection values', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    Livewire::test(Form::class)
-        ->set('typeClass', OwncloudConnection::class)
-        ->assertSet('typeClass', OwncloudConnection::class)
-        ->assertSee('Benutzer')
-        ->assertSee('URL')
-        ->assertSet('type.user', '')
-        ->assertSet('type.base_url', '')
-        ->assertSet('type.password', '');
-});
-
-it('it saves owncloud connection', function () {
-    test()->login()->loginNami()->withUser('badenpowell', 'secret');
-
-    Livewire::test(Form::class)
-        ->set('name', 'lala')
-        ->set('typeClass', OwncloudConnection::class)
-        ->set('type.user', 'badenpowell')
-        ->set('type.password', 'secret')
-        ->set('type.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-        ->call('onSave')
-        ->assertDispatched('success', 'Verbindung erstellt.')
-        ->assertDispatched('refresh-page');
-
-    $connection = Fileshare::firstOrFail();
-    $this->assertEquals('badenpowell', $connection->type->user);
-    $this->assertEquals('secret', $connection->type->password);
-    $this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl);
-    $this->assertEquals('lala', $connection->name);
-});
-
-it('it saves nextcloud connection', function () {
-    test()->login()->loginNami()->withUser('badenpowell', 'secret');
-
-    Livewire::test(Form::class)
-        ->set('name', 'lala')
-        ->set('typeClass', NextcloudConnection::class)
-        ->set('type.user', 'badenpowell')
-        ->set('type.password', 'secret')
-        ->set('type.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-        ->call('onSave')
-        ->assertDispatched('success', 'Verbindung erstellt.')
-        ->assertDispatched('refresh-page');
-
-    $connection = Fileshare::firstOrFail();
-    $this->assertEquals('badenpowell', $connection->type->user);
-    $this->assertEquals('secret', $connection->type->password);
-    $this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl);
-    $this->assertEquals('lala', $connection->name);
-});
-
-it('checks nextcloud connection', function () {
-    test()->login()->loginNami()->withUser('badenpowell', 'secret');
-
-    Livewire::test(Form::class)
-        ->set('name', 'lala')
-        ->set('typeClass', NextcloudConnection::class)
-        ->set('type.user', 'badenpowell')
-        ->set('type.password', 'wrong')
-        ->set('type.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-        ->call('onSave')
-        ->assertHasErrors(['typeClass' => 'Verbindung fehlgeschlagen']);
-});
-
-it('validates input', function ($attributes, $errors) {
-    test()->login()->loginNami()->withUser('badenpowell', 'secret');
-
-    Livewire::test(Form::class)
-        ->set('name', 'lala')
-        ->set('typeClass', NextcloudConnection::class)
-        ->set('type.user', 'badenpowell')
-        ->set('type.password', 'wrong')
-        ->set('type.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-        ->setArray($attributes)
-        ->call('onSave')
-        ->assertHasErrors($errors);
-})->with([
-    [['name' => ''], ['name' => 'Bezeichnung ist erforderlich.']],
-    [['typeClass' => null], ['typeClass' => 'Typ ist erforderlich.']],
-]);
-
-it('updates a connection', function () {
-    $this->withoutExceptionHandling()->login()->loginNami()->withUser('badenpowell', 'secretneu');
-
-    $connection = Fileshare::factory()
-        ->type(OwncloudConnection::from(['user' => 'test', 'password' => 'secret', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
-        ->name('lokaler Server')
-        ->create();
-
-    Livewire::test(Form::class, ['id' => $connection->id])
-        ->assertSet('name', 'lokaler Server')
-        ->assertSet('typeClass', OwncloudConnection::class)
-        ->assertSet('type.user', 'test')
-        ->assertSet('type.password', 'secret')
-        ->assertSet('type.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-        ->setArray([
-            'name' => 'Lala',
-            'typeClass' => OwncloudConnection::class,
-            'type' => [
-                'user' => 'badenpowell',
-                'password' => 'secretneu',
-                'base_url' => env('TEST_OWNCLOUD_DOMAIN'),
-            ]
-        ])
-        ->call('onSave')
-        ->assertDispatched('success', 'Verbindung aktualisiert.')
-        ->assertDispatched('refresh-page');
-
-    $connection = Fileshare::firstOrFail();
-    $this->assertEquals('badenpowell', $connection->type->user);
-    $this->assertEquals('secretneu', $connection->type->password);
-    $this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl);
-    $this->assertEquals('Lala', $connection->name);
-});
-
-it('checks a connection while updating', function () {
-    $this->withoutExceptionHandling()->login()->loginNami()->withUser('badenpowell', 'secretneu');
-
-    $connection = Fileshare::factory()
-        ->type(OwncloudConnection::from(['user' => 'test', 'password' => 'secret', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
-        ->name('lokaler Server')
-        ->create();
-
-    Livewire::test(Form::class, ['id' => $connection->id])
-        ->set('type.password', 'wrong')
-        ->call('onSave')
-        ->assertHasErrors(['typeClass' => 'Verbindung fehlgeschlagen']);
-});

modules/Fileshare/Components/SettingView.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Modules\Fileshare\Components;
-
-use App\Fileshare\FileshareSettings;
-use App\Fileshare\Models\Fileshare;
-use Livewire\Component;
-
-class SettingView extends Component
-{
-
-    public $settingClass = FileshareSettings::class;
-
-    public function render()
-    {
-        return view('fileshare::setting-view', [
-            'data' => Fileshare::get(),
-        ]);
-    }
-}

modules/Fileshare/Components/SettingViewTest.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace Modules\Fileshare\Components;
-
-use App\Fileshare\ConnectionTypes\OwncloudConnection;
-use App\Fileshare\Models\Fileshare;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Modules\Fileshare\Components\SettingView;
-use Tests\FileshareTestCase;
-use Tests\TestCase;
-
-uses(FileshareTestCase::class);
-uses(DatabaseTransactions::class);
-
-it('it renders page', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    test()->get('/setting/fileshare')->assertSeeLivewire(SettingView::class);
-});
-
-it('displays overview', function () {
-    $this->withoutExceptionHandling()->login()->loginNami()->withUser('badenpowell', 'secret');
-    Fileshare::factory()
-        ->type(OwncloudConnection::from(['user' => 'badenpowell', 'password' => 'secret', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
-        ->name('lokaler Server')
-        ->create();
-
-    Livewire::test(SettingView::class)
-        ->assertSee('lokaler Server')
-        ->assertSee('Verbindung erfolgreich')
-        ->assertSee('Owncloud');
-    // ->assertJsonPath('data.0.name', 'lokaler Server')
-    // ->assertJsonPath('data.0.type', OwncloudConnection::class)
-    // ->assertJsonPath('data.0.config.user', 'badenpowell')
-    // ->assertJsonPath('data.0.config.password', 'secret')
-    // ->assertJsonPath('data.0.config.base_url', env('TEST_OWNCLOUD_DOMAIN'))
-    // ->assertJsonPath('data.0.id', $connection->id)
-    // ->assertJsonPath('data.0.is_active', true)
-    // ->assertJsonPath('data.0.type_human', 'Owncloud')
-    // ->assertJsonPath('data.0.links.update', route('fileshare.update', ['fileshare' => $connection]))
-    // ->assertJsonPath('meta.default.name', '')
-    // ->assertJsonPath('meta.links.store', route('fileshare.store'))
-    // ->assertJsonPath('meta.types.0.id', NextcloudConnection::class)
-    // ->assertJsonPath('meta.types.0.name', 'Nextcloud')
-    // ->assertJsonPath('meta.types.0.defaults.base_url', '')
-    // ->assertJsonPath('meta.types.1.id', OwncloudConnection::class)
-    // ->assertJsonPath('meta.types.1.name', 'Owncloud')
-    // ->assertJsonPath('meta.types.1.defaults.base_url', '')
-    // ->assertJsonPath('meta.types.0.fields.1', ['label' => 'Benutzer', 'key' => 'user', 'type' => 'text']);
-});
-
-it('displays wrong connection', function () {
-    $this->withoutExceptionHandling()->login()->loginNami()->withUser('badenpowell', 'secret');
-    Fileshare::factory()
-        ->type(OwncloudConnection::from(['user' => 'badenpowell', 'password' => 'wrong', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
-        ->name('lokaler Server')
-        ->create();
-
-    Livewire::test(SettingView::class)
-        ->assertSee('lokaler Server')
-        ->assertSee('Verbindung fehlgeschlagen');
-});

modules/Fileshare/Components/setting-view.blade.php

@@ -1,36 +0,0 @@
-<x-page::setting-layout :active="$settingClass">
-    <x-slot:toolbar>
-        <x-ui::badge wire:click.prevent="$dispatch('openModal', {component: 'modules.fileshare.components.form', props: {}, title: 'Neue Verbindung'})" icon="plus">Neue Verbindung</x-ui::badge>
-    </x-slot:toolbar>
-    <div>
-        <x-ui::table>
-            <thead>
-                <th>Bezeichnung</th>
-                <th>Typ</th>
-                <th>Prüfung</th>
-                <th>Aktion</th>
-            </thead>
-
-            @foreach ($data as $index => $share)
-            <tr wire:key="$index">
-                <td>{{ $share->name }}</td>
-                <td>{{ $share->type::title() }}</td>
-                <td>
-                    <x-ui::boolean-display :value="$share->type->check()"
-                        hint="Verbindungsstatus"
-                        right="Verbindung erfolgreich"
-                        wrong="Verbindung fehlgeschlagen"
-                    ></x-ui::boolean-display>
-                </td>
-                <td>
-                    <x-ui::action wire:click="$dispatch('openModal', {
-                        component: 'modules.fileshare.components.form',
-                        props: {id: '{{$share->id}}'},
-                        title: 'Verbindung {{$share->name}} bearbeiten'}
-                    )" icon="pencil" variant="warning">Bearbeiten</x-ui::action>
-                </td>
-            </tr>
-            @endforeach
-        </x-ui::table>
-    </div>
-</x-page::setting-layout>

modules/Fileshare/FileshareServiceProvider.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace Modules\Fileshare;
-
-use App\Fileshare\FileshareSettings;
-use App\Setting\SettingFactory;
-use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\View;
-use Illuminate\Support\ServiceProvider;
-use Modules\Fileshare\Components\SettingView;
-
-class FileshareServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        app(SettingFactory::class)->register(FileshareSettings::class);
-
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/setting/fileshare', SettingView::class)->name('setting.fileshare');
-        });
-
-        View::addNamespace('fileshare', __DIR__ . '/Components');
-    }
-}

modules/Form/Components/FormSettingView.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Modules\Form\Components;
-
-use App\Form\FormSettings;
-use Livewire\Component;
-
-class FormSettingView extends Component
-{
-
-    public string $clearCacheUrl;
-    public string $registerUrl;
-    public $settingClass = FormSettings::class;
-
-    public function rules(): array
-    {
-        return [
-            'clearCacheUrl' => '',
-            'registerUrl' => '',
-        ];
-    }
-
-    public function mount(): void
-    {
-        $this->registerUrl = app(FormSettings::class)->registerUrl;
-        $this->clearCacheUrl = app(FormSettings::class)->clearCacheUrl;
-    }
-
-    public function save(): void
-    {
-        app(FormSettings::class)->fill($this->validate())->save();
-        $this->dispatch('success', 'Einstellungen gespeichert.');
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <x-page::setting-layout :active="$settingClass">
-                <x-slot:right>
-                    <x-form::save-button form="formsettingform"></x-form::save-button>
-                </x-slot:right>
-                <form id="formsettingform" class="grow p-6 grid grid-cols-2 gap-3 items-start content-start"
-                    wire:submit.prevent="save">
-                    <x-ui::setting-intro class="col-span-full">
-                        Hier kannst du Einstellungen für Anmeldeformulare setzen.
-                    </x-ui::setting-intro>
-                    <x-form::text name="register_url" wire:model="registerUrl" label="Formular-Link"></x-form::text>
-                    <x-form::text name="clear_cache_url" wire:model="clearCacheUrl" label="Frontend-Cache-Url"></x-form::text>
-                </form>
-            </x-page::setting-layout>
-        HTML;
-    }
-}

modules/Form/Components/FormSettingViewTest.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace Modules\Form\Components;
-
-use App\Form\FormSettings;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Tests\TestCase;
-
-uses(TestCase::class);
-uses(DatabaseTransactions::class);
-
-it('it renders page', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    test()->get('/setting/form')->assertSeeLivewire(FormSettingView::class);
-});
-
-it('it displays active modules', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-    app(FormSettings::class)->fill(['registerUrl' => 'http://example.com/register', 'clearCacheUrl' => 'http://example.com/clear-cache'])->save();
-
-    Livewire::test(SettingView::class)
-        ->assertSee('Einstellungen für Anmeldeformulare')
-        ->assertSee('Formular-Link')
-        ->assertSet('registerUrl', 'http://example.com/register')
-        ->assertSet('clearCacheUrl', 'http://example.com/clear-cache')
-        ->assertSeeHtml('data-active');
-});
-
-it('it saves settings', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    Livewire::test(SettingView::class)
-        ->set('clearCacheUrl', 'http://example.com/clear')
-        ->set('registerUrl', 'http://example.com/register')
-        ->call('save')
-        ->assertDispatched('success', 'Einstellungen gespeichert.');
-
-    test()->assertEquals('http://example.com/clear', app(FormSettings::class)->clearCacheUrl);
-    test()->assertEquals('http://example.com/register', app(FormSettings::class)->registerUrl);
-});

modules/Form/Components/PreventionSettingView.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Modules\Form\Components;
-
-use App\Lib\Editor\EditorData;
-use App\Prevention\PreventionSettings;
-use Livewire\Component;
-
-class PreventionSettingView extends Component
-{
-
-    public EditorData $formmail;
-    public $settingClass = PreventionSettings::class;
-
-    public function rules(): array
-    {
-        return [
-            'formmail' => 'array',
-        ];
-    }
-
-    public function mount(): void
-    {
-        $this->formmail = app(PreventionSettings::class)->formmail;
-    }
-
-    public function save(): void
-    {
-        app(PreventionSettings::class)->fill(['formmail' => $this->formmail])->save();
-        $this->dispatch('success', 'Einstellungen gespeichert.');
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <x-page::setting-layout :active="$settingClass">
-                <x-slot:right>
-                    <x-form::save-button form="preventionsettingform"></x-form::save-button>
-                </x-slot:right>
-                <form id="preventionsettingform" class="grow p-6 grid grid-cols-1 gap-3 items-start content-start"
-                    wire:submit.prevent="save">
-                    <x-ui::setting-intro>
-                        Hier kannst du Einstellungen zu Prävention setzen.
-                    </x-ui::setting-intro>
-                    <x-form::editor hint="lala" name="frommail" wire:model="formmail" label="E-Mail für Veranstaltungs-TN"></x-form::editor>
-                </form>
-            </x-page::setting-layout>
-        HTML;
-    }
-}

modules/Form/Components/PreventionSettingViewTest.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Modules\Form\Components;
-
-use App\Prevention\PreventionSettings;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Tests\RequestFactories\EditorRequestFactory;
-use Tests\TestCase;
-
-uses(TestCase::class);
-uses(DatabaseTransactions::class);
-
-it('it renders page', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    test()->get('/setting/prevention')->assertSeeLivewire(PreventionSettingView::class);
-});
-
-it('displays settings', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-    $text = EditorRequestFactory::new()->text(50, 'lorem ipsum')->toData();
-    app(PreventionSettings::class)->fill(['formmail' => $text])->save();
-
-    Livewire::test(PreventionSettingView::class)
-        ->assertSet('formmail.blocks.0.data.text', 'lorem ipsum')
-        ->assertSeeHtml('data-active');
-});
-
-it('saves settings', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    $text = EditorRequestFactory::new()->text(50, 'new lorem')->create();
-    Livewire::test(PreventionSettingView::class)
-        ->set('formmail', $text)
-        ->call('save')
-        ->assertDispatched('success', 'Einstellungen gespeichert.');
-
-    $this->assertTrue(app(PreventionSettings::class)->formmail->hasAll(['new lorem']));
-});

modules/Form/FormServiceProvider.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Modules\Form;
-
-use Illuminate\Routing\Router;
-use Illuminate\Support\ServiceProvider;
-use Modules\Form\Components\FormSettingView;
-use App\Setting\SettingFactory;
-use App\Form\FormSettings;
-use App\Prevention\PreventionSettings;
-use Modules\Form\Components\PreventionSettingView;
-
-class FormServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        app(SettingFactory::class)->register(FormSettings::class);
-        app(SettingFactory::class)->register(PreventionSettings::class);
-
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/setting/form', FormSettingView::class)->name('setting.form');
-            $router->get('/setting/prevention', PreventionSettingView::class)->name('setting.prevention');
-        });
-    }
-}

modules/Invoice/Components/SettingView.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace Modules\Invoice\Components;
-
-use App\Module\Module;
-use Illuminate\Validation\Rule;
-use Livewire\Component;
-use Modules\Invoice\InvoiceSettings;
-use Modules\Module\ModuleSettings;
-
-class SettingView extends Component
-{
-
-    public $settingClass = InvoiceSettings::class;
-    public InvoiceSettings $settings;
-
-    public function mount(): void
-    {
-        $this->settings = app(InvoiceSettings::class);
-    }
-
-    public function save(): void
-    {
-        $this->settings->save();
-        $this->dispatch('success', 'Einstellungen gespeichert.');
-    }
-
-    public function render()
-    {
-        return <<<'HTML'
-            <x-page::setting-layout :active="$settingClass">
-                <x-slot:right>
-                    <x-form::save-button form="billsettingform"></x-form::save-button>
-                </x-slot:right>
-                <form id="billsettingform" class="grow p-6 grid grid-cols-2 gap-3 items-start content-start" wire:submit.prevent="save">
-                    <x-form::text name="from" wire:model="settings.from" label="Absender" hint="Absender-Name in Kurzform, i.d.R. der kurze Stammesname"></x-form::text>
-                    <x-form::text name="from_long" wire:model="settings.from_long" label="Absender (lang)" hint="Absender-Name in Langform, i.d.R. der Stammesname"></x-form::text>
-                    <x-ui::setting-intro class="col-span-full mt-5" title="Kontaktdaten">
-                        Hier kannst du deine Zugangsdaten zu NaMi anpassen, falls sich z.B. dein Passwort geändert hat.
-                    </x-ui::setting-intro>
-                    <x-form::text name="address" wire:model="settings.address" label="Straße"></x-form::text>
-                    <x-form::text name="zip" wire:model="settings.zip" label="PLZ"></x-form::text>
-                    <x-form::text name="place" wire:model="settings.place" label="Ort"></x-form::text>
-                    <x-form::text name="email" wire:model="settings.email" label="E-Mail-Adresse"></x-form::text>
-                    <x-form::text name="mobile" wire:model="settings.mobile" label="Telefonnummer"></x-form::text>
-                    <x-form::text name="website" wire:model="settings.website" label="Webseite"></x-form::text>
-                    <x-form::text name="iban" wire:model="settings.iban" label="IBAN"></x-form::text>
-                    <x-form::text name="bic" wire:model="settings.bic" label="BIC"></x-form::text>
-                    <x-form::text name="remember_weeks" wire:model="settings.rememberWeeks" type="number" label="Erinnerung alle X Wochen versenden"></x-form::text>
-                </form>
-            </x-page::setting-layout>
-        HTML;
-    }
-}

modules/Invoice/InvoiceServiceProvider.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Modules\Invoice;
-
-use Illuminate\Routing\Router;
-use Illuminate\Support\ServiceProvider;
-use Modules\Invoice\Components\SettingView as ComponentsSettingView;
-
-class InvoiceServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/setting/bill', ComponentsSettingView::class)->name('setting.bill');
-        });
-    }
-}

modules/Invoice/InvoiceSettingTest.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace Modules\Invoice;
-
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Livewire\Livewire;
-use Modules\Invoice\Components\SettingView;
-use Tests\TestCase;
-
-uses(TestCase::class);
-uses(DatabaseTransactions::class);
-
-it('it renders page', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    test()->get('/setting/bill')->assertSeeLivewire(SettingView::class);
-});
-
-it('it displays settings', function () {
-    $this->withoutExceptionHandling()->login()->loginNami();
-    app(InvoiceSettings::class)->fill([
-        'from_long' => 'DPSG Stamm Muster',
-        'from' => 'Stamm Muster',
-        'mobile' => '+49 176 55555',
-        'email' => 'max@muster.de',
-        'website' => 'https://example.com',
-        'address' => 'Musterstr 4',
-        'place' => 'Solingen',
-        'zip' => '12345',
-        'iban' => 'DE05',
-        'bic' => 'SOLSDE',
-        'rememberWeeks' => 6
-    ])->save();
-
-    Livewire::test(SettingView::class)
-        ->assertSet('settings.from_long', 'DPSG Stamm Muster')
-        ->assertSet('settings.from', 'Stamm Muster')
-        ->assertSet('settings.mobile', '+49 176 55555')
-        ->assertSet('settings.email', 'max@muster.de')
-        ->assertSet('settings.website', 'https://example.com')
-        ->assertSet('settings.address', 'Musterstr 4')
-        ->assertSet('settings.place', 'Solingen')
-        ->assertSet('settings.zip', '12345')
-        ->assertSet('settings.iban', 'DE05')
-        ->assertSet('settings.bic', 'SOLSDE')
-        ->assertSet('settings.rememberWeeks', 6);
-});
-
-it('testItCanChangeSettings', function () {
-    test()->withoutExceptionHandling()->login()->loginNami();
-
-    Livewire::test(SettingView::class)
-        ->set('settings.from_long', 'DPSG Stamm Muster')
-        ->set('settings.from', 'Stamm Muster')
-        ->set('settings.mobile', '+49 176 55555')
-        ->set('settings.email', 'max@muster.de')
-        ->set('settings.website', 'https://example.com')
-        ->set('settings.address', 'Musterstr 4')
-        ->set('settings.place', 'Solingen')
-        ->set('settings.zip', '12345')
-        ->set('settings.iban', 'DE05')
-        ->set('settings.bic', 'SOLSDE')
-        ->set('settings.rememberWeeks', 10)
-        ->call('save')
-        ->assertDispatched('success', 'Einstellungen gespeichert.');
-
-    $settings = app(InvoiceSettings::class);
-    $this->assertEquals('DPSG Stamm Muster', $settings->from_long);
-    $this->assertEquals('DE05', $settings->iban);
-    $this->assertEquals('SOLSDE', $settings->bic);
-    $this->assertEquals(10, $settings->rememberWeeks);
-});