.eslintrc.json

@@ -0,0 +1,28 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:vue/vue3-recommended",
+        "prettier"
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.vue"
+            ],
+            "rules": {
+                "vue/multi-word-component-names": "off"
+            }
+        }
+    ]
+}

CHANGELOG.md

@@ -1,35 +1,5 @@
 # Letzte Änderungen
 
-### 1.12.19
-
--   Zuschusslisten können nun aus Veranstaltungs-Daten erstellt werden
--   Veranstaltungs-Übersicht zeigt nun Tags an
-
-### 1.12.18
-
--   Fix: Initialisierung klappt nun auch, wenn Mitgliedsnummer mit einer 0 beginnt
-
-### 1.12.17
-
--   Fix: Mitgliedschaften werden beim Sammel-Speichern nicht mehr doppelt angelegt
-
-### 1.12.16
-
--   Mitgliedschaften können nun bei Mitgliedschaften-Übersicht gelöscht werden
-
-### 1.12.15
-
--   Bestätigung wird eingeblendet beim Kopieren eines Events
-
-### 1.12.14
-
--   Bilder werden nun mitkopiert beim Kopieren eines Events
-
-### 1.12.13
-
--   Kopieren von bestehenden Veranstaltungen
--   Präventions-Erinnerung automatisch versenden
-
 ### 1.12.11
 
 -   Fix: Bank Account mit abrufen wenn Mitglied editiert wird

app/Activity/Resources/ActivityResource.php

@@ -54,7 +54,6 @@ class ActivityResource extends JsonResource
                 'index' => route('activity.index'),
                 'create' => route('activity.create'),
                 'membership_masslist' => route('membership.masslist.index'),
-                'membership_index' => route('membership.index'),
             ],
         ];
     }

app/Console/Kernel.php

@@ -6,7 +6,6 @@ use App\Actions\DbMaintainAction;
 use App\Form\Actions\PreventionRememberAction;
 use App\Initialize\InitializeMembers;
 use App\Invoice\Actions\InvoiceSendAction;
-use App\Prevention\Actions\YearlyRememberAction;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -22,7 +21,6 @@ class Kernel extends ConsoleKernel
         InitializeMembers::class,
         DbMaintainAction::class,
         PreventionRememberAction::class,
-        YearlyRememberAction::class,
     ];
 
     /**
@@ -36,7 +34,6 @@ class Kernel extends ConsoleKernel
         $schedule->command(InitializeMembers::class)->dailyAt('03:00');
         $schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
         $schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
-        $schedule->command(YearlyRememberAction::class)->dailyAt('09:00');
     }
 
     /**

app/Contribution/Actions/GenerateAction.php

@@ -2,11 +2,11 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\ContributionFactory;
-use App\Contribution\Requests\GenerateRequest;
+use App\Contribution\Documents\ContributionDocument;
 use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,19 +15,23 @@ class GenerateAction
 {
     use AsAction;
 
-    public function handle(HasContributionData $request): BaseCompiler
+    /**
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
+     */
+    public function handle(string $document, array $payload): BaseCompiler
     {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromRequest($payload));
     }
 
-    public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
+    public function asController(ActionRequest $request): BaseCompiler
     {
-        app(ContributionFactory::class)->validateType($request);
+        $payload = $this->payload($request);
-        $request->validateContribution();
+        $type = data_get($payload, 'type');
+        ValidateAction::validateType($type);
+        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
 
-        return $request->input('validate')
+        return $this->handle($type, $payload);
-            ? response()->json([])
-            : $this->handle($request);
     }
 
     /**
@@ -39,4 +43,12 @@ class GenerateAction
             'payload' => [new JsonBase64Rule()],
         ];
     }
+
+    /**
+     * @return array<string, string>
+     */
+    private function payload(ActionRequest $request): array
+    {
+        return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
+    }
 }

app/Contribution/Actions/GenerateApiAction.php

@@ -2,9 +2,8 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Documents\ContributionDocument;
-use App\Contribution\ContributionFactory;
+use Lorisleiva\Actions\ActionRequest;
-use App\Contribution\Requests\GenerateApiRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -14,17 +13,26 @@ class GenerateApiAction
     use AsAction;
 
     /**
-     * @todo merge this with GenerateAction
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
      */
-    public function handle(HasContributionData $request): BaseCompiler
+    public function handle(string $document, array $payload): BaseCompiler
     {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromApiRequest($payload));
     }
 
-    public function asController(GenerateApiRequest $request): BaseCompiler
+    public function asController(ActionRequest $request): BaseCompiler
     {
-        app(ContributionFactory::class)->validateType($request);
+        ValidateAction::validateType($request->input('type'));
 
-        return $this->handle($request);
+        return $this->handle($request->input('type'), $request->input());
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [];
     }
 }

app/Contribution/Actions/ValidateAction.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Contribution\Actions;
+
+use App\Contribution\ContributionFactory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ValidateAction
+{
+    use AsAction;
+
+    public function asController(): JsonResponse
+    {
+        return response()->json(['valid' => true]);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return app(ContributionFactory::class)->rules(request()->type);
+    }
+
+    public function prepareForValidation(ActionRequest $request): void
+    {
+        static::validateType($request->input('type'));
+    }
+
+    public static function validateType(?string $type = null): void
+    {
+        Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
+    }
+}

app/Contribution/Contracts/HasContributionData.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Contribution\Contracts;
-
-use App\Contribution\Data\MemberData;
-use Carbon\Carbon;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use Illuminate\Support\Collection;
-
-interface HasContributionData {
-
-    public function dateFrom(): Carbon;
-    public function dateUntil(): Carbon;
-    public function zipLocation(): string;
-    public function eventName(): string;
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string;
-
-    /**
-     * @return Collection<int, MemberData>
-     */
-    public function members(): Collection;
-
-    public function country(): ?Country;
-
-    public function validateContribution(): void;
-}

app/Contribution/ContributionFactory.php

@@ -2,7 +2,6 @@
 
 namespace App\Contribution;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 use App\Contribution\Documents\RdpNrwDocument;
@@ -11,7 +10,6 @@ use App\Contribution\Documents\CitySolingenDocument;
 use App\Contribution\Documents\CityFrankfurtMainDocument;
 use App\Contribution\Documents\WuppertalDocument;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
 class ContributionFactory
@@ -29,13 +27,13 @@ class ContributionFactory
     ];
 
     /**
-     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
+     * @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
      */
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'name' => $document::getName(),
+            'title' => $document::buttonName(),
-            'id' => $document,
+            'class' => $document,
         ]);
     }
 
@@ -61,9 +59,4 @@ class ContributionFactory
             ...$type::rules(),
         ];
     }
-
-    public function validateType(HasContributionData $request): void {
-        Validator::make(['type' => $request->type()], $this->typeRule())->validate();
 }
-}
-

app/Contribution/Data/MemberData.php

@@ -47,7 +47,7 @@ class MemberData extends Data
         return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
             ...$member,
             'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
-            'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
+            'gender' => Gender::fromString($member['gender']),
             'isLeader' => $member['is_leader'],
         ]));
     }

app/Contribution/Documents/BdkjHesse.php

@@ -2,11 +2,9 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
@@ -19,8 +17,8 @@ class BdkjHesse extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -41,15 +39,33 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(20),
+            members: MemberData::fromModels($request['members'])->chunk(20),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(20),
+            eventName: $request['eventName'],
         );
     }
 
@@ -117,15 +133,4 @@ class BdkjHesse extends ContributionDocument
             'zipLocation' => 'required|string',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -2,15 +2,12 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
@@ -23,8 +20,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -36,15 +33,33 @@ class CityFrankfurtMainDocument extends ContributionDocument
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(15),
+            members: MemberData::fromModels($request['members'])->chunk(15),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(15),
+            eventName: $request['eventName'],
         );
     }
 
@@ -75,15 +90,4 @@ class CityFrankfurtMainDocument extends ContributionDocument
             'zipLocation' => 'required|string',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
-        ];
-    }
 }

app/Contribution/Documents/CityRemscheidDocument.php

@@ -2,14 +2,12 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use App\Member\Member;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;
 
 class CityRemscheidDocument extends ContributionDocument
 {
@@ -21,8 +19,8 @@ class CityRemscheidDocument extends ContributionDocument
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
@@ -34,18 +32,40 @@ class CityRemscheidDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
-        [$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
+        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
 
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        $members = MemberData::fromApi($request['member_data']);
+        [$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
+
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            leaders: $leaders->values()->toBase()->chunk(6),
+            children: $children->values()->toBase()->chunk(20),
+            eventName: $request['eventName'],
         );
     }
 
@@ -66,15 +86,4 @@ class CityRemscheidDocument extends ContributionDocument
             'country' => 'required|integer|exists:countries,id',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-        ];
-    }
 }

app/Contribution/Documents/CitySolingenDocument.php

@@ -2,9 +2,7 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
-use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
@@ -18,8 +16,8 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
@@ -32,14 +30,28 @@ class CitySolingenDocument extends ContributionDocument
     /**
      * {@inheritdoc}
      */
-    public static function fromPayload(HasContributionData $request): static
+    public static function fromRequest(array $request): static
     {
         return new static(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            members: $request->members(),
+            members: MemberData::fromModels($request['members']),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): static
+    {
+        return new static(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            members: MemberData::fromApi($request['member_data']),
+            eventName: $request['eventName'],
         );
     }
 
@@ -63,6 +75,8 @@ class CitySolingenDocument extends ContributionDocument
 
     public function checkboxes(): string
     {
+        $output = '';
+
         $firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
             return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
         })->implode(' & ') . ' \\\\';
@@ -95,15 +109,4 @@ class CitySolingenDocument extends ContributionDocument
             'zipLocation' => 'required|string',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
-        ];
-    }
 }

app/Contribution/Documents/ContributionDocument.php

@@ -2,8 +2,6 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
-use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Template;
 
@@ -13,12 +11,15 @@ abstract class ContributionDocument extends Document
 
     abstract public static function getName(): string;
 
-    abstract public static function fromPayload(HasContributionData $request): self;
+    /**
+     * @param ContributionRequestArray $request
+     */
+    abstract public static function fromRequest(array $request): self;
 
     /**
-     * @return array<int, SpecialType>
+     * @param ContributionApiRequestArray $request
      */
-    abstract public static function requiredFormSpecialTypes(): array;
+    abstract public static function fromApiRequest(array $request): self;
 
     /**
      * @return array<string, mixed>
@@ -37,6 +38,11 @@ abstract class ContributionDocument extends Document
         ];
     }
 
+    public static function buttonName(): string
+    {
+        return 'Für ' . static::getName() . ' erstellen';;
+    }
+
     public function setEventName(string $eventName): void
     {
         $this->eventName = $eventName;

app/Contribution/Documents/RdpNrwDocument.php

@@ -2,14 +2,11 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;
 
 class RdpNrwDocument extends ContributionDocument
 {
@@ -20,8 +17,8 @@ class RdpNrwDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -32,15 +29,33 @@ class RdpNrwDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(17),
+            members: MemberData::fromModels($request['members'])->chunk(17),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(17),
+            eventName: $request['eventName'],
         );
     }
 
@@ -66,15 +81,4 @@ class RdpNrwDocument extends ContributionDocument
             'zipLocation' => 'required|string',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }

app/Contribution/Documents/WuppertalDocument.php

@@ -2,14 +2,11 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;
 
 class WuppertalDocument extends ContributionDocument
 {
@@ -21,8 +18,8 @@ class WuppertalDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -33,15 +30,33 @@ class WuppertalDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(14),
+            members: MemberData::fromModels($request['members'])->chunk(14),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(14),
+            eventName: $request['eventName'],
         );
     }
 
@@ -61,16 +76,4 @@ class WuppertalDocument extends ContributionDocument
             'zipLocation' => 'required|string',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }

app/Contribution/Enums/Country.php

@@ -1,256 +0,0 @@
-<?php
-
-namespace App\Contribution\Enums;
-
-enum Country: string {
-    case AD = 'Andorra';
-    case AE = 'Vereinigte Arabische Emirate';
-    case AF = 'Afghanistan';
-    case AG = 'Antigua und Barbuda';
-    case AI = 'Anguilla';
-    case AL = 'Albanien';
-    case AM = 'Armenien';
-    case AN = 'Niederländische Antillen';
-    case AO = 'Angola';
-    case AQ = 'Antarktis';
-    case AR = 'Argentinien';
-    case AS = 'Amerikanisch-Samoa';
-    case AT = 'Österreich (Austria)';
-    case AU = 'Australien';
-    case AW = 'Aruba';
-    case AZ = 'Azerbaijan';
-    case BA = 'Bosnien-Herzegovina';
-    case BB = 'Barbados';
-    case BD = 'Bangladesh';
-    case BE = 'Belgien';
-    case BF = 'Burkina Faso';
-    case BG = 'Bulgarien';
-    case BH = 'Bahrain';
-    case BI = 'Burundi';
-    case BJ = 'Benin';
-    case BM = 'Bermudas';
-    case BN = 'Brunei Darussalam';
-    case BO = 'Bolivien';
-    case BR = 'Brasilien';
-    case BS = 'Bahamas';
-    case BT = 'Bhutan';
-    case BV = 'Bouvet Island';
-    case BW = 'Botswana';
-    case BY = 'Weißrußland (Belarus)';
-    case BZ = 'Belize';
-    case CA = 'Canada';
-    case CC = 'Cocos (Keeling) Islands';
-    case CD = 'Demokratische Republik Kongo';
-    case CF = 'Zentralafrikanische Republik';
-    case CG = 'Kongo';
-    case CH = 'Schweiz';
-    case CI = 'Elfenbeinküste (Cote D’Ivoire)';
-    case CK = 'Cook Islands';
-    case CL = 'Chile';
-    case CM = 'Kamerun';
-    case CN = 'China';
-    case CO = 'Kolumbien';
-    case CR = 'Costa Rica';
-    case CS = 'Tschechoslowakei (ehemalige)';
-    case CU = 'Kuba';
-    case CV = 'Kap Verde';
-    case CX = 'Christmas Island';
-    case CY = 'Zypern';
-    case CZ = 'Tschechische Republik';
-    case DE = 'Deutschland';
-    case DJ = 'Djibouti';
-    case DK = 'Dänemark';
-    case DM = 'Dominica';
-    case DO = 'Dominikanische Republik';
-    case DZ = 'Algerien';
-    case EC = 'Ecuador';
-    case EE = 'Estland';
-    case EG = 'Ägypten';
-    case EH = 'Westsahara';
-    case ER = 'Eritrea';
-    case ES = 'Spanien';
-    case ET = 'Äthiopien';
-    case FI = 'Finnland';
-    case FJ = 'Fiji';
-    case FK = 'Falkland-Inseln (Malvinas)';
-    case FM = 'Micronesien';
-    case FO = 'Faröer-Inseln';
-    case FR = 'Frankreich';
-    case FX = 'France, Metropolitan';
-    case GA = 'Gabon';
-    case GD = 'Grenada';
-    case GE = 'Georgien';
-    case GF = 'Französisch Guiana';
-    case GH = 'Ghana';
-    case GI = 'Gibraltar';
-    case GL = 'Grönland';
-    case GM = 'Gambia';
-    case GN = 'Guinea';
-    case GP = 'Guadeloupe';
-    case GQ = 'Äquatorialguinea';
-    case GR = 'Griechenland';
-    case GS = 'Südgeorgien und Südliche Sandwich-Inseln';
-    case GT = 'Guatemala';
-    case GU = 'Guam';
-    case GW = 'Guinea-Bissau';
-    case GY = 'Guyana';
-    case HK = 'Kong Hong';
-    case HM = 'Heard und Mc Donald Islands';
-    case HN = 'Honduras';
-    case HT = 'Haiti';
-    case HU = 'Ungarn';
-    case ID = 'Indonesien';
-    case IE = 'Irland';
-    case IL = 'Israel';
-    case IN = 'Indien';
-    case IO = 'British Indian Ocean Territory';
-    case IQ = 'Irak';
-    case IR = 'Iran (Islamische Republik)';
-    case IS = 'Island';
-    case IT = 'Italien';
-    case JM = 'Jamaica';
-    case JO = 'Jordanien';
-    case JP = 'Japan';
-    case KE = 'Kenya';
-    case KG = 'Kirgisien';
-    case KH = 'Königreich Kambodscha';
-    case KI = 'Kiribati';
-    case KM = 'Komoren';
-    case KN = 'Saint Kitts und Nevis';
-    case KP = 'Korea, Volksrepublik';
-    case KR = 'Korea';
-    case KW = 'Kuwait';
-    case KY = 'Kayman Islands';
-    case KZ = 'Kasachstan';
-    case LA = 'Laos';
-    case LB = 'Libanon';
-    case LC = 'Saint Lucia';
-    case LI = 'Liechtenstein';
-    case LK = 'Sri Lanka';
-    case LR = 'Liberia';
-    case LS = 'Lesotho';
-    case LT = 'Littauen';
-    case LU = 'Luxemburg';
-    case LV = 'Lettland';
-    case LY = 'Libyen';
-    case MA = 'Marokko';
-    case MC = 'Monaco';
-    case MD = 'Moldavien';
-    case MG = 'Madagaskar';
-    case MH = 'Marshall-Inseln';
-    case MK = 'Mazedonien, ehem. Jugoslawische Republik';
-    case ML = 'Mali';
-    case MM = 'Myanmar';
-    case MN = 'Mongolei';
-    case MO = 'Macao';
-    case MP = 'Nördliche Marianneninseln';
-    case MQ = 'Martinique';
-    case MR = 'Mauretanien';
-    case MS = 'Montserrat';
-    case MT = 'Malta';
-    case MU = 'Mauritius';
-    case MV = 'Malediven';
-    case MW = 'Malawi';
-    case MX = 'Mexico';
-    case MY = 'Malaysien';
-    case MZ = 'Mozambique';
-    case NA = 'Namibia';
-    case NC = 'Neu Kaledonien';
-    case NE = 'Niger';
-    case NF = 'Norfolk Island';
-    case NG = 'Nigeria';
-    case NI = 'Nicaragua';
-    case NL = 'Niederlande';
-    case NO = 'Norwegen';
-    case NP = 'Nepal';
-    case NR = 'Nauru';
-    case NU = 'Niue';
-    case NZ = 'Neuseeland';
-    case OM = 'Oman';
-    case PA = 'Panama';
-    case PE = 'Peru';
-    case PF = 'Französisch Polynesien';
-    case PG = 'Papua Neuguinea';
-    case PH = 'Philippinen';
-    case PK = 'Pakistan';
-    case PL = 'Polen';
-    case PM = 'St. Pierre und Miquelon';
-    case PN = 'Pitcairn';
-    case PR = 'Puerto Rico';
-    case PT = 'Portugal';
-    case PW = 'Palau';
-    case PY = 'Paraguay';
-    case QA = 'Katar';
-    case RE = 'Reunion';
-    case RO = 'Rumänien';
-    case RU = 'Russische Föderation';
-    case RW = 'Ruanda';
-    case SA = 'Saudi Arabien';
-    case SB = 'Salomonen';
-    case SC = 'Seychellen';
-    case SD = 'Sudan';
-    case SE = 'Schweden';
-    case SG = 'Singapur';
-    case SH = 'St. Helena';
-    case SI = 'Slovenien';
-    case SJ = 'Svalbard und Jan Mayen Islands';
-    case SK = 'Slowakei';
-    case SL = 'Sierra Leone';
-    case SM = 'San Marino';
-    case SN = 'Senegal';
-    case SO = 'Somalia';
-    case SR = 'Surinam';
-    case ST = 'Sao Tome und Principe';
-    case SV = 'El Salvador';
-    case SY = 'Syrien, Arabische Republik';
-    case SZ = 'Swaziland';
-    case TC = 'Turk und Caicos-Inseln';
-    case TD = 'Tschad';
-    case TF = 'Französisches Südl.Territorium';
-    case TG = 'Togo';
-    case TH = 'Thailand';
-    case TJ = 'Tadschikistan';
-    case TK = 'Tokelau';
-    case TM = 'Turkmenistan';
-    case TN = 'Tunesien';
-    case TO = 'Tonga';
-    case TP = 'Ost-Timor';
-    case TR = 'Türkei';
-    case TT = 'Trinidad und Tobago';
-    case TV = 'Tuvalu';
-    case TW = 'Taiwan';
-    case TZ = 'Tansania, United Republic of';
-    case UA = 'Ukraine';
-    case UG = 'Uganda';
-    case GB = 'Großbritannien';
-    case US = 'Vereinigte Staaten';
-    case UM = 'Vereinigte Staaten, Minor Outlying Islands';
-    case UY = 'Uruguay';
-    case UZ = 'Usbekistan';
-    case VA = 'Vatikanstaat';
-    case VC = 'Saint Vincent und Grenadines';
-    case VE = 'Venezuela';
-    case VG = 'Virgin Islands (Britisch)';
-    case VI = 'Virgin Islands (U.S.)';
-    case VN = 'Vietnam';
-    case VU = 'Vanuatu';
-    case WF = 'Wallis und Futuna Islands';
-    case WS = 'Samoa';
-    case YE = 'Jemen';
-    case YT = 'Mayotte';
-    case YU = 'Jugoslawien';
-    case ZA = 'Südafrika';
-    case ZM = 'Sambia';
-    case ZW = 'Zimbabw';
-
-    /**
-     * @return array<int, array{name: string, id: string}>
-     */
-    public static function forSelect(): array
-    {
-        return collect(static::cases())
-            ->map(fn ($case) => ['id' => $case->value, 'name' => $case->value])
-            ->toArray();
-    }
-}
-

app/Contribution/Requests/GenerateApiRequest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Data\MemberData;
-use Illuminate\Support\Collection;
-
-class GenerateApiRequest extends GenerateRequest {
-    /**
-     * @return array<string, string>
-     */
-    public function payload(): array
-    {
-        return $this->input();
-    }
-
-    public function validateContribution(): void {
-    }
-
-    public function members(): Collection {
-        return MemberData::fromApi($this->value('members'));
-    }
-
-}

app/Contribution/Requests/GenerateRequest.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use Lorisleiva\Actions\ActionRequest;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-
-class GenerateRequest extends ActionRequest implements HasContributionData {
-    /**
-     * @return array<string, string>
-     */
-    protected function payload(): array
-    {
-        return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
-    }
-
-    public function validateContribution(): void {
-        Validator::make($this->payload(), app(ContributionFactory::class)->rules($this->type()))->validate();
-    }
-
-    /**
-     * @return string|array<array-key, mixed>
-     */
-    public function value(string $key): string|array
-    {
-        return data_get($this->payload(), $key);
-    }
-
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string
-    {
-        return $this->value('type');
-    }
-
-    public function dateFrom(): Carbon {
-        return Carbon::parse($this->value('dateFrom'));
-    }
-
-    public function dateUntil(): Carbon {
-        return Carbon::parse($this->value('dateUntil'));
-    }
-
-    public function zipLocation(): string {
-        return $this->value('zipLocation');
-    }
-
-    public function eventName(): string {
-        return $this->value('eventName');
-    }
-
-    public function members(): Collection {
-        return MemberData::fromModels($this->value('members'));
-    }
-
-    public function country(): ?Country {
-        return Country::where('id', $this->value('country'))->first();
-    }
-
-}

app/Form/Actions/FormApiListAction.php

@@ -16,7 +16,7 @@ class FormApiListAction
 
     /**
      * @param string $filter
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
      */
     public function handle(string $filter, int $perPage): LengthAwarePaginator
     {

app/Form/Actions/FormCopyAction.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Form;
-use App\Lib\Events\Succeeded;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormCopyAction
-{
-    use AsAction;
-
-    public function handle(Form $form): Form
-    {
-        $newForm = $form->replicate();
-        $newForm->save();
-        $newForm->update(['name' => $form->name.' - Kopie', 'is_active' => false]);
-
-        foreach ($form->getRegisteredMediaCollections() as $collection) {
-            foreach ($form->getMedia($collection->name) as $media) {
-                $media->copy($newForm, $collection->name);
-            }
-        }
-
-        ClearFrontendCacheAction::run();
-
-        return $form;
-    }
-
-    public function asController(Form $form): JsonResponse
-    {
-        $this->handle($form);
-
-        Succeeded::message('Veranstaltung kopiert.')->dispatch();
-        return response()->json([]);
-    }
-}

app/Form/Actions/FormGenerateLaterlinkAction.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\FormSettings;
-use App\Form\Models\Form;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\URL;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormGenerateLaterlinkAction
-{
-    use AsAction;
-
-    public function asController(Form $form)
-    {
-        $registerUrl = str(app(FormSettings::class)->registerUrl)->replace('{slug}', $form->slug)->toString();
-        $laterId = str()->uuid()->toString();
-        $laterUrl = URL::signedRoute('form.register', ['form' => $form, 'later' => '1', 'id' => $laterId]);
-        $urlParts = parse_url($laterUrl);
-
-        Cache::remember('later_'.$laterId, 2592000, fn () => $form->id);    // Link ist 40 Tage gültig
-
-        return response()->json([
-            'url' => $registerUrl.'?'.data_get($urlParts, 'query')
-        ]);
-    }
-}

app/Form/Actions/FormIndexAction.php

@@ -16,7 +16,7 @@ class FormIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
      */
     public function handle(string $filter): LengthAwarePaginator
     {

app/Form/Actions/FormStoreAction.php

@@ -36,10 +36,6 @@ class FormStoreAction
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
             'prevention_conditions' => 'array',
-            'leader_conditions' => 'array',
-            'zip' => 'present|nullable|string',
-            'location' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
         ];
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -3,6 +3,7 @@
 namespace App\Form\Actions;
 
 use App\Form\Models\Form;
+use App\Lib\Editor\Condition;
 use App\Lib\Events\Succeeded;
 use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -35,10 +36,6 @@ class FormUpdateAction
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
             'prevention_conditions' => 'array',
-            'location' => 'present|nullable|string',
-            'zip' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
-            'leader_conditions' => 'array',
         ];
     }
 

app/Form/Actions/FormtemplateIndexAction.php

@@ -14,7 +14,7 @@ class FormtemplateIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<int, Formtemplate>
+     * @return LengthAwarePaginator<Formtemplate>
      */
     public function handle(): LengthAwarePaginator
     {

app/Form/Actions/GenerateContributionAction.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Form\Models\Form;
-use App\Form\Requests\FormCompileRequest;
-use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-use Zoomyboy\Tex\BaseCompiler;
-use Zoomyboy\Tex\Tex;
-
-class GenerateContributionAction
-{
-    use AsAction;
-
-    public function handle(HasContributionData $request): BaseCompiler
-    {
-        return Tex::compile($request->type()::fromPayload($request));
-    }
-
-    public function asController(ActionRequest $request, Form $form): BaseCompiler|JsonResponse
-    {
-        $r = FormCompileRequest::from(['form' => $form]);
-        app(ContributionFactory::class)->validateType($r);
-        $r->validateContribution();
-
-        return $request->input('validate')
-            ? response()->json([])
-            : $this->handle($r);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'payload' => [new JsonBase64Rule()],
-        ];
-    }
-}

app/Form/Actions/PreventionRememberAction.php

@@ -13,7 +13,7 @@ class PreventionRememberAction
 {
     use AsAction;
 
-    public string $commandSignature = 'prevention:remember-forms';
+    public string $commandSignature = 'prevention:remember';
 
     public function handle(): void
     {
@@ -33,7 +33,7 @@ class PreventionRememberAction
                 continue;
             }
 
-            if ($participant->getFields()->getMailRecipient() === null || $participant->preventions()->count() === 0) {
+            if ($participant->getFields()->getMailRecipient() === null || count($participant->preventions()) === 0) {
                 continue;
             }
 
@@ -41,7 +41,7 @@ class PreventionRememberAction
                 ->placeholder('formname', $participant->form->name)
                 ->append($participant->form->prevention_text);
 
-            Mail::send(new PreventionRememberMail($participant, $body, $participant->preventions()));
+            Mail::send(new PreventionRememberMail($participant, $body));
 
             $participant->update(['last_remembered_at' => now()]);
         }

app/Form/Actions/RegisterAction.php

@@ -7,9 +7,6 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Member\Member;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -23,6 +20,10 @@ class RegisterAction
      */
     public function handle(Form $form, array $input): Participant
     {
+        if (!$form->canRegister()) {
+            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
+        }
+
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
             ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
@@ -76,34 +77,8 @@ class RegisterAction
 
     public function asController(ActionRequest $request, Form $form): JsonResponse
     {
-        if (!$form->canRegister() && !$this->isRegisteringLater($request, $form)) {
-            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
-        }
-
         $participant = $this->handle($form, $request->validated());
 
-        if ($this->isRegisteringLater($request, $form)) {
-            Cache::forget('later_'.request('id'));
-        }
-
         return response()->json($participant);
     }
-
-    public function isRegisteringLater(ActionRequest $request, Form $form): bool {
-        if (!is_array($request->query())) {
-            return false;
-        }
-
-        $validator = Validator::make($request->query(), [
-            'later' => 'required|numeric|in:1',
-            'id' => 'required|string|uuid:4',
-            'signature' => 'required|string',
-        ]);
-
-        if (!URL::hasValidSignature($request) || $validator->fails()) {
-            return false;
-        }
-
-        return Cache::get('later_'.data_get($validator->validated(), 'id')) === $form->id;
-    }
 }

app/Form/Data/FieldCollection.php

@@ -114,12 +114,7 @@ class FieldCollection extends Collection
         return $this->map(fn ($field) => $field->presentRaw())->toArray();
     }
 
-    public function hasSpecialType(SpecialType $specialType): bool
+    private function findBySpecialType(SpecialType $specialType): ?Field
-    {
-        return $this->findBySpecialType($specialType) !== null;
-    }
-
-    public function findBySpecialType(SpecialType $specialType): ?Field
     {
         return $this->first(fn ($field) => $field->specialType === $specialType);
     }

app/Form/Enums/SpecialType.php

@@ -7,11 +7,6 @@ enum SpecialType: string
     case FIRSTNAME = 'Vorname';
     case LASTNAME = 'Nachname';
     case EMAIL = 'E-Mail-Adresse';
-    case BIRTHDAY = 'Geburtsdatum';
-    case ZIP = 'PLZ';
-    case LOCATION = 'Ort';
-    case ADDRESS = 'Adresse';
-    case GENDER = 'Geschlecht';
 
     /**
      * @return array<int, array{name: string, id: string}>

app/Form/Mails/ConfirmRegistrationMail.php

@@ -69,8 +69,10 @@ class ConfirmRegistrationMail extends Mailable
      */
     public function attachments()
     {
+        $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
+
         return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
+            ->filter(fn ($media) => $conditionResolver->filterCondition(Condition::fromMedia($media)))
             ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
             ->all();
     }

app/Form/Models/Form.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Models;
 
-use App\Contribution\Enums\Country;
 use App\Form\Actions\UpdateParticipantSearchIndexAction;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
@@ -19,6 +18,7 @@ use Laravel\Scout\Searchable;
 use Spatie\Image\Enums\Fit;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Zoomyboy\MedialibraryHelper\DefersUploads;
 
 /** @todo replace editor content with EditorData cast */
@@ -49,8 +49,6 @@ class Form extends Model implements HasMedia
         'to' => 'datetime',
         'registration_from' => 'datetime',
         'registration_until' => 'datetime',
-        'country' => Country::class,
-        'leader_conditions' => Condition::class,
     ];
 
     /**
@@ -71,14 +69,15 @@ class Form extends Model implements HasMedia
         return $this->hasMany(Participant::class);
     }
 
+
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('headerImage')
             ->singleFile()
             ->maxWidth(fn () => 500)
-            ->forceFileName(fn(Form $model) => $model->slug)
+            ->forceFileName(fn (Form $model, string $name) => $model->slug)
             ->convert(fn () => 'jpg')
-            ->registerMediaConversions(function () {
+            ->registerMediaConversions(function (Media $media) {
                 $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
             });
         $this->addMediaCollection('mailattachments')
@@ -190,7 +189,8 @@ class Form extends Model implements HasMedia
         return Sorting::from($this->meta['sorting']);
     }
 
-    public function isInDates(): bool {
+    public function canRegister(): bool
+    {
         if ($this->registration_from && $this->registration_from->gt(now())) {
             return false;
         }
@@ -201,9 +201,4 @@ class Form extends Model implements HasMedia
 
         return true;
     }
-
-    public function canRegister(): bool
-    {
-        return $this->is_active && $this->isInDates();
-    }
 }

app/Form/Models/Participant.php

@@ -4,17 +4,16 @@ namespace App\Form\Models;
 
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
-use App\Form\Editor\FormConditionResolver;
 use App\Form\Mails\ConfirmRegistrationMail;
-use App\Lib\Editor\Condition;
+use App\Form\Scopes\ParticipantFilterScope;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
 use Database\Factories\Form\Models\ParticipantFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Scout\Searchable;
 use stdClass;
@@ -82,15 +81,20 @@ class Participant extends Model implements Preventable
         Mail::to($this->getMailRecipient())->queue(new ConfirmRegistrationMail($this));
     }
 
+    public function preventableLayout(): string
+    {
+        return 'mail.prevention.prevention-remember-participant';
+    }
+
     /**
      * @inheritdoc
      */
-    public function preventions(): Collection
+    public function preventions(): array
     {
-        return $this->member?->preventions($this->form->from) ?: collect([]);
+        return $this->member?->preventions($this->form->from) ?: [];
     }
 
-    public function getMailRecipient(): ?stdClass
+    public function getMailRecipient(): stdClass
     {
         return $this->getFields()->getMailRecipient();
     }
@@ -110,8 +114,4 @@ class Participant extends Model implements Preventable
     {
         return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
     }
-
-    public function matchesCondition(Condition $condition): bool {
-        return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
-    }
 }

app/Form/Requests/FormCompileRequest.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Form\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use App\Form\Editor\FormConditionResolver;
-use App\Form\Enums\SpecialType;
-use App\Form\Models\Form;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-use Spatie\LaravelData\Data;
-
-class FormCompileRequest extends Data implements HasContributionData {
-
-    public function __construct(public Form $form) {}
-
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string
-    {
-        $payload = json_decode(rawurldecode(base64_decode(request()->input('payload'))), true);
-
-        return $payload['type'];
-    }
-
-    public function dateFrom(): Carbon
-    {
-        return $this->form->from;
-    }
-
-    public function dateUntil(): Carbon
-    {
-        return $this->form->to;
-    }
-
-    public function zipLocation(): string
-    {
-        return $this->form->zip.' '.$this->form->location;
-    }
-
-    public function eventName(): string
-    {
-        return $this->form->name;
-    }
-
-    public function members(): Collection
-    {
-        $members = [];
-        $fields = [
-            [SpecialType::FIRSTNAME, 'firstname'],
-            [SpecialType::LASTNAME, 'lastname'],
-            [SpecialType::BIRTHDAY, 'birthday'],
-            [SpecialType::GENDER, 'gender'],
-            [SpecialType::ADDRESS, 'address'],
-            [SpecialType::ZIP, 'zip'],
-            [SpecialType::LOCATION, 'location'],
-        ];
-
-        foreach ($this->form->participants as $participant) {
-            $member = [];
-            foreach ($fields as [$type, $name]) {
-                $f = $this->form->getFields()->findBySpecialType($type);
-                if (!$f) {
-                    continue;
-                }
-                $member[$name] = $participant->getFields()->find($f)->value;
-            }
-
-            $members[] = [
-                'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
-                'gender' => 'weiblich',
-                ...$member,
-            ];
-        }
-
-        return MemberData::fromApi($members);
-    }
-
-    public function country(): ?Country
-    {
-        return Country::first();
-    }
-
-    public function validateContribution(): void
-    {
-        Validator::make($this->form->toArray(), [
-            'zip' => 'required',
-            'location' => 'required'
-        ])
-            ->after(function($validator) {
-                foreach ($this->type()::requiredFormSpecialTypes() as $type) {
-                    if (!$this->form->getFields()->hasSpecialType($type)) {
-                        $validator->errors()->add($type->name, 'Kein Feld für ' . $type->value . ' vorhanden.');
-                    }
-                }
-                if ($this->form->participants->count() === 0) {
-                    $validator->errors()->add('participants',  'Veranstaltung besitzt noch keine Teilnehmer*innen.');
-                }
-            })
-            ->validate();
-    }
-}

app/Form/Resources/FormResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Resources;
 
-use App\Contribution\Enums\Country;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
 use App\Form\Enums\SpecialType;
@@ -15,7 +14,6 @@ use App\Group;
 use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contribution\ContributionFactory;
 
 /**
  * @mixin Form
@@ -46,7 +44,6 @@ class FormResource extends JsonResource
             'mail_bottom' => $this->mail_bottom,
             'registration_from' => $this->registration_from?->format('Y-m-d H:i:s'),
             'registration_until' => $this->registration_until?->format('Y-m-d H:i:s'),
-            'is_in_dates' => $this->isInDates(),
             'config' => $this->config,
             'participants_count' => $this->participants_count,
             'is_active' => $this->is_active,
@@ -56,21 +53,14 @@ class FormResource extends JsonResource
             'needs_prevention' => $this->needs_prevention,
             'prevention_text' => $this->prevention_text,
             'prevention_conditions' => $this->prevention_conditions,
-            'leader_conditions' => $this->leader_conditions,
-            'zip' => $this->zip,
-            'location' => $this->location,
-            'country' => $this->country,
             'links' => [
                 'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
                 'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
-                'update' => route('form.update', $this->getModel()),
+                'update' => route('form.update', ['form' => $this->getModel()]),
-                'destroy' => route('form.destroy', $this->getModel()),
+                'destroy' => route('form.destroy', ['form' => $this->getModel()]),
-                'is_dirty' => route('form.is-dirty', $this->getModel()),
+                'is_dirty' => route('form.is-dirty', ['form' => $this->getModel()]),
                 'frontend' => str(app(FormSettings::class)->registerUrl)->replace('{slug}', $this->slug),
-                'export' => route('form.export', $this->getModel()),
+                'export' => route('form.export', ['form' => $this->getModel()]),
-                'copy' => route('form.copy', $this->getModel()),
-                'contribution' => route('form.contribution', $this->getModel()),
-                'laterlink' => route('form.laterlink', $this->getModel()),
             ]
         ];
     }
@@ -92,8 +82,6 @@ class FormResource extends JsonResource
             'templates' => FormtemplateResource::collection(Formtemplate::get()),
             'namiTypes' => NamiType::forSelect(),
             'specialTypes' => SpecialType::forSelect(),
-            'countries' => Country::forSelect(),
-            'contribution_types' => app(ContributionFactory::class)->compilerSelect(),
             'default' => [
                 'description' => [],
                 'is_active' => true,
@@ -113,9 +101,6 @@ class FormResource extends JsonResource
                 'id' => null,
                 'export' => ExportData::from([]),
                 'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
-                'zip' => '',
-                'location' => '',
-                'country' => null,
             ],
             'section_default' => [
                 'name' => '',

app/Initialize/Actions/InitializeAction.php

@@ -71,7 +71,7 @@ class InitializeAction
 
     public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
     {
-        $settings->mglnr = $request->input('mglnr');
+        $settings->mglnr = (int) $request->input('mglnr');
         $settings->password = $request->input('password');
         $settings->default_group_id = (int) $request->input('group_id');
         $settings->search_params = $request->input('params');

app/Initialize/Actions/NamiGetSearchLayerAction.php

@@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
      */
     public function handle(array $input): Collection
     {
-        return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
+        return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
             SearchLayer::from($input['layer'] ?: 0),
             $input['parent'] ?: null
         );

app/Initialize/Actions/NamiLoginCheckAction.php

@@ -16,7 +16,7 @@ class NamiLoginCheckAction
      */
     public function handle(array $input): void
     {
-        Nami::freshLogin($input['mglnr'], $input['password']);
+        Nami::freshLogin((int) $input['mglnr'], $input['password']);
     }
 
     /**

app/Initialize/Actions/NamiSearchAction.php

@@ -16,7 +16,7 @@ class NamiSearchAction
     /**
      * @param array<string, mixed> $params
      *
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
      */
     public function handle(Api $api, int $page, array $params, int $perPage = 10): LengthAwarePaginator
     {
@@ -36,7 +36,7 @@ class NamiSearchAction
     }
 
     /**
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
      */
     public function asController(ActionRequest $request): LengthAwarePaginator
     {

app/Invoice/Scopes/InvoiceFilterScope.php

@@ -4,6 +4,7 @@ namespace App\Invoice\Scopes;
 
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Models\Invoice;
+use App\Lib\Filter;
 use App\Lib\ScoutFilter;
 use Laravel\Scout\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;

app/Lib/Data/DateData.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Lib\Data;
-
-use Spatie\LaravelData\Normalizers\Normalizer;
-use App\Lib\Normalizers\DateNormalizer;
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\WithTransformer;
-use App\Lib\Transformers\DateTransformer;
-use Carbon\Carbon;
-
-class DateData extends Data
-{
-    public function __construct(
-        #[WithTransformer(DateTransformer::class)]
-        public Carbon $raw,
-        public string $human,
-    ) {}
-
-    /**
-     * @return array<int, class-string<Normalizer>>
-     */
-    public static function normalizers(): array
-    {
-        return [
-            DateNormalizer::class,
-        ];
-    }
-}

app/Lib/Data/RecordData.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Lib\Data;
-
-use Spatie\LaravelData\Data;
-
-class RecordData extends Data {
-
-    public function __construct(
-        public int $id,
-        public string $name,
-    ) {}
-
-}

app/Lib/Editor/EditorData.php

@@ -14,7 +14,8 @@ class EditorData extends Data implements Editorable
         public string $version,
         public array $blocks,
         public int $time
-    ) {}
+    ) {
+    }
 
     public function placeholder(string $search, string $replacement): self
     {
@@ -29,12 +30,7 @@ class EditorData extends Data implements Editorable
      */
     public function hasAll(array $wanted): bool
     {
-        return collect($wanted)->doesntContain(fn($search) => !str(json_encode($this->blocks))->contains($search));
+        return collect($wanted)->first(fn ($search) => !str(json_encode($this->blocks))->contains($search)) === null;
-    }
-
-    public function hasNot(string $should): bool
-    {
-        return !str(json_encode($this->blocks))->contains($should);
     }
 
     public static function default(): self

app/Lib/Filter.php

@@ -14,12 +14,10 @@ abstract class Filter extends Data
 {
 
     /**
+     * @param Builder<T> $query
      * @return Builder<T>
      */
-    abstract public function getQuery(): Builder;
+    abstract public function apply(Builder $query): Builder;
-
-    /** @var Builder<T> */
-    protected Builder $query;
 
     /**
      * @param array<string, mixed>|string|null $request
@@ -38,6 +36,14 @@ abstract class Filter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::factory()->withoutMagicalCreation()->from($post ?: []);
+        return static::factory()->withoutMagicalCreation()->from($post ?: [])->toDefault();
+    }
+
+    /**
+     * @return static
+     */
+    public function toDefault(): self
+    {
+        return $this;
     }
 }

app/Lib/HasDataMeta.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Lib;
-
-use Spatie\LaravelData\PaginatedDataCollection;
-
-/**
- * @mixin Spatie\LaravelData\Data
- */
-trait HasDataMeta
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public static function collectPages(mixed $items): array {
-        $source = parent::collect($items, PaginatedDataCollection::class)->toArray();
-        return [
-            ...parent::collect($items, PaginatedDataCollection::class)->toArray(),
-            'meta' => [...$source['meta'], ...static::meta()]
-        ];
-    }
-}

app/Lib/HasMeta.php

@@ -2,9 +2,7 @@
 
 namespace App\Lib;
 
-/**
+/** @mixin \Illuminate\Http\Resources\Json\JsonResource */
- * @mixin \Illuminate\Http\Resources\Json\JsonResource
- */
 trait HasMeta
 {
     /**

app/Lib/Normalizers/DateNormalizer.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Lib\Normalizers;
-
-use Spatie\LaravelData\Normalizers\Normalizer;
-use Carbon\Carbon;
-
-class DateNormalizer implements Normalizer
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function normalize(mixed $value): ?array
-    {
-        if (!$value instanceof Carbon) {
-            return null;
-        }
-
-        return [
-            'raw' => $value,
-            'human' => $value->format('d.m.Y'),
-        ];
-    }
-}

app/Lib/Transformers/DateTransformer.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Lib\Transformers;
-
-use Spatie\LaravelData\Transformers\Transformer;
-use Spatie\LaravelData\Support\DataProperty;
-use Spatie\LaravelData\Support\Transformation\TransformationContext;
-use Carbon\Carbon;
-
-class DateTransformer implements Transformer
-{
-    public function transform(DataProperty $property, mixed $value, TransformationContext $context): string
-    {
-        return Carbon::parse($value)->format('Y-m-d');
-    }
-}

app/Member/Data/MemberData.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use Spatie\LaravelData\Data;
-use App\Member\Member;
-
-class MemberData extends Data
-{
-
-    public function __construct(
-        public string $fullname,
-    ) {}
-
-    public static function fromModel(Member $member): static
-    {
-        return static::factory()->withoutMagicalCreation()->from([
-            'fullname' => $member->fullname
-        ]);
-    }
-
-}

app/Member/Data/MembershipData.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use App\Activity;
-use App\Group;
-use Spatie\LaravelData\Data;
-use App\Lib\Data\DateData;
-use App\Lib\Data\RecordData;
-use App\Lib\HasDataMeta;
-use App\Member\Membership;
-use App\Membership\FilterScope;
-use App\Subactivity;
-
-class MembershipData extends Data
-{
-
-    use HasDataMeta;
-
-    /**
-     * @param array<string, string> $links
-     */
-    public function __construct(
-        public int $id,
-        public RecordData $activity,
-        public ?RecordData $subactivity,
-        public RecordData $group,
-        public ?DateData $promisedAt,
-        public DateData $from,
-        public ?DateData $to,
-        public MemberData $member,
-        public bool $isActive,
-        public array $links,
-    ) {}
-
-    public static function fromModel(Membership $membership): static
-    {
-        return static::factory()->withoutMagicalCreation()->from([
-            'id' => $membership->id,
-            'activity' => $membership->activity,
-            'subactivity' => $membership->subactivity,
-            'isActive' => $membership->isActive(),
-            'from' => $membership->from,
-            'to' => $membership->to,
-            'group' => $membership->group,
-            'promisedAt' => $membership->promised_at,
-            'member' => $membership->member,
-            'links' => [
-                'update' => route('membership.update', $membership),
-                'destroy' => route('membership.destroy', $membership),
-            ]
-        ]);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function meta(): array {
-        return [
-            'activities' => RecordData::collect(Activity::get()),
-            'subactivities' => RecordData::collect(Subactivity::get()),
-            'groups' => RecordData::collect(Group::get()),
-            'filter' => FilterScope::fromRequest(request()->input('filter', '')),
-        ];
-    }
-
-}

app/Member/FilterScope.php

@@ -48,7 +48,8 @@ class FilterScope extends ScoutFilter
         public ?bool $hasBirthday = null,
         public ?bool $hasSvk = null,
         public ?bool $hasVk = null,
-    ) {}
+    ) {
+    }
 
     /**
      * @param array<string, mixed> $options

app/Member/Member.php

@@ -13,8 +13,6 @@ use App\Nami\HasNamiField;
 use App\Nationality;
 use App\Payment\Subscription;
 use App\Pdf\Sender;
-use App\Prevention\Contracts\Preventable;
-use App\Prevention\Data\PreventionData;
 use App\Region;
 use App\Setting\NamiSettings;
 use Carbon\Carbon;
@@ -37,14 +35,12 @@ use Zoomyboy\Phone\HasPhoneNumbers;
 use App\Prevention\Enums\Prevention;
 use Database\Factories\Member\MemberFactory;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Support\Collection;
-use stdClass;
 
 /**
  * @property string $subscription_name
  * @property int    $pending_payment
  */
-class Member extends Model implements Geolocatable, Preventable
+class Member extends Model implements Geolocatable
 {
     use Notifiable;
     use HasNamiField;
@@ -198,24 +194,6 @@ class Member extends Model implements Geolocatable, Preventable
         return (int) $this->invoicePositions()->whereHas('invoice', fn ($query) => $query->whereNeedsPayment())->sum('price');
     }
 
-    public function getMailRecipient(): ?stdClass
-    {
-        if (!$this->fullname) {
-            return null;
-        }
-
-        if (!$this->email) {
-            return null;
-        }
-
-        return (object) ['name' => $this->fullname, 'email' => $this->email];
-    }
-
-    public function preventableSubject(): string
-    {
-        return 'Nachweise erforderlich';
-    }
-
     // ---------------------------------- Relations ----------------------------------
     /**
      * @return BelongsTo<Country, $this>
@@ -386,47 +364,32 @@ class Member extends Model implements Geolocatable, Preventable
     }
 
     /**
-     * @inheritdoc
+     * @return array<int, Prevention>
      */
-    public function preventions(?Carbon $date = null): Collection
+    public function preventions(?Carbon $date = null): array
     {
         $date = $date ?: now();
 
-        /** @var Collection<int, PreventionData> */
+        /** @var array<int, Prevention> */
-        $preventions = collect([]);
+        $preventions = [];
 
         if ($this->efz === null || $this->efz->diffInYears($date) >= 5) {
-            $preventions->push(PreventionData::from([
+            $preventions[] = Prevention::EFZ;
-                'type' => Prevention::EFZ,
-                'expires' => $this->efz === null ? now() : $this->efz->addYears(5)
-            ]));
         }
 
         if (!$this->has_vk) {
-            $preventions->push(PreventionData::from([
+            $preventions[] = Prevention::VK;
-                'type' => Prevention::VK,
-                'expires' => now(),
-            ]));
         }
 
         if ($this->more_ps_at === null) {
             if ($this->ps_at === null) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::PS;
-                    'type' => Prevention::PS,
-                    'expires' => now(),
-                ]));
             } else if ($this->ps_at->diffInYears($date) >= 5) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::MOREPS;
-                    'type' => Prevention::MOREPS,
-                    'expires' => $this->ps_at->addYears(5),
-                ]));
             }
         } else {
             if ($this->more_ps_at === null || $this->more_ps_at->diffInYears($date) >= 5) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::MOREPS;
-                    'type' => Prevention::MOREPS,
-                    'expires' => $this->more_ps_at->addYears(5),
-                ]));
             }
         }
 

app/Member/MemberResource.php

@@ -136,8 +136,8 @@ class MemberResource extends JsonResource
         $createActivities = Activity::remote()->with(['subactivities' => fn ($q) => $q->remote()])->get();
 
         return [
-            'filterActivities' => Activity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'filterActivities' => Activity::where('is_filterable', true)->pluck('name', 'id'),
-            'filterSubactivities' => Subactivity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'filterSubactivities' => Subactivity::where('is_filterable', true)->pluck('name', 'id'),
             'formActivities' => $activities->pluck('name', 'id'),
             'formSubactivities' => $activities->map(function (Activity $activity) {
                 return ['subactivities' => $activity->subactivities->pluck('name', 'id'), 'id' => $activity->id];
@@ -210,14 +210,6 @@ class MemberResource extends JsonResource
                 'multiply_pv' => false,
                 'multiply_more_pv' => false,
                 'keepdata' => false,
-                'bank_account' => [
-                    'iban' => '',
-                    'bic' => '',
-                    'blz' => '',
-                    'bank_name' => '',
-                    'person' => '',
-                    'account_number' => '',
-                ]
             ]
         ];
     }

app/Member/Membership.php

@@ -79,19 +79,6 @@ class Membership extends Model
             ->where(fn ($query) => $query->whereNull('to')->orWhere('to', '>=', now()));
     }
 
-    /**
-     * @param Builder<Membership> $query
-     *
-     * @return Builder<Membership>
-     */
-    public function scopeInactive(Builder $query): Builder
-    {
-        return $query->where(fn ($q) => $q
-            ->orWhere('from', '>=', now())
-            ->orWhere('to', '<=', now())
-        );
-    }
-
     /**
      * @param Builder<Membership> $query
      *

app/Membership/Actions/IndexAction.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Lorisleiva\Actions\Concerns\AsAction;
 
-class MemberIndexAction
+class IndexAction
 {
     use AsAction;
 

app/Membership/Actions/MassStoreAction.php

@@ -10,7 +10,6 @@ use App\Maildispatcher\Actions\ResyncAction;
 use App\Member\Member;
 use App\Member\Membership;
 use App\Subactivity;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -21,18 +20,13 @@ class MassStoreAction
     use TracksJob;
 
     /**
-     * @return array<string, mixed>
+     * @return array<string, string>
      */
     public function rules(): array
     {
         return [
             'group_id' => 'required|numeric|exists:groups,id',
-            'activity_id' => ['required', 'numeric', 'exists:activities,id', function($key, $value, $fail) {
+            'activity_id' => 'required|numeric|exists:activities,id',
-                $activity = Activity::findOrFail($value);
-                if ($activity->subactivities->pluck('id')->doesntContain(request()->subactivity_id)) {
-                    return $fail(':attribute ist nicht vorhanden.');
-                }
-            }],
             'subactivity_id' => 'required|numeric|exists:subactivities,id',
             'members' => 'array',
             'members.*' => 'numeric|exists:members,id',
@@ -54,7 +48,9 @@ class MassStoreAction
             Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get()
                 ->each(fn ($membership) => MembershipDestroyAction::run($membership->id));
 
-            Member::whereIn('id', $members)->whereDoesntHave('memberships', fn ($q) => $q->where($attributes))->get()
+            collect($members)
+                ->except(Membership::where($attributes)->active()->pluck('member_id'))
+                ->map(fn ($memberId) => Member::findOrFail($memberId))
                 ->each(fn ($member) => MembershipStoreAction::run(
                     $member,
                     $activity,
@@ -63,11 +59,12 @@ class MassStoreAction
                     null,
                 ));
 
+
             ResyncAction::dispatch();
         });
     }
 
-    public function asController(ActionRequest $request): JsonResponse
+    public function asController(ActionRequest $request): void
     {
         /**
          * @var array{members: array<int, int>, group_id: int, activity_id: int, subactivity_id: int}
@@ -80,19 +77,6 @@ class MassStoreAction
             Subactivity::findOrFail($input['subactivity_id']),
             $input['members'],
         );
-
-        return response()->json([], 200);
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function getValidationAttributes(): array {
-        return [
-            'activity_id' => 'Tätigkeit',
-            'subactivity_id' => 'Untertätigkeit',
-            'group_id' => 'Gruppe',
-        ];
     }
 
     /**

app/Membership/Actions/MembershipIndexAction.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Membership\Actions;
-
-use App\Member\Data\MembershipData;
-use App\Membership\FilterScope;
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class MembershipIndexAction
-{
-    use AsAction;
-
-    public function asController(ActionRequest $request): Response
-    {
-        return Inertia::render(
-            'membership/Index',
-            ['data' => MembershipData::collectPages(FilterScope::fromRequest($request->input('filter', ''))->getQuery()->paginate(20))]
-        );
-    }
-}

app/Membership/FilterScope.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Membership;
-
-use App\Lib\Filter;
-use App\Member\Membership;
-use Illuminate\Database\Eloquent\Builder;
-
-/**
- * @extends Filter<Membership>
- */
-class FilterScope extends Filter
-{
-    /**
-     * @param array<int, int> $activities
-     * @param array<int, int> $subactivities
-     * @param array<int, int> $groups
-     */
-    public function __construct(
-        public array $activities = [],
-        public array $subactivities = [],
-        public array $groups = [],
-        public ?bool $active = true,
-    ) {}
-
-    public function getQuery(): Builder
-    {
-        $query = Membership::orderByRaw('member_id, activity_id, subactivity_id');
-
-        if ($this->active === true) {
-            $query = $query->active();
-        }
-
-        if ($this->active === false) {
-            $query = $query->inactive();
-        }
-
-        if (count($this->groups)) {
-            $query = $query->whereIn('group_id', $this->groups);
-        }
-
-        if (count($this->activities)) {
-            $query = $query->whereIn('activity_id', $this->activities);
-        }
-
-        if (count($this->subactivities)) {
-            $query = $query->whereIn('subactivity_id', $this->subactivities);
-        }
-
-        return $query;
-    }
-}

app/Prevention/Actions/SettingApiAction.php

@@ -2,7 +2,6 @@
 
 namespace App\Prevention\Actions;
 
-use App\Prevention\Enums\Prevention;
 use App\Prevention\PreventionSettings;
 use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -14,10 +13,7 @@ class SettingApiAction
     public function handle(): JsonResponse
     {
         return response()->json([
-            'data' => app(PreventionSettings::class)->toFrontend(),
+            'data' => app(PreventionSettings::class)->toArray(),
-            'meta' => [
-                'preventAgainsts' => Prevention::values(),
-            ]
         ]);
     }
 }

app/Prevention/Actions/SettingStoreAction.php

@@ -4,7 +4,6 @@ namespace App\Prevention\Actions;
 
 use App\Lib\Editor\EditorData;
 use App\Lib\Events\Succeeded;
-use App\Member\FilterScope;
 use App\Prevention\PreventionSettings;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -20,10 +19,6 @@ class SettingStoreAction
     {
         return [
             'formmail' => 'array',
-            'yearlymail' => 'array',
-            'weeks' => 'required|numeric|gte:0',
-            'freshRememberInterval' => 'required|numeric|gte:0',
-            'active' => 'boolean',
         ];
     }
 
@@ -31,12 +26,6 @@ class SettingStoreAction
     {
         $settings = app(PreventionSettings::class);
         $settings->formmail = EditorData::from($request->formmail);
-        $settings->yearlymail = EditorData::from($request->yearlymail);
-        $settings->weeks = $request->weeks;
-        $settings->freshRememberInterval = $request->freshRememberInterval;
-        $settings->active = $request->active;
-        $settings->yearlyMemberFilter = FilterScope::from($request->yearlyMemberFilter);
-        $settings->preventAgainst = $request->preventAgainst;
         $settings->save();
 
         Succeeded::message('Einstellungen gespeichert.')->dispatch();

app/Prevention/Actions/YearlyRememberAction.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Prevention\Actions;
-
-use App\Member\Member;
-use App\Prevention\Data\PreventionData;
-use App\Prevention\Mails\YearlyMail;
-use App\Prevention\PreventionSettings;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Mail;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class YearlyRememberAction
-{
-    use AsAction;
-
-    public string $commandSignature = 'prevention:remember-yearly';
-
-    public function handle(): void
-    {
-        $settings = app(PreventionSettings::class);
-        $expireDate = now()->addWeeks($settings->weeks);
-
-        if (!$settings->active) {
-            return;
-        }
-
-        foreach ($settings->yearlyMemberFilter->getQuery()->get() as $member) {
-            // @todo add this check to FilterScope
-            if ($member->getMailRecipient() === null) {
-                continue;
-            }
-
-            $noticePreventions = $member->preventions($expireDate)
-                ->filter(fn($prevention) => $prevention->expiresAt($expireDate))
-                ->filter(fn($p) => $p->appliesToSettings($settings));
-
-            if ($noticePreventions->count() === 0) {
-                continue;
-            }
-
-            Mail::send($this->createMail($member, $noticePreventions));
-        }
-
-        foreach ($settings->yearlyMemberFilter->getQuery()->get() as $member) {
-            // @todo add this check to FilterScope
-            if ($member->getMailRecipient() === null) {
-                continue;
-            }
-
-            $preventions = $member->preventions()
-                ->filter(fn($prevention) => $prevention->expiresAt(now()))
-                ->filter(fn($p) => $p->appliesToSettings($settings));
-
-            if ($preventions->count() === 0) {
-                continue;
-            }
-
-            Cache::remember(
-                'prevention-' . $member->id,
-                (int) now()->diffInSeconds(now()->addWeeks($settings->freshRememberInterval)),
-                function () use ($member, $preventions) {
-                    Mail::send($this->createMail($member, $preventions));
-                    return 0;
-                }
-            );
-        }
-    }
-
-    /**
-     * @param Collection<int, PreventionData> $preventions
-     */
-    protected function createMail(Member $member, Collection $preventions): YearlyMail
-    {
-        $body = app(PreventionSettings::class)->refresh()->yearlymail;
-        return new YearlyMail($member, $body, $preventions);
-    }
-}

app/Prevention/Contracts/Preventable.php

@@ -2,19 +2,19 @@
 
 namespace App\Prevention\Contracts;
 
-use App\Prevention\Data\PreventionData;
+use App\Prevention\Enums\Prevention;
-use Illuminate\Support\Collection;
 use stdClass;
 
 interface Preventable
 {
 
+    public function preventableLayout(): string;
     public function preventableSubject(): string;
 
     /**
-     * @return Collection<int, PreventionData>
+     * @return array<int, Prevention>
      */
-    public function preventions(): Collection;
+    public function preventions(): array;
 
-    public function getMailRecipient(): ?stdClass;
+    public function getMailRecipient(): stdClass;
 }

app/Prevention/Data/PreventionData.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Prevention\Data;
-
-use App\Prevention\Enums\Prevention;
-use App\Prevention\PreventionSettings;
-use Carbon\Carbon;
-use Spatie\LaravelData\Data;
-
-class PreventionData extends Data
-{
-    public function __construct(public Prevention $type, public Carbon $expires) {}
-
-    public function expiresAt(Carbon $date): bool
-    {
-        return $this->expires->isSameDay($date);
-    }
-
-    public function text(): string
-    {
-        return str($this->type->text())->when(
-            !$this->expiresAt(now()),
-            fn($str) => $str->append(' (fällig am ' . $this->expires->format('d.m.Y') . ')')
-        );
-    }
-
-    public function appliesToSettings(PreventionSettings $settings): bool
-    {
-        return in_array($this->type->name, $settings->preventAgainst);
-    }
-}

app/Prevention/Enums/Prevention.php

@@ -2,7 +2,8 @@
 
 namespace App\Prevention\Enums;
 
-use App\Prevention\Data\PreventionData;
+use App\Member\Member;
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 enum Prevention
@@ -38,26 +39,15 @@ enum Prevention
     }
 
     /**
-     * @param Collection<int, PreventionData> $preventions
+     * @param array<int, self> $preventions
      * @return Collection<int, array{letter: string, value: bool, tooltip: string}>
      */
-    public static function items(Collection $preventions): Collection
+    public static function items(array $preventions): Collection
     {
         return collect(static::cases())->map(fn ($case) => [
             'letter' => $case->letter(),
-            'value' => $preventions->pluck('type')->doesntContain($case),
+            'value' => !in_array($case, $preventions),
-            'tooltip' => $case->tooltip($preventions->pluck('type')->doesntContain($case)),
+            'tooltip' => $case->tooltip(!in_array($case, $preventions)),
         ]);
     }
-
-    /**
-     * @return array<int, string>
-     */
-    public static function values(): array
-    {
-        return collect(static::cases())->map(fn($case) => [
-            'id' => $case->name,
-            'name' => $case->text(),
-        ])->toArray();
-    }
 }

app/Prevention/Mails/PreventionRememberMail.php

@@ -5,14 +5,12 @@ namespace App\Prevention\Mails;
 use App\Invoice\InvoiceSettings;
 use App\Lib\Editor\EditorData;
 use App\Prevention\Contracts\Preventable;
-use App\Prevention\Data\PreventionData;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
 
 class PreventionRememberMail extends Mailable
 {
@@ -22,13 +20,12 @@ class PreventionRememberMail extends Mailable
 
     /**
      * Create a new message instance.
-     * @param Collection<int, PreventionData> $preventions
      */
-    public function __construct(public Preventable $preventable, public EditorData $bodyText, public Collection $preventions)
+    public function __construct(public Preventable $preventable, public EditorData $bodyText)
     {
         $this->settings = app(InvoiceSettings::class);
         $this->bodyText = $this->bodyText
-            ->replaceWithList('wanted', $preventions->map(fn($prevention) => $prevention->text())->toArray());
+            ->replaceWithList('wanted', collect($preventable->preventions())->map(fn ($prevention) => $prevention->text())->toArray());
     }
 
     /**
@@ -51,7 +48,7 @@ class PreventionRememberMail extends Mailable
     public function content()
     {
         return new Content(
-            markdown: 'mail.prevention.prevention-remember-participant',
+            markdown: $this->preventable->preventableLayout(),
         );
     }
 

app/Prevention/Mails/YearlyMail.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Prevention\Mails;
-
-use App\Invoice\InvoiceSettings;
-use App\Lib\Editor\EditorData;
-use App\Prevention\Contracts\Preventable;
-use App\Prevention\Data\PreventionData;
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Attachment;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
-
-class YearlyMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    public InvoiceSettings $settings;
-
-    /**
-     * Create a new message instance.
-     * @param Collection<int, PreventionData> $preventions
-     */
-    public function __construct(public Preventable $preventable, public EditorData $bodyText, public Collection $preventions)
-    {
-        $this->settings = app(InvoiceSettings::class);
-        $this->bodyText = $this->bodyText
-            ->replaceWithList('wanted', $preventions->map(fn($prevention) => $prevention->text())->toArray());
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return (new Envelope(
-            subject: $this->preventable->preventableSubject(),
-        ))->to($this->preventable->getMailRecipient()->email, $this->preventable->getMailRecipient()->name);
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            markdown: 'mail.prevention.prevention-remember-participant',
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Prevention/PreventionSettings.php

@@ -3,23 +3,12 @@
 namespace App\Prevention;
 
 use App\Lib\Editor\EditorData;
-use App\Member\FilterScope;
 use App\Setting\LocalSettings;
 
 class PreventionSettings extends LocalSettings
 {
 
     public EditorData $formmail;
-    public EditorData $yearlymail;
-    public int $weeks;
-    public int $freshRememberInterval;
-    public bool $active;
-    public FilterScope $yearlyMemberFilter;
-    /**
-     * @var array<int, string>
-     * @todo Create collection cast to Collection of enums
-     */
-    public array $preventAgainst;
 
     public static function group(): string
     {
@@ -38,17 +27,4 @@ class PreventionSettings extends LocalSettings
     {
         return [];
     }
-
-    /**
-     * @todo return int value here and handle this in vue with a number field that only expects integers
-     * @return array<string, mixed>
-     */
-    public function toFrontend(): array
-    {
-        return [
-            ...$this->toArray(),
-            'weeks' => (string) $this->weeks,
-            'freshRememberInterval' => (string) $this->freshRememberInterval,
-        ];
-    }
 }

app/Remote/Actions/SearchAction.php

@@ -14,7 +14,7 @@ class SearchAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<int, array<string, mixed>>
+     * @return LengthAwarePaginator<array<string, mixed>>
      */
     public function handle(ActionRequest $request): LengthAwarePaginator
     {

app/Setting/NamiSettings.php

@@ -4,6 +4,7 @@ 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;
@@ -11,7 +12,7 @@ use Zoomyboy\LaravelNami\Nami;
 
 class NamiSettings extends LocalSettings implements Storeable
 {
-    public string $mglnr;
+    public int $mglnr;
 
     public string $password;
 

bin/copydb

@@ -8,5 +8,3 @@ sudo mysql adrema < db.tmp
 rm db.tmp
 
 echo 'app(\App\Form\FormSettings::class)->fill(["registerUrl" => "http://stammsilva.test/anmeldung/{slug}/register", "clearCacheUrl" => "http://stammsilva.test/adrema/clear-cache"])->save();' | php artisan tinker
-
-exit 0

composer.json

@@ -50,7 +50,7 @@
         "cviebrock/eloquent-sluggable": "^11.0",
         "doctrine/dbal": "^3.1",
         "guzzlehttp/guzzle": "^7.0.1",
-        "inertiajs/inertia-laravel": "^2.0",
+        "inertiajs/inertia-laravel": "^1.0",
         "laravel/framework": "^11.0",
         "laravel/horizon": "^5.0",
         "laravel/pail": "^1.1",

database/factories/Form/Models/FormFactory.php

@@ -47,8 +47,8 @@ class FormFactory extends Factory
             'description' => EditorRequestFactory::new()->toData(),
             'excerpt' => $this->faker->words(10, true),
             'config' => ['sections' => []],
-            'from' => $this->faker->dateTimeBetween('+1 week', '+3 weeks')->format('Y-m-d'),
+            'from' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
-            'to' => $this->faker->dateTimeBetween('+4 week', '+6 weeks')->format('Y-m-d'),
+            'to' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
             'registration_from' => $this->faker->dateTimeBetween(Carbon::parse('-2 weeks'), now())->format('Y-m-d H:i:s'),
             'registration_until' => $this->faker->dateTimeBetween(now(), Carbon::parse('+2 weeks'))->format('Y-m-d H:i:s'),
             'mail_top' => EditorRequestFactory::new()->toData(),
@@ -57,8 +57,6 @@ class FormFactory extends Factory
             'is_private' => false,
             'export' => ExportData::from([]),
             'prevention_conditions' => Condition::defaults(),
-            'zip' => $this->faker->numberBetween(1100, 99999),
-            'location' => $this->faker->city(),
         ];
     }
 

database/factories/Member/MemberFactory.php

@@ -98,12 +98,6 @@ class MemberFactory extends Factory
         return $this->state(['nami_id' => null]);
     }
 
-    public function name(string $name): self
-    {
-        [$firstname, $lastname] = explode(' ', $name);
-        return $this->state(compact('firstname', 'lastname'));
-    }
-
     public function withBankAccount(BankAccountFactory $factory): self
     {
         return $this->afterCreating(function ($member) use ($factory) {

database/factories/Member/MembershipFactory.php

@@ -4,7 +4,6 @@ namespace Database\Factories\Member;
 
 use App\Activity;
 use App\Group;
-use App\Member\Member;
 use App\Member\Membership;
 use App\Subactivity;
 use Carbon\Carbon;
@@ -31,10 +30,6 @@ class MembershipFactory extends Factory
         ];
     }
 
-    public function defaults(): self {
-        return $this->for(Member::factory()->defaults())->for(Group::factory())->for(Activity::factory())->for(Subactivity::factory());
-    }
-
     public function inNami(int $namiId): self
     {
         return $this->state(['nami_id' => $namiId]);

database/migrations/2025_07_04_210136_create_forms_zip_column.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->string('zip')->nullable()->after('name');
-            $table->string('location')->nullable()->after('name');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('zip');
-            $table->dropColumn('location');
-        });
-    }
-};

database/migrations/2025_07_06_022536_create_forms_country_column.php

@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->string('country')->nullable()->after('location');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('country');
-        });
-    }
-};

database/migrations/2025_07_09_221048_create_forms_leader_conditions_column.php

@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->json('leader_conditions')->after('name')->default(json_encode(['mode' => 'all', 'ifs' => []]));
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('leader_conditions');
-        });
-    }
-};

database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php

@@ -1,17 +0,0 @@
-<?php
-
-use App\Member\FilterScope;
-use Spatie\LaravelSettings\Migrations\SettingsMigration;
-
-return new class extends SettingsMigration
-{
-    public function up(): void
-    {
-        $this->migrator->add('prevention.yearlymail', ['time' => 1, 'blocks' => [], 'version' => '1.0']);
-        $this->migrator->add('prevention.weeks', 8);
-        $this->migrator->add('prevention.freshRememberInterval', 12);
-        $this->migrator->add('prevention.active', false);
-        $this->migrator->add('prevention.yearlyMemberFilter', FilterScope::from([])->toArray());
-        $this->migrator->add('prevention.preventAgainst', []);
-    }
-};

eslint.config.mjs

@@ -1,43 +0,0 @@
-import eslint from '@eslint/js';
-import eslintPluginVue from 'eslint-plugin-vue';
-import typescriptEslint from 'typescript-eslint';
-import globals from 'globals';
-
-export default typescriptEslint.config(
-    { ignores: ['*.d.ts', '**/coverage', '**/dist'] },
-    {
-        extends: [
-            eslint.configs.recommended,
-            ...typescriptEslint.configs.recommended,
-            ...eslintPluginVue.configs['flat/recommended'],
-        ],
-        files: ['**/*.{ts,vue}'],
-        languageOptions: {
-            ecmaVersion: 2022,
-            sourceType: 'module',
-            globals: globals.browser,
-            parserOptions: {
-                parser: typescriptEslint.parser,
-            },
-        },
-        rules: {
-            'indent': ['error', 4],
-            'vue/html-indent': ['error', 4],
-            'linebreak-style': ['error', 'unix'],
-            'quotes': ['error', 'single'],
-            'semi': ['error', 'always'],
-            'vue/no-reserved-component-names': 'off',
-            'vue/multi-word-component-names': 'off',
-            'vue/max-attributes-per-line': 'off',
-            'vue/singleline-html-element-content-newline': 'off',
-            "vue/first-attribute-linebreak": ["error", {
-                "singleline": "beside",
-                "multiline": "beside"
-            }],
-            'vue/no-undef-properties': ['error', {
-                'ignores': ['/^\\$/']
-            }]
-        },
-    },
-);
-

package.json

@@ -16,9 +16,11 @@
         "autoprefixer": "^10.4.17",
         "axios": "^1.6.6",
         "dayjs": "^1.11.10",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "^8.10.0",
+        "eslint-plugin-vue": "^8.7.1",
         "postcss": "^8.4.33",
         "tailwindcss": "^3.4.1",
-        "unplugin-vue-components": "^28.7.0",
         "vue-axios": "^3.5.2"
     },
     "dependencies": {
@@ -26,14 +28,12 @@
         "@editorjs/header": "^2.8.1",
         "@editorjs/nested-list": "^1.4.2",
         "@editorjs/paragraph": "^2.11.3",
-        "@inertiajs/vue3": "^2.0",
+        "@inertiajs/vue3": "^1.0.14",
         "@tailwindcss/forms": "^0.5.7",
         "@tailwindcss/typography": "^0.5.10",
         "@vitejs/plugin-vue": "^4.6.2",
         "change-case": "^4.1.2",
         "editorjs-alert": "^1.1.3",
-        "eslint": "^9.28.0",
-        "eslint-plugin-vue": "^10.2.0",
         "floating-vue": "^2.0.0",
         "laravel-echo": "^1.15.3",
         "laravel-vite-plugin": "^0.7.8",
@@ -41,13 +41,11 @@
         "merge": "^2.1.1",
         "pinia": "^2.1.7",
         "postcss-import": "^14.1.0",
+        "prettier": "^2.8.8",
         "pusher-js": "^8.3.0",
         "svg-sprite": "^2.0.2",
-        "typescript-eslint": "^8.34.0",
-        "uuid": "^11.1.0",
         "vite": "^4.5.2",
         "vue": "^3.3.4",
-        "vue-clipboard3": "^2.0.0",
         "vue-toastification": "^2.0.0-rc.5",
         "vuedraggable": "^4.1.0",
         "wnumb": "^1.2.0"

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit 47f01b3c3c98821603f3612511d713cf51a6a14c
+Subproject commit c20cf930f2037ddda4400dd7d35bf9ef707356eb

phpstan.neon

@@ -418,6 +418,11 @@ parameters:
             count: 1
             path: app/Mailgateway/Resources/MailgatewayResource.php
 
+        -
+            message: "#^Generic type Illuminate\\\\Pagination\\\\LengthAwarePaginator\\<int, App\\\\Member\\\\Member\\> in PHPDoc tag @return specifies 2 template types, but class Illuminate\\\\Pagination\\\\LengthAwarePaginator supports only 1\\: TValue$#"
+            count: 1
+            path: app/Member/Actions/SearchAction.php
+
         -
             message: "#^Class Plugins\\\\Test\\\\ServiceProvider not found\\.$#"
             count: 1

resources/css/buttons.css

@@ -31,12 +31,6 @@
             @apply bg-yellow-500 text-yellow-100;
         }
     }
-    &.btn-default {
-        @apply bg-gray-700 text-gray-300;
-        &:not(.disabled):hover {
-            @apply bg-gray-500 text-gray-100;
-        }
-    }
     &.btn-info {
         @apply bg-blue-700 text-blue-300;
         &:not(.disabled):hover {

resources/css/editor.css

@@ -5,14 +5,14 @@
 .ce-settings__button,
 .ce-toolbar__settings-btn,
 .cdx-button,
-.ce-popover__container,
+.ce-popover,
 .ce-toolbar__plus:hover {
     @apply bg-primary-700;
     color: inherit;
 }
 
-.cdx-search-field {
+.ce-inline-tool-input {
-    @apply bg-primary-600;
+    @apply bg-primary-700 text-primary-200 placeholder-primary-500;
 }
 
 .ce-block--selected {

resources/css/table.css

@@ -1,10 +1,10 @@
 .custom-table {
     width: 100%;
-    & > thead > th, & > thead > tr > th {
+    & > thead > th {
         @apply text-left px-6 text-gray-200 font-semibold py-3 border-gray-600 border-b;
     }
 
-    & > tr, & > tbody > tr {
+    & > tr {
         @apply text-gray-200 transition-all duration-300 rounded hover:bg-gray-800;
         & > td {
             @apply py-1 px-6;
@@ -12,10 +12,10 @@
     }
 
     &.custom-table-sm {
-        & > thead > th, & > thead > tr > th {
+        & > thead > th {
             @apply px-3 py-2;
         }
-        & > tr, & > tbody > tr {
+        & > tr {
             & > td {
                 @apply py-1 px-3;
             }
@@ -23,11 +23,20 @@
     }
 
     &.custom-table-light {
-        & > thead > th, & > thead >  tr > th {
+        & > thead > th {
             @apply border-gray-500;
         }
-        & > tr, & > tbody > tr {
+        & > td {
-            @apply hover:bg-gray-700;
+            &:hover {
+                @apply bg-gray-700;
             }
         }
     }
+
+}
+.custom-table > * {
+    display: table-row;
+}
+.custom-table > * > * {
+    display: table-cell;
+}

resources/css/tooltip.css

@@ -1,7 +1,3 @@
-.v-popper__popper {
-    @apply max-w-lg;
-}
-
 .v-popper--theme-tooltip .v-popper__inner {
     @apply bg-primary-400 text-primary-800 px-3 py-1 text-sm;
 }

resources/img/svg/copy.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M6 6V2c0-1.1.9-2 2-2h10a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-4v4a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V8c0-1.1.9-2 2-2h4zm2 0h4a2 2 0 0 1 2 2v4h4V2H8v4zM2 8v10h10V8H2z"/></svg>

resources/img/svg/externallink.svg

@@ -1,4 +0,0 @@
-<svg x="0px" y="0px" viewBox="0 0 511.626 511.627" xml:space="preserve">
-    <path d="M392.857,292.354h-18.274c-2.669,0-4.859,0.855-6.563,2.573c-1.718,1.708-2.573,3.897-2.573,6.563v91.361    c0,12.563-4.47,23.315-13.415,32.262c-8.945,8.945-19.701,13.414-32.264,13.414H82.224c-12.562,0-23.317-4.469-32.264-13.414    c-8.945-8.946-13.417-19.698-13.417-32.262V155.31c0-12.562,4.471-23.313,13.417-32.259c8.947-8.947,19.702-13.418,32.264-13.418    h200.994c2.669,0,4.859-0.859,6.57-2.57c1.711-1.713,2.566-3.9,2.566-6.567V82.221c0-2.662-0.855-4.853-2.566-6.563    c-1.711-1.713-3.901-2.568-6.57-2.568H82.224c-22.648,0-42.016,8.042-58.102,24.125C8.042,113.297,0,132.665,0,155.313v237.542    c0,22.647,8.042,42.018,24.123,58.095c16.086,16.084,35.454,24.13,58.102,24.13h237.543c22.647,0,42.017-8.046,58.101-24.13    c16.085-16.077,24.127-35.447,24.127-58.095v-91.358c0-2.669-0.856-4.859-2.574-6.57    C397.709,293.209,395.519,292.354,392.857,292.354z"/>
-    <path d="M506.199,41.971c-3.617-3.617-7.905-5.424-12.85-5.424H347.171c-4.948,0-9.233,1.807-12.847,5.424    c-3.617,3.615-5.428,7.898-5.428,12.847s1.811,9.233,5.428,12.85l50.247,50.248L198.424,304.067    c-1.906,1.903-2.856,4.093-2.856,6.563c0,2.479,0.953,4.668,2.856,6.571l32.548,32.544c1.903,1.903,4.093,2.852,6.567,2.852    s4.665-0.948,6.567-2.852l186.148-186.148l50.251,50.248c3.614,3.617,7.898,5.426,12.847,5.426s9.233-1.809,12.851-5.426    c3.617-3.616,5.424-7.898,5.424-12.847V54.818C511.626,49.866,509.813,45.586,506.199,41.971z"/>
-</svg>

resources/img/svg/warning-triangle-light.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M1.225 21.225A1.678 1.678 0 0 0 2.707 22H22.28a1.68 1.68 0 0 0 1.484-.775 1.608 1.608 0 0 0 .003-1.656L13.995 1.827a1.745 1.745 0 0 0-2.969 0l-9.8 17.742a1.603 1.603 0 0 0 0 1.656zm.859-1.143l9.82-17.773A.71.71 0 0 1 12.508 2a.73.73 0 0 1 .629.342l9.751 17.708a.626.626 0 0 1 .017.662.725.725 0 0 1-.626.288H2.708a.723.723 0 0 1-.623-.286.605.605 0 0 1-.001-.632zM13 15h-1V8h1zm-1.5 2.5a1 1 0 1 1 1 1 1.002 1.002 0 0 1-1-1z"/><path fill="none" d="M0 0h24v24H0z"/></svg>

resources/js/app.js

@@ -5,6 +5,7 @@ import VueAxios from 'vue-axios';
 import {Plugin as FloatingVue, options as FloatingVueOptions} from './lib/floatingVue.js';
 import {createPinia, PiniaVuePlugin} from 'pinia';
 import Echo from './lib/echo.js';
+import requireModules from './lib/requireModules.js';
 
 import AppLayout from './layouts/AppLayout.vue';
 import hasModule from './mixins/hasModule.js';
@@ -46,6 +47,9 @@ createInertiaApp({
             .mixin(hasModule)
             .mixin(hasFlash);
 
+        requireModules(import.meta.glob('./components/form/*.vue'), app, 'f');
+        requireModules(import.meta.glob('./components/ui/*.vue'), app, 'ui');
+        requireModules(import.meta.glob('./components/page/*.vue', {eager: true}), app, 'page');
         app.component(
             'FSinglefile',
             defineAsyncComponent(() => import('!/medialibrary-helper/assets/components/SingleFile.vue'))

resources/js/components/components.d.ts

@@ -1,58 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-// biome-ignore lint: disable
-export {}
-
-/* prettier-ignore */
-declare module 'vue' {
-  export interface GlobalComponents {
-    FCheckboxesLabel: typeof import('@/components/form/CheckboxesLabel.vue')['default']
-    FEditor: typeof import('@/components/form/Editor.vue')['default']
-    FHint: typeof import('@/components/form/Hint.vue')['default']
-    FLabel: typeof import('@/components/form/Label.vue')['default']
-    FMemberFilter: typeof import('@/components/form/MemberFilter.vue')['default']
-    FMultipleselect: typeof import('@/components/form/Multipleselect.vue')['default']
-    FSaveButton: typeof import('@/components/form/SaveButton.vue')['default']
-    FSelect: typeof import('@/components/form/Select.vue')['default']
-    FSwitch: typeof import('@/components/form/Switch.vue')['default']
-    FText: typeof import('@/components/form/Text.vue')['default']
-    FTextarea: typeof import('@/components/form/Textarea.vue')['default']
-    PageFilter: typeof import('@/components/page/Filter.vue')['default']
-    PageFullHeading: typeof import('@/components/page/FullHeading.vue')['default']
-    PageFullHeadingBanner: typeof import('@/components/page/FullHeadingBanner.vue')['default']
-    PageFullLayout: typeof import('@/components/page/FullLayout.vue')['default']
-    PageHeader: typeof import('@/components/page/Header.vue')['default']
-    PageLayout: typeof import('@/components/page/Layout.vue')['default']
-    PagePopups: typeof import('@/components/page/Popups.vue')['default']
-    PageSearchModal: typeof import('@/components/page/SearchModal.vue')['default']
-    PageTitle: typeof import('@/components/page/Title.vue')['default']
-    PageToolbarButton: typeof import('@/components/page/ToolbarButton.vue')['default']
-    UiActionButton: typeof import('@/components/ui/ActionButton.vue')['default']
-    UiAgeGroups: typeof import('@/components/ui/AgeGroups.vue')['default']
-    UiBool: typeof import('@/components/ui/Bool.vue')['default']
-    UiBooleanDisplay: typeof import('@/components/ui/BooleanDisplay.vue')['default']
-    UiBox: typeof import('@/components/ui/Box.vue')['default']
-    UiButton: typeof import('@/components/ui/Button.vue')['default']
-    UiFilterSidebar: typeof import('@/components/ui/FilterSidebar.vue')['default']
-    UiIconButton: typeof import('@/components/ui/IconButton.vue')['default']
-    UiLabel: typeof import('@/components/ui/Label.vue')['default']
-    UiLoading: typeof import('@/components/ui/Loading.vue')['default']
-    UiMenulist: typeof import('@/components/ui/Menulist.vue')['default']
-    UiNote: typeof import('@/components/ui/Note.vue')['default']
-    UiPagination: typeof import('@/components/ui/Pagination.vue')['default']
-    UiPopup: typeof import('@/components/ui/Popup.vue')['default']
-    UiRemoteResource: typeof import('@/components/ui/RemoteResource.vue')['default']
-    UiRemoteSelector: typeof import('@/components/ui/RemoteSelector.vue')['default']
-    UiSearchPagination: typeof import('@/components/ui/SearchPagination.vue')['default']
-    UiSearchResult: typeof import('@/components/ui/SearchResult.vue')['default']
-    UiSidebar: typeof import('@/components/ui/Sidebar.vue')['default']
-    UiSpinner: typeof import('@/components/ui/Spinner.vue')['default']
-    UiSprite: typeof import('@/components/ui/Sprite.vue')['default']
-    UiTableToggleButton: typeof import('@/components/ui/TableToggleButton.vue')['default']
-    UiTabs: typeof import('@/components/ui/Tabs.vue')['default']
-    UiTextDisplay: typeof import('@/components/ui/TextDisplay.vue')['default']
-    UiTh: typeof import('@/components/ui/Th.vue')['default']
-  }
-}

resources/js/components/form/Editor.vue

@@ -1,21 +1,22 @@
 <template>
     <div>
         <div class="flex flex-col group" :for="id" :class="sizeClass(size)">
-            <f-label v-if="label" :required="required" :value="label" />
+            <f-label v-if="label" :required="required" :value="label"></f-label>
             <div class="relative w-full h-full">
-                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]" />
+                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]"></div>
-                <f-hint v-if="hint" :value="hint" />
+                <f-hint v-if="hint" :value="hint"></f-hint>
             </div>
         </div>
 
-        <ui-popup v-if="condition !== null"
+        <ui-popup
+            v-if="condition !== null"
             heading="Bedingungen"
             @close="
                 condition.resolve(condition.data);
                 condition = null;
             "
         >
-            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject" />
+            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject"></slot>
         </ui-popup>
     </div>
 </template>
@@ -105,10 +106,10 @@ class ConditionTune {
     wrap(blockContent) {
         this.wrapper = document.createElement('div');
 
-        const tooltip = document.createElement('div');
+        var tooltip = document.createElement('div');
         tooltip.setAttribute('data-tooltip', '');
 
-        const content = document.createElement('div');
+        var content = document.createElement('div');
         content.setAttribute('data-content', '');
 
         content.appendChild(blockContent);
@@ -143,7 +144,7 @@ class ConditionTune {
             'Bedingung ' +
             this.data.ifs
                 .map((i) => {
-                    const parts = [i.field];
+                    var parts = [i.field];
 
                     if (i.comparator === 'isEqual' || i.comparator === 'isIn') {
                         parts.push('=');
@@ -190,7 +191,7 @@ class ConditionTune {
 }
 
 onMounted(async () => {
-    const tools = {
+    var tools = {
         paragraph: {
             class: Paragraph,
             shortcut: 'CTRL+P',
@@ -224,7 +225,7 @@ onMounted(async () => {
         },
     };
 
-    const tunes = [];
+    var tunes = [];
 
     if (props.conditions) {
         tools.condition = {

resources/js/components/form/MemberFilter.vue

@@ -1,48 +0,0 @@
-<template>
-    <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="false" :value="label"></f-label>
-        <div class="relative flex-none flex">
-            <ui-icon-button :class="[fieldHeight, fieldAppearance, paddingX]" icon="filter" @click="visible = true">Filtern</ui-icon-button>
-            <f-hint v-if="hint" :value="hint"></f-hint>
-        </div>
-    </label>
-
-    <ui-filter-sidebar v-model="visible">
-        <member-filter-fields :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" />
-    </ui-filter-sidebar>
-</template>
-
-<script setup>
-import {ref} from 'vue';
-import useFieldSize from '../../composables/useFieldSize';
-import MemberFilterFields from '../../views/member/MemberFilterFields.vue';
-
-const {sizeClass, fieldHeight, fieldAppearance, paddingX} = useFieldSize();
-
-const visible = ref(false);
-
-defineEmits(['update:modelValue']);
-
-const props = defineProps({
-    modelValue: {
-        type: Object,
-        required: true,
-    },
-    label: {
-        type: String,
-        required: true,
-    },
-    id: {
-        type: String,
-        required: true,
-    },
-    size: {
-        type: String,
-        default: () => 'base',
-    },
-    hint: {
-        type: String,
-        default: () => '',
-    },
-});
-</script>

resources/js/components/form/Multipleselect.vue

@@ -1,22 +1,24 @@
 <template>
     <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="false" :value="label" />
+        <f-label v-if="label" :required="false" :value="label"></f-label>
         <div class="relative flex-none flex">
-            <div :class="[fieldHeight, fieldAppearance, selectAppearance]"
+            <div
+                :class="[fieldHeight, fieldAppearance, selectAppearance]"
                 class="form-select flex items-center w-full"
                 @click="visible = !visible"
                 v-text="`${modelValue.length} Einträge ausgewählt`"
-            />
+            ></div>
-            <div v-show="visible" class="absolute w-[max-content] z-30 max-h-[25rem] overflow-auto shadow-lg bg-gray-600 border border-gray-500 rounded-lg p-2 top-7 space-y-1 mt-2">
+            <div v-show="visible" class="absolute w-[max-content] z-30 max-h-[25rem] overflow-auto shadow-lg bg-gray-600 border border-gray-500 rounded-lg p-2 top-7 space-y-1">
                 <div v-for="(option, index) in parsedOptions" :key="index" class="flex items-center space-x-2">
-                    <f-switch :id="`${id}-${index}`"
+                    <f-switch
+                        :id="`${id}-${index}`"
                         :name="`${id}-${index}`"
                         size="sm"
                         :model-value="modelValue.includes(option.id)"
                         :value="option.id"
-                              @update:model-value="trigger(option, $event)"
+                        @update:modelValue="trigger(option, $event)"
-                    />
+                    ></f-switch>
-                    <div class="text-sm text-gray-200" v-text="option.name" />
+                    <div class="text-sm text-gray-200" v-text="option.name"></div>
                 </div>
             </div>
         </div>
@@ -64,7 +66,7 @@ const parsedOptions = computed(() =>
           })
 );
 function trigger(option, v) {
-    const value = JSON.parse(JSON.stringify(props.modelValue));
+    var value = JSON.parse(JSON.stringify(props.modelValue));
 
     emit('update:modelValue', value.includes(option.id) ? value.filter((cv) => cv !== option.id) : [...value, option.id]);
 }

resources/js/components/page/Filter.vue

@@ -1,17 +1,47 @@
 <template>
-    <ui-filter-sidebar v-model="visible">
+    <ui-popup v-if="visible === true" heading="Filtern" @close="visible = false">
+        <div class="grid gap-3 md:grid-cols-2">
             <slot name="fields"></slot>
-    </ui-filter-sidebar>
+        </div>
-    <div class="px-6 py-2 border-b border-gray-600 items-center space-x-3">
+    </ui-popup>
+    <div class="px-6 py-2 border-b border-gray-600" :class="visibleDesktopBlock">
+        <div class="flex items-end space-x-3">
+            <slot name="buttons"></slot>
+            <ui-icon-button v-if="filterable" icon="filter" @click="filterVisible = !filterVisible">Filtern</ui-icon-button>
+        </div>
+        <ui-box v-if="filterVisible" class="mt-3">
+            <div class="grid grid-cols-4 gap-3 items-end">
+                <slot name="fields"></slot>
+                <ui-icon-button class="col-start-1" icon="close" @click="filterVisible = false">Schließen</ui-icon-button>
+            </div>
+        </ui-box>
+    </div>
+    <div class="px-6 py-2 border-b border-gray-600 items-center space-x-3" :class="visibleMobile">
         <div class="flex flex-col sm:flex-row items-stretch sm:items-end space-y-1 sm:space-y-0 sm:space-x-3">
             <slot name="buttons"></slot>
-            <ui-icon-button v-if="!!$slots.fields" icon="filter" @click="visible = true">Filtern</ui-icon-button>
+            <ui-icon-button v-if="filterable" icon="filter" @click="visible = true">Filtern</ui-icon-button>
         </div>
     </div>
 </template>
 
 <script setup>
-import {ref} from 'vue';
+import {defineProps, ref} from 'vue';
+import useBreakpoints from '../../composables/useBreakpoints.js';
 
 const visible = ref(false);
+
+const filterVisible = ref(false);
+
+const props = defineProps({
+    breakpoint: {
+        type: String,
+        required: true,
+    },
+    filterable: {
+        type: Boolean,
+        default: () => true,
+    },
+});
+
+const {visibleDesktopBlock, visibleMobile} = useBreakpoints(props);
 </script>

resources/js/components/page/Popups.vue

@@ -1,21 +0,0 @@
-<template>
-    <ui-popup v-for="(popup, index) in swal.popups" :key="index" :icon="popup.icon" :heading="popup.title" @close="popup.reject(popup.id)">
-        <div class="text-center mt-4" v-text="popup.body" />
-        <div class="mt-4">
-            <template v-for="field in popup.fields">
-                <f-text v-if="field.type === 'text'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" />
-                <f-select v-if="field.type === 'select'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" :options="field.options" />
-            </template>
-        </div>
-        <div class="flex justify-center space-x-4 mt-6">
-            <ui-button type="button" class="btn-primary" @click.prevent="popup.resolve(popup.id)">{{ popup.confirmButton }}</ui-button>
-            <ui-button type="button" class="btn-default" @click.prevent="popup.reject(popup.id)">{{ popup.cancelButton }}</ui-button>
-        </div>
-    </ui-popup>
-</template>
-
-<script lang="ts" setup>
-import useSwal from '@/stores/swalStore.ts';
-const swal = useSwal();
-</script>
-