Offers by their own rules, seasonal photos per section, theme authoring tooling
- Special offers: kinds (rule, fixed dates, gap filler), package price, priority, highlight;
GapFinder detects calendar gaps (optionally waiving the minimum stay); OfferShowcase decides
what the website advertises and prices fixed dates/gaps with PriceCalculator; offers section
shows them side by side, as a list or rotating; hero can show the top offer. Appearances no
longer carry a featured offer.
- Sections get stable ids; appearances set photos per section ("Bilder je Baustein") and
sections can be limited to appearances. Photo pickers show thumbnails everywhere.
- Themes: themes:make (scaffold, never overwrites), themes:check (contract, build, markup,
colours, external resources, WCAG contrast), themes:preview (signed links per page and
appearance), signed ?theme= preview and preview action in the site form, inherited colour
tokens in the admin. Base CSS split into theme.css + reusable theme-base.css.
- docs/THEME-ERSTELLUNG.md: binding guide for building additional themes elsewhere.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
bc77b64ea7
commit
bfeb39e4dd
50 files changed
+2805
-259
No files matched your search
@@ -10,9 +10,9 @@ # Ferienwohnung Stommer
|
||||
- Portals must be integrated through a pluggable channel-connector system (see concept §7), never hard-coded.
|
||||
- Bookings/blocks use nights: `arrival <= night < departure`; same-day changeover is allowed. Reservations with an elapsed hold never occupy the calendar (scope `Booking::occupying()`), cron only updates status.
|
||||
- Business operations live in `app/Actions` (CreateReservation, ConfirmBooking, …); Filament pages and Livewire components call them instead of changing bookings directly.
|
||||
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts.
|
||||
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts. Kinds (`OfferKind`): rule, fixed dates, gap filler (`App\Availability\GapFinder`). Which offers the website advertises is decided by `App\Pricing\OfferShowcase` (not by appearances); it prices fixed dates/gaps with `PriceCalculator`.
|
||||
- Portal sync lives in `app/Channels` (connector interface + registry in `config/channels.php`, iCal connector/parser/feed). Our system leads; `SyncChannel` imports portal occupations as `BlockedPeriod` rows with `channel_id`; each channel's export feed excludes its own blocks. Observers on Booking/BlockedPeriod create `ChannelTask`s for portals with `requires_manual_blocking`. Portal booking e-mails are a fast path (`app/Channels/Mail`, `ProcessPortalMail`): they create blocks with source `email`, which `SyncChannel` later confirms/replaces and never removes as stale. Portal analysis: `docs/PORTALE.md`.
|
||||
- Website = theme system (`docs/THEMES.md`): themes live in `resources/themes/<key>` (theme.json, theme.css, theme.js, views); views resolve via the `theme::` namespace (theme → parent → base `ostsee-licht`). Pages are lists of sections (`app/Themes/Sections`, catalogue in `config/themes.php`); seasonal `Appearance`s override tokens/texts/hero photo. Theme views use only token colour classes (`bg-accent`, `text-muted`, …). Resolve `Theme` lazily (`app(Theme::class)`), never in constructors – middleware `ResolveTheme` replaces it per request.
|
||||
- Website = theme system (`docs/THEMES.md`): themes live in `resources/themes/<key>` (theme.json, theme.css, theme.js, views); views resolve via the `theme::` namespace (theme → parent → base `ostsee-licht`). Pages are lists of sections (`app/Themes/Sections`, catalogue in `config/themes.php`); seasonal `Appearance`s override tokens/texts/hero photo/photos per section (stable `data.id` per placed section) and sections can be limited to appearances. Theme views use only token colour classes (`bg-accent`, `text-muted`, …). New designs are **additional** themes: `php artisan themes:make <key>`, `themes:check`, `themes:preview` – never edit `ostsee-licht` for a new design; authoring rules in `docs/THEME-ERSTELLUNG.md`. Resolve `Theme` lazily (`app(Theme::class)`), never in constructors – middleware `ResolveTheme` replaces it per request.
|
||||
- Operations (environments, Strato access, server .env, admin accounts, 2FA, known pitfalls): `docs/BETRIEB.md` – read it before touching a server. Admin accounts: `php artisan users:create`; 2FA (Filament app authentication) is mandatory for admins via `RequireTwoFactorForAdmins`.
|
||||
- Deployment: `scripts/deploy.sh <env> setup|deploy [ref]|rollback|releases|artisan` (atomic releases on Strato, docs/DEPLOYMENT.md; the server keeps only the active release because of Strato's file quota – history = Git tags `deploy/<env>/<timestamp>`); CI `.gitea/workflows/deploy.yml`. Production has no dev packages (no factories/Faker) – production seeding via `ProductionSeeder`.
|
||||
- Vite fonts plugin is removed on purpose (corporate proxy breaks remote font downloads, and fonts must be self-hosted for GDPR).
|
||||
|
||||
@@ -10,9 +10,9 @@ # Ferienwohnung Stommer
|
||||
- Portals must be integrated through a pluggable channel-connector system (see concept §7), never hard-coded.
|
||||
- Bookings/blocks use nights: `arrival <= night < departure`; same-day changeover is allowed. Reservations with an elapsed hold never occupy the calendar (scope `Booking::occupying()`), cron only updates status.
|
||||
- Business operations live in `app/Actions` (CreateReservation, ConfirmBooking, …); Filament pages and Livewire components call them instead of changing bookings directly.
|
||||
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts.
|
||||
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts. Kinds (`OfferKind`): rule, fixed dates, gap filler (`App\Availability\GapFinder`). Which offers the website advertises is decided by `App\Pricing\OfferShowcase` (not by appearances); it prices fixed dates/gaps with `PriceCalculator`.
|
||||
- Portal sync lives in `app/Channels` (connector interface + registry in `config/channels.php`, iCal connector/parser/feed). Our system leads; `SyncChannel` imports portal occupations as `BlockedPeriod` rows with `channel_id`; each channel's export feed excludes its own blocks. Observers on Booking/BlockedPeriod create `ChannelTask`s for portals with `requires_manual_blocking`. Portal booking e-mails are a fast path (`app/Channels/Mail`, `ProcessPortalMail`): they create blocks with source `email`, which `SyncChannel` later confirms/replaces and never removes as stale. Portal analysis: `docs/PORTALE.md`.
|
||||
- Website = theme system (`docs/THEMES.md`): themes live in `resources/themes/<key>` (theme.json, theme.css, theme.js, views); views resolve via the `theme::` namespace (theme → parent → base `ostsee-licht`). Pages are lists of sections (`app/Themes/Sections`, catalogue in `config/themes.php`); seasonal `Appearance`s override tokens/texts/hero photo. Theme views use only token colour classes (`bg-accent`, `text-muted`, …). Resolve `Theme` lazily (`app(Theme::class)`), never in constructors – middleware `ResolveTheme` replaces it per request.
|
||||
- Website = theme system (`docs/THEMES.md`): themes live in `resources/themes/<key>` (theme.json, theme.css, theme.js, views); views resolve via the `theme::` namespace (theme → parent → base `ostsee-licht`). Pages are lists of sections (`app/Themes/Sections`, catalogue in `config/themes.php`); seasonal `Appearance`s override tokens/texts/hero photo/photos per section (stable `data.id` per placed section) and sections can be limited to appearances. Theme views use only token colour classes (`bg-accent`, `text-muted`, …). New designs are **additional** themes: `php artisan themes:make <key>`, `themes:check`, `themes:preview` – never edit `ostsee-licht` for a new design; authoring rules in `docs/THEME-ERSTELLUNG.md`. Resolve `Theme` lazily (`app(Theme::class)`), never in constructors – middleware `ResolveTheme` replaces it per request.
|
||||
- Operations (environments, Strato access, server .env, admin accounts, 2FA, known pitfalls): `docs/BETRIEB.md` – read it before touching a server. Admin accounts: `php artisan users:create`; 2FA (Filament app authentication) is mandatory for admins via `RequireTwoFactorForAdmins`.
|
||||
- Deployment: `scripts/deploy.sh <env> setup|deploy [ref]|rollback|releases|artisan` (atomic releases on Strato, docs/DEPLOYMENT.md; the server keeps only the active release because of Strato's file quota – history = Git tags `deploy/<env>/<timestamp>`); CI `.gitea/workflows/deploy.yml`. Production has no dev packages (no factories/Faker) – production seeding via `ProductionSeeder`.
|
||||
- Vite fonts plugin is removed on purpose (corporate proxy breaks remote font downloads, and fonts must be self-hosted for GDPR).
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
<?php
|
||||
|
||||
namespace App\Availability;
|
||||
|
||||
use App\Models\Property;
|
||||
use Carbon\CarbonImmutable;
|
||||
|
||||
/**
|
||||
* Free gaps in the calendar: runs of free nights with an occupied night (booking or block) directly
|
||||
* before and after. Open-ended free periods (nothing booked behind them yet) are not gaps.
|
||||
*/
|
||||
class GapFinder
|
||||
{
|
||||
/** How far around a stay we look for the neighbouring occupations. */
|
||||
private const LOOKAROUND_NIGHTS = 60;
|
||||
|
||||
public function __construct(private AvailabilityChecker $availability = new AvailabilityChecker) {}
|
||||
|
||||
/**
|
||||
* Length in nights of the gap that contains the whole stay, or null if the stay is not inside a gap
|
||||
* (because a night is occupied or the free period is not closed on both sides).
|
||||
*/
|
||||
public function gapContaining(Property $property, CarbonImmutable $arrival, CarbonImmutable $departure): ?int
|
||||
{
|
||||
$from = $arrival->subDays(self::LOOKAROUND_NIGHTS);
|
||||
$until = $departure->addDays(self::LOOKAROUND_NIGHTS);
|
||||
$occupied = $this->availability->occupiedNights($property, $from, $until);
|
||||
|
||||
for ($night = $arrival; $night->lessThan($departure); $night = $night->addDay()) {
|
||||
if (isset($occupied[$night->toDateString()])) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
$start = $arrival;
|
||||
while (! isset($occupied[$start->subDay()->toDateString()])) {
|
||||
$start = $start->subDay();
|
||||
if ($start->lessThanOrEqualTo($from)) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
$end = $departure;
|
||||
while (! isset($occupied[$end->toDateString()])) {
|
||||
$end = $end->addDay();
|
||||
if ($end->greaterThanOrEqualTo($until)) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return (int) $start->diffInDays($end);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gaps of 1 … $maxNights nights starting within [$from, $until), as [arrival, departure] pairs.
|
||||
*
|
||||
* @return list<array{0: CarbonImmutable, 1: CarbonImmutable}>
|
||||
*/
|
||||
public function gaps(Property $property, CarbonImmutable $from, CarbonImmutable $until, int $maxNights): array
|
||||
{
|
||||
$occupied = $this->availability->occupiedNights($property, $from->subDay(), $until->addDays($maxNights + 1));
|
||||
|
||||
$gaps = [];
|
||||
$night = $from;
|
||||
while ($night->lessThan($until)) {
|
||||
$isGapStart = ! isset($occupied[$night->toDateString()]) && isset($occupied[$night->subDay()->toDateString()]);
|
||||
if (! $isGapStart) {
|
||||
$night = $night->addDay();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$end = $night;
|
||||
while (! isset($occupied[$end->toDateString()]) && $night->diffInDays($end) <= $maxNights) {
|
||||
$end = $end->addDay();
|
||||
}
|
||||
|
||||
if (isset($occupied[$end->toDateString()]) && $night->diffInDays($end) <= $maxNights) {
|
||||
$gaps[] = [$night, $end];
|
||||
}
|
||||
|
||||
$night = $end->addDay();
|
||||
}
|
||||
|
||||
return $gaps;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Themes\ThemeChecker;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
#[Signature('themes:check {theme? : Key des Themes (leer = alle)}')]
|
||||
#[Description('Check themes against the theme contract (docs/THEME-ERSTELLUNG.md): manifest, build, required markup, colours, contrast')]
|
||||
class CheckTheme extends Command
|
||||
{
|
||||
/**
|
||||
* Execute the console command.
|
||||
*/
|
||||
public function handle(ThemeRegistry $registry, ThemeChecker $checker): int
|
||||
{
|
||||
$key = $this->argument('theme');
|
||||
if ($key !== null && ! isset($registry->all()[$key])) {
|
||||
$this->error("Theme „{$key}“ nicht gefunden. Installiert: ".implode(', ', array_keys($registry->all())));
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$themes = $key !== null ? [$registry->all()[$key]] : array_values($registry->all());
|
||||
$failed = false;
|
||||
|
||||
foreach ($themes as $theme) {
|
||||
['errors' => $errors, 'warnings' => $warnings] = $checker->check($theme);
|
||||
$this->line('');
|
||||
$this->line("<options=bold>{$theme->name}</> ({$theme->key} {$theme->version}".($theme->parent ? ", Eltern-Theme {$theme->parent}" : '').')');
|
||||
|
||||
foreach ($errors as $error) {
|
||||
$this->line(" <fg=red>✗</> {$error}");
|
||||
}
|
||||
foreach ($warnings as $warning) {
|
||||
$this->line(" <fg=yellow>!</> {$warning}");
|
||||
}
|
||||
if ($errors === [] && $warnings === []) {
|
||||
$this->line(' <fg=green>✓</> Alles in Ordnung.');
|
||||
}
|
||||
|
||||
$failed = $failed || $errors !== [];
|
||||
}
|
||||
|
||||
$this->line('');
|
||||
|
||||
return $failed ? self::FAILURE : self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Themes\ThemeManifest;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\File;
|
||||
|
||||
#[Signature('themes:make {key : Ordner/Key, z. B. ostsee-nacht} {--name= : Anzeigename} {--parent= : Eltern-Theme (Standard: Basis-Theme)} {--description= : Beschreibung für die Theme-Auswahl}')]
|
||||
#[Description('Create a new theme next to the existing ones (never overwrites) – inherits everything until views are added')]
|
||||
class MakeTheme extends Command
|
||||
{
|
||||
/**
|
||||
* Execute the console command.
|
||||
*/
|
||||
public function handle(ThemeRegistry $registry): int
|
||||
{
|
||||
$key = (string) $this->argument('key');
|
||||
$parent = (string) ($this->option('parent') ?: config('themes.base'));
|
||||
$themesPath = rtrim((string) (config('themes.paths')[0] ?? resource_path('themes')), '/\\');
|
||||
$path = "{$themesPath}/{$key}";
|
||||
$folder = str_replace('\\', '/', ltrim(substr($path, strlen(base_path())), '/\\'));
|
||||
|
||||
if (! preg_match('/^[a-z0-9]+(-[a-z0-9]+)*$/', $key)) {
|
||||
$this->error('Key: nur Kleinbuchstaben, Ziffern und Bindestriche, z. B. ostsee-nacht.');
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
if (File::exists($path) || isset($registry->all()[$key])) {
|
||||
$this->error("Theme „{$key}“ gibt es schon – es wird nichts überschrieben.");
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
if (! isset($registry->all()[$parent])) {
|
||||
$this->error("Eltern-Theme „{$parent}“ ist nicht installiert.");
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$name = (string) ($this->option('name') ?: str($key)->replace('-', ' ')->title());
|
||||
$manifest = [
|
||||
'key' => $key,
|
||||
'name' => $name,
|
||||
'version' => '0.1.0',
|
||||
'parent' => $parent,
|
||||
'description' => (string) ($this->option('description') ?: "Neues Theme auf Basis von „{$registry->get($parent)->name}“."),
|
||||
'assets' => ['css' => "{$folder}/theme.css", 'js' => "{$folder}/theme.js"],
|
||||
'tokens' => $registry->tokens($parent),
|
||||
];
|
||||
|
||||
File::ensureDirectoryExists("{$path}/views/sections");
|
||||
File::ensureDirectoryExists("{$path}/views/partials");
|
||||
File::put("{$path}/views/sections/.gitkeep", '');
|
||||
File::put("{$path}/views/partials/.gitkeep", '');
|
||||
File::put("{$path}/theme.json", json_encode($manifest, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n");
|
||||
File::put("{$path}/theme.css", $this->css($name, $parent, $path, $registry));
|
||||
File::put("{$path}/theme.js", $this->js($name, ThemeManifest::relativePath($path, $registry->get($parent)->path).'/theme.js'));
|
||||
File::put("{$path}/README.md", $this->readme($name, $key, $parent));
|
||||
|
||||
$this->info("Theme „{$name}“ angelegt: {$folder}");
|
||||
$this->line('Es erbt zunächst alles von „'.$parent.'“. Vorlagen nach views/ kopieren und umgestalten – Anleitung: docs/THEME-ERSTELLUNG.md');
|
||||
$this->line("Prüfen: php artisan themes:check {$key} · Bauen: npm run build · Auswählen: Admin › System › Websites › Theme (dort „Vorschau“).");
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Child theme CSS: Tailwind, the reusable styles of the nearest ancestor that has a theme-base.css,
|
||||
* and the template sources of all ancestors, the booking forms and the theme itself.
|
||||
*/
|
||||
private function css(string $name, string $parent, string $path, ThemeRegistry $registry): string
|
||||
{
|
||||
$ancestors = $registry->chain($parent);
|
||||
$base = collect($ancestors)->first(fn (ThemeManifest $theme): bool => is_file($theme->path.'/theme-base.css')) ?? $ancestors[0];
|
||||
$import = ThemeManifest::relativePath($path, $base->path).'/theme-base.css';
|
||||
$sources = collect($ancestors)
|
||||
->map(fn (ThemeManifest $theme): string => "@source '".ThemeManifest::relativePath($path, $theme->viewsPath())."';")
|
||||
->push("@source '".ThemeManifest::relativePath($path, resource_path('views/livewire'))."';")
|
||||
->push("@source './views';")
|
||||
->implode("\n");
|
||||
|
||||
return <<<CSS
|
||||
/*
|
||||
* Theme „{$name}“ – Child von „{$parent}“ (Anleitung: docs/THEME-ERSTELLUNG.md).
|
||||
* theme-base.css des Eltern-Themes bringt Schriften, Token-Mapping und Basis-Klassen (.eyebrow,
|
||||
* .heading-display, .btn-primary, .btn-accent, .prose-theme, .reveal). Hier nur Abweichungen ergänzen.
|
||||
*/
|
||||
@import 'tailwindcss';
|
||||
@import '{$import}';
|
||||
|
||||
/* Eigene Schriften selbst hosten: npm install @fontsource/<schrift> und hier importieren, z. B.
|
||||
@import '@fontsource/fraunces/400.css';
|
||||
*/
|
||||
|
||||
/* Vorlagen, deren Klassen gebaut werden: geerbte, Buchungsformulare, eigene. */
|
||||
{$sources}
|
||||
|
||||
@theme inline {
|
||||
/* --font-display: 'Fraunces', Georgia, serif; */
|
||||
/* --font-sans: 'Inter', ui-sans-serif, system-ui, sans-serif; */
|
||||
}
|
||||
|
||||
@layer components {
|
||||
}
|
||||
|
||||
CSS;
|
||||
}
|
||||
|
||||
private function js(string $name, string $import): string
|
||||
{
|
||||
return <<<JS
|
||||
/**
|
||||
* Theme „{$name}“: übernimmt Lightbox, Verfügbarkeitssuche und rollierende Angebote vom Eltern-Theme.
|
||||
* Eigene Verbesserungen darunter – alles muss auch ohne JavaScript funktionieren.
|
||||
*/
|
||||
import '{$import}';
|
||||
|
||||
JS;
|
||||
}
|
||||
|
||||
private function readme(string $name, string $key, string $parent): string
|
||||
{
|
||||
return <<<MD
|
||||
# Theme „{$name}“ (`{$key}`)
|
||||
|
||||
Child-Theme von `{$parent}`. Vorlagen, die hier fehlen, kommen vom Eltern-Theme.
|
||||
|
||||
- Anleitung und Vorlagen-Vertrag: `docs/THEME-ERSTELLUNG.md`, `docs/THEMES.md` §5
|
||||
- Prüfen: `php artisan themes:check {$key}`
|
||||
- Ansehen ohne Umschalten: Admin › System › Websites › Theme „{$name}“ wählen › „Vorschau“ (erst danach speichern)
|
||||
|
||||
## Eigene Vorlagen
|
||||
|
||||
| Datei | Zweck |
|
||||
|---|---|
|
||||
| | |
|
||||
|
||||
MD;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Models\Page;
|
||||
use App\Themes\ThemeFactory;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
#[Signature('themes:preview {theme : Key des Themes} {--hours=24 : Gültigkeit der Links}')]
|
||||
#[Description('Print signed preview links: every page of the site with the theme, in every appearance – without switching the site')]
|
||||
class PreviewTheme extends Command
|
||||
{
|
||||
/**
|
||||
* Execute the console command.
|
||||
*/
|
||||
public function handle(ThemeRegistry $registry, ThemeFactory $factory): int
|
||||
{
|
||||
$key = (string) $this->argument('theme');
|
||||
if (! isset($registry->all()[$key])) {
|
||||
$this->error("Theme „{$key}“ nicht gefunden. Installiert: ".implode(', ', array_keys($registry->all())));
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$site = $factory->site();
|
||||
$expires = now()->addHours((int) $this->option('hours'));
|
||||
$pages = $site->exists ? $site->pages()->where('is_published', true)->orderBy('sort_order')->get() : collect();
|
||||
$appearances = $site->exists ? $site->appearances()->orderByDesc('is_default')->orderBy('starts_md')->get() : collect();
|
||||
|
||||
$this->info("Vorschau „{$registry->get($key)->name}“ für {$site->name} (gültig bis {$expires->format('d.m.Y H:i')}):");
|
||||
foreach ($pages as $page) {
|
||||
$this->line('');
|
||||
$this->line("<options=bold>{$page->title}</>");
|
||||
$this->line(' heute: '.$this->url($page, ['theme' => $key], $expires));
|
||||
foreach ($appearances as $appearance) {
|
||||
$this->line(str_pad(" {$appearance->name}:", 16).$this->url($page, ['theme' => $key, 'vorschau' => $appearance->id], $expires));
|
||||
}
|
||||
}
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $parameters
|
||||
*/
|
||||
private function url(Page $page, array $parameters, \DateTimeInterface $expires): string
|
||||
{
|
||||
return $page->isHome()
|
||||
? URL::temporarySignedRoute('home', $expires, $parameters)
|
||||
: URL::temporarySignedRoute('page', $expires, ['slug' => $page->slug, ...$parameters]);
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,9 @@ enum DiscountType: string implements HasLabel
|
||||
/** discount_value = number of cheapest nights that are free */
|
||||
case FreeNights = 'free_nights';
|
||||
|
||||
/** discount_value = package price in euro cents for all nights of the stay */
|
||||
case FixedStayPrice = 'fixed_stay_price';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
@@ -25,6 +28,12 @@ public function getLabel(): string
|
||||
self::AmountPerStay => 'Rabatt in € pro Aufenthalt',
|
||||
self::NightlyRate => 'Sonderpreis pro Nacht',
|
||||
self::FreeNights => 'Gratis-Nächte',
|
||||
self::FixedStayPrice => 'Pauschalpreis für den Aufenthalt',
|
||||
};
|
||||
}
|
||||
|
||||
public function isMoney(): bool
|
||||
{
|
||||
return in_array($this, [self::AmountPerStay, self::NightlyRate, self::FixedStayPrice], true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasDescription;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* How an offer finds its stays. All kinds are priced by PriceCalculator and advertised by OfferShowcase.
|
||||
*/
|
||||
enum OfferKind: string implements HasDescription, HasLabel
|
||||
{
|
||||
/** Conditions only (last minute, early bird, from N nights, weekend …). */
|
||||
case Rule = 'rule';
|
||||
|
||||
/** One fixed arrival and departure (stay_from / stay_until), e.g. a week as a package. */
|
||||
case FixedDates = 'fixed_dates';
|
||||
|
||||
/** Free gaps of at most max_gap_nights between two occupations, found automatically. */
|
||||
case GapFiller = 'gap_filler';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Rule => 'Rabattaktion (nach Bedingungen)',
|
||||
self::FixedDates => 'Fester Termin',
|
||||
self::GapFiller => 'Lückenfüller (Kalenderlücken)',
|
||||
};
|
||||
}
|
||||
|
||||
public function getDescription(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Rule => 'Gilt für jeden Aufenthalt, der die Bedingungen erfüllt, z. B. Last Minute oder „ab 3 Nächten −10 %“.',
|
||||
self::FixedDates => 'Ein bestimmter Zeitraum, z. B. „7 Nächte vom 07. bis 14.11.“ – wird nur beworben, solange er frei ist.',
|
||||
self::GapFiller => 'Findet freie Lücken zwischen zwei Buchungen automatisch und bewirbt sie mit konkreten Terminen.',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Forms\Components;
|
||||
|
||||
use App\Models\Photo;
|
||||
use Filament\Forms\Components\Select;
|
||||
|
||||
/**
|
||||
* Chooses website photos with a thumbnail next to each description, grouped by category,
|
||||
* so editors see what they insert.
|
||||
*/
|
||||
class PhotoSelect extends Select
|
||||
{
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this
|
||||
->options(fn (): array => self::photoOptions())
|
||||
->allowHtml()
|
||||
->searchable()
|
||||
->native(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, array<int, string>>
|
||||
*/
|
||||
public static function photoOptions(): array
|
||||
{
|
||||
return Photo::query()->with('media')->orderBy('category')->orderBy('sort_order')->get()
|
||||
->groupBy(fn (Photo $photo): string => $photo->category->getLabel())
|
||||
->map(fn ($photos): array => $photos->mapWithKeys(fn (Photo $photo): array => [$photo->id => self::optionLabel($photo)])->all())
|
||||
->all();
|
||||
}
|
||||
|
||||
public static function optionLabel(Photo $photo): string
|
||||
{
|
||||
$thumbnail = $photo->url('sm');
|
||||
$image = $thumbnail !== ''
|
||||
? '<img src="'.e($thumbnail).'" alt="" loading="lazy" style="width:4.5rem;height:3rem;object-fit:cover;border-radius:.25rem;flex-shrink:0">'
|
||||
: '<span style="width:4.5rem;height:3rem;border-radius:.25rem;background:#e5e7eb;flex-shrink:0"></span>';
|
||||
$hidden = $photo->is_published ? '' : ' <em style="opacity:.6">(ausgeblendet)</em>';
|
||||
|
||||
return '<span style="display:flex;align-items:center;gap:.75rem">'.$image.'<span>'.e($photo->alt_text).$hidden.'</span></span>';
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
namespace App\Filament\Pages;
|
||||
|
||||
use App\Enums\UserRole;
|
||||
use App\Models\Photo;
|
||||
use App\Filament\Forms\Components\PhotoSelect;
|
||||
use App\Support\Content;
|
||||
use BackedEnum;
|
||||
use Filament\Actions\Action;
|
||||
@@ -120,10 +120,8 @@ private function field(string $key, array $field): TextInput|Textarea|RichEditor
|
||||
'richtext' => RichEditor::make($name)
|
||||
->label($field['label'])
|
||||
->toolbarButtons([['bold', 'italic', 'link'], ['h2', 'h3'], ['bulletList', 'orderedList'], ['undo', 'redo']]),
|
||||
'photo' => Select::make($name)
|
||||
'photo' => PhotoSelect::make($name)
|
||||
->label($field['label'])
|
||||
->options(fn (): array => Photo::query()->orderBy('category')->orderBy('sort_order')->pluck('alt_text', 'id')->all())
|
||||
->searchable()
|
||||
->placeholder('Kein Bild gewählt')
|
||||
->helperText('Bilder verwalten Sie unter „Webseite › Bilder“.'),
|
||||
default => TextInput::make($name)->label($field['label'])->maxLength(255),
|
||||
|
||||
@@ -2,17 +2,23 @@
|
||||
|
||||
namespace App\Filament\Resources\Appearances\Schemas;
|
||||
|
||||
use App\Filament\Forms\Components\PhotoSelect;
|
||||
use App\Models\Appearance;
|
||||
use App\Models\Photo;
|
||||
use App\Models\Page;
|
||||
use App\Models\Site;
|
||||
use App\Models\SpecialOffer;
|
||||
use App\Themes\SectionRegistry;
|
||||
use App\Themes\Sections\Section as SectionBlock;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Closure;
|
||||
use Filament\Forms\Components\ColorPicker;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Schemas\Components\Component;
|
||||
use Filament\Schemas\Components\Fieldset;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Text;
|
||||
use Filament\Schemas\Components\Utilities\Get;
|
||||
use Filament\Schemas\Schema;
|
||||
|
||||
@@ -39,19 +45,18 @@ public static function configure(Schema $schema): Schema
|
||||
Toggle::make('is_default')->label('Standard (wenn kein Zeitraum passt)')->inline(false),
|
||||
Toggle::make('is_active')->label('Aktiv')->default(true)->inline(false),
|
||||
]),
|
||||
Section::make('Bild & Angebot')
|
||||
->columns(2)
|
||||
Section::make('Titelbild')
|
||||
->description('Gilt für alle Titelbereiche und als Vorschaubild beim Teilen in sozialen Medien – einzelne Bausteine können unten ein eigenes Bild bekommen. Sonderangebote werden unabhängig vom Erscheinungsbild beworben (Wohnung › Sonderangebote).')
|
||||
->schema([
|
||||
Select::make('hero_photo_id')
|
||||
PhotoSelect::make('hero_photo_id')
|
||||
->label('Titelbild')
|
||||
->options(fn (): array => Photo::query()->orderBy('category')->orderBy('sort_order')->pluck('alt_text', 'id')->all())
|
||||
->searchable()
|
||||
->placeholder('Bild der Seite verwenden'),
|
||||
Select::make('featured_offer_id')
|
||||
->label('Hervorgehobenes Sonderangebot')
|
||||
->options(fn (): array => SpecialOffer::query()->where('is_active', true)->pluck('name', 'id')->all())
|
||||
->placeholder('keins'),
|
||||
]),
|
||||
Section::make('Bilder je Baustein')
|
||||
->description('Für jeden Baustein mit Bildern ein eigenes Saisonbild wählen. Leer = Bild aus der Seite. Neue Bilder laden Sie unter Webseite › Fotos hoch.')
|
||||
->collapsible()
|
||||
->columnSpanFull()
|
||||
->schema(fn (Get $get): array => self::sectionPhotoFields($get('site_id'))),
|
||||
Section::make('Texte')
|
||||
->description('Leer lassen = Text der Seite bzw. kein Banner.')
|
||||
->columns(2)
|
||||
@@ -69,14 +74,68 @@ public static function configure(Schema $schema): Schema
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* One group per page and one field set per placed section that has photo slots
|
||||
* (see Section::photoSlots); stored in section_photos[<section id>][<slot>].
|
||||
*
|
||||
* @return list<Component>
|
||||
*/
|
||||
public static function sectionPhotoFields(int|string|null $siteId): array
|
||||
{
|
||||
$registry = app(SectionRegistry::class);
|
||||
$pages = Page::query()->where('site_id', $siteId)->orderBy('sort_order')->get();
|
||||
|
||||
$groups = [];
|
||||
foreach ($pages as $page) {
|
||||
$fieldsets = [];
|
||||
foreach ($page->sections ?? [] as $stored) {
|
||||
$class = $registry->all()[$stored['type'] ?? ''] ?? null;
|
||||
$sectionId = $stored['data']['id'] ?? null;
|
||||
if ($class === null || blank($sectionId) || $class::photoSlots() === []) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$fields = [];
|
||||
foreach ($class::photoSlots() as $slot => $definition) {
|
||||
$field = PhotoSelect::make("section_photos.{$sectionId}.{$slot}")
|
||||
->label($definition['label'])
|
||||
->placeholder('Standard (Bild aus der Seite)')
|
||||
->multiple($definition['type'] !== SectionBlock::SLOT_SINGLE);
|
||||
if (isset($definition['max'])) {
|
||||
$field->maxItems($definition['max']);
|
||||
}
|
||||
$fields[] = $field;
|
||||
|
||||
if ($definition['type'] === SectionBlock::SLOT_COLLECTION) {
|
||||
$fields[] = Radio::make("section_photos.{$sectionId}.mode")
|
||||
->label('Saisonbilder')
|
||||
->options(['replace' => 'ersetzen die Bilder des Bausteins', 'prepend' => 'kommen zuerst, danach die übrigen'])
|
||||
->default('replace')
|
||||
->inline();
|
||||
}
|
||||
}
|
||||
|
||||
$fieldsets[] = Fieldset::make(collect([$class::label(), $class::summary($stored['data'] ?? [])])->filter()->implode(' · '))
|
||||
->columns(1)
|
||||
->schema($fields);
|
||||
}
|
||||
|
||||
if ($fieldsets !== []) {
|
||||
$groups[] = Section::make($page->title)->compact()->collapsible()->schema($fieldsets);
|
||||
}
|
||||
}
|
||||
|
||||
return $groups ?: [Text::make('Auf den Seiten gibt es noch keine Bausteine mit Bildern.')];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<ColorPicker>
|
||||
*/
|
||||
public static function tokenFields(int|string|null $siteId, string $statePath = 'tokens'): array
|
||||
public static function tokenFields(int|string|null $siteId, string $statePath = 'tokens', ?string $themeKey = null): array
|
||||
{
|
||||
$theme = Site::find($siteId)?->theme ?? config('themes.base');
|
||||
$theme = $themeKey ?: (Site::find($siteId)?->theme ?? config('themes.base'));
|
||||
|
||||
return collect(app(ThemeRegistry::class)->get($theme)->tokens)
|
||||
return collect(app(ThemeRegistry::class)->tokens($theme))
|
||||
->map(fn (array $token, string $key): ColorPicker => ColorPicker::make("{$statePath}.{$key}")->label($token['label'])->placeholder($token['default']))
|
||||
->values()
|
||||
->all();
|
||||
|
||||
+94
-19
@@ -3,8 +3,8 @@
|
||||
namespace App\Filament\Resources\Properties\RelationManagers;
|
||||
|
||||
use App\Enums\DiscountType;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Models\SpecialOffer;
|
||||
use App\Support\Money;
|
||||
use Filament\Actions\CreateAction;
|
||||
use Filament\Actions\DeleteAction;
|
||||
use Filament\Actions\EditAction;
|
||||
@@ -12,12 +12,14 @@
|
||||
use Filament\Forms\Components\CheckboxList;
|
||||
use Filament\Forms\Components\DatePicker;
|
||||
use Filament\Forms\Components\DateTimePicker;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Resources\RelationManagers\RelationManager;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Utilities\Get;
|
||||
use Filament\Schemas\Components\Utilities\Set;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Tables\Columns\IconColumn;
|
||||
use Filament\Tables\Columns\TextColumn;
|
||||
@@ -33,10 +35,48 @@ class SpecialOffersRelationManager extends RelationManager
|
||||
|
||||
protected static ?string $pluralModelLabel = 'Sonderangebote';
|
||||
|
||||
/**
|
||||
* Starting points for typical offers in the create form.
|
||||
*
|
||||
* @var array<string, array{label: string, values: array<string, mixed>}>
|
||||
*/
|
||||
private const PRESETS = [
|
||||
'last_minute' => ['label' => 'Last Minute (−15 %, bis 14 Tage vor Anreise)', 'values' => ['kind' => 'rule', 'name' => 'Last Minute', 'discount_type' => 'percent', 'discount_value' => 15, 'max_days_before_arrival' => 14]],
|
||||
'early_bird' => ['label' => 'Frühbucher (−5 %, ab 180 Tage vor Anreise)', 'values' => ['kind' => 'rule', 'name' => 'Frühbucher', 'discount_type' => 'percent', 'discount_value' => 5, 'min_days_before_arrival' => 180]],
|
||||
'long_stay' => ['label' => 'Längerer Aufenthalt (ab 3 Nächten −10 %)', 'values' => ['kind' => 'rule', 'name' => 'Ab 3 Nächten', 'discount_type' => 'percent', 'discount_value' => 10, 'min_nights' => 3]],
|
||||
'week' => ['label' => '7 = 6 (eine Nacht gratis ab 7 Nächten)', 'values' => ['kind' => 'rule', 'name' => '7 Nächte bleiben, 6 bezahlen', 'discount_type' => 'free_nights', 'discount_value' => 1, 'min_nights' => 7]],
|
||||
'weekend' => ['label' => 'Special Weekend (Anreise Freitag, 2 Nächte)', 'values' => ['kind' => 'rule', 'name' => 'Special Weekend', 'discount_type' => 'percent', 'discount_value' => 10, 'arrival_weekdays' => [5], 'min_nights' => 2, 'max_nights' => 2]],
|
||||
'gap' => ['label' => 'Lückenfüller (Lücken bis 4 Nächte −20 %)', 'values' => ['kind' => 'gap_filler', 'name' => 'Kurzfristige Lücke', 'discount_type' => 'percent', 'discount_value' => 20, 'max_gap_nights' => 4, 'waives_min_stay' => true]],
|
||||
'fixed_week' => ['label' => 'Fester Termin (eine Woche zum Pauschalpreis)', 'values' => ['kind' => 'fixed_dates', 'name' => 'Ostsee-Woche', 'discount_type' => 'fixed_stay_price']],
|
||||
];
|
||||
|
||||
public function form(Schema $schema): Schema
|
||||
{
|
||||
return $schema
|
||||
->components([
|
||||
Section::make('Art des Angebots')
|
||||
->columns(2)
|
||||
->schema([
|
||||
Select::make('preset')
|
||||
->label('Vorlage (optional)')
|
||||
->helperText('Füllt typische Einstellungen vor – alles bleibt änderbar.')
|
||||
->options(collect(self::PRESETS)->map(fn (array $preset): string => $preset['label'])->all())
|
||||
->dehydrated(false)
|
||||
->live()
|
||||
->afterStateUpdated(function (?string $state, Set $set): void {
|
||||
foreach (self::PRESETS[$state]['values'] ?? [] as $field => $value) {
|
||||
$set($field, $value);
|
||||
}
|
||||
})
|
||||
->visibleOn('create'),
|
||||
Radio::make('kind')
|
||||
->label('Art')
|
||||
->options(OfferKind::class)
|
||||
->default(OfferKind::Rule)
|
||||
->live()
|
||||
->required()
|
||||
->columnSpanFull(),
|
||||
]),
|
||||
Section::make('Angebot')
|
||||
->columns(2)
|
||||
->schema([
|
||||
@@ -60,24 +100,54 @@ public function form(Schema $schema): Schema
|
||||
DiscountType::AmountPerStay => 'Rabatt pro Aufenthalt',
|
||||
DiscountType::NightlyRate => 'Sonderpreis pro Nacht',
|
||||
DiscountType::FreeNights => 'Anzahl Gratis-Nächte',
|
||||
DiscountType::FixedStayPrice => 'Pauschalpreis für alle Nächte',
|
||||
})
|
||||
->suffix(fn (Get $get): string => match ($this->discountType($get)) {
|
||||
DiscountType::Percent => '%',
|
||||
DiscountType::FreeNights => 'Nächte',
|
||||
default => '€',
|
||||
})
|
||||
->helperText(fn (Get $get): ?string => $this->discountType($get) === DiscountType::FreeNights ? 'Die günstigsten Nächte des Aufenthalts sind gratis.' : null)
|
||||
->helperText(fn (Get $get): ?string => match ($this->discountType($get)) {
|
||||
DiscountType::FreeNights => 'Die günstigsten Nächte des Aufenthalts sind gratis.',
|
||||
DiscountType::FixedStayPrice => 'Übernachtungen zusammen; Endreinigung und Extras kommen dazu.',
|
||||
default => null,
|
||||
})
|
||||
->numeric()
|
||||
->minValue(0)
|
||||
->required()
|
||||
->formatStateUsing(fn (?int $state, ?SpecialOffer $record): int|string|null => $state !== null && $this->isMoney($record?->discount_type) ? number_format($state / 100, 2, '.', '') : $state)
|
||||
->dehydrateStateUsing(fn (string|int|float|null $state, Get $get): int => $this->isMoney($this->discountType($get)) ? (int) round((float) $state * 100) : (int) $state),
|
||||
->formatStateUsing(fn (?int $state, ?SpecialOffer $record): int|string|null => $state !== null && $record?->discount_type?->isMoney() ? number_format($state / 100, 2, '.', '') : $state)
|
||||
->dehydrateStateUsing(fn (string|int|float|null $state, Get $get): int => $this->discountType($get)->isMoney() ? (int) round((float) $state * 100) : (int) $state),
|
||||
Toggle::make('is_active')->label('Aktiv')->default(true),
|
||||
Toggle::make('is_public')->label('Auf der Webseite bewerben')->default(true),
|
||||
Toggle::make('is_combinable')
|
||||
->label('Mit anderen kombinierbaren Angeboten kombinierbar')
|
||||
->helperText('Sonst erhält der Gast automatisch das für ihn beste Einzelangebot.')
|
||||
->columnSpanFull(),
|
||||
->helperText('Sonst erhält der Gast automatisch das für ihn beste Einzelangebot.'),
|
||||
]),
|
||||
Section::make('Bewerbung auf der Webseite')
|
||||
->description('Welche Angebote gerade erscheinen, ergibt sich automatisch: aktiv, ohne Aktionscode, im Buchungszeitraum, feste Termine nur solange frei, Lückenfüller je gefundener Lücke. Mehrere gleichzeitig werden im Baustein „Sonderangebote“ nebeneinander, als Liste oder rollierend gezeigt.')
|
||||
->columns(3)
|
||||
->schema([
|
||||
Toggle::make('is_public')->label('Auf der Webseite bewerben')->default(true),
|
||||
Toggle::make('is_featured')->label('Hervorheben')->helperText('Steht vorne, ist farbig markiert und erscheint im Titelbereich.'),
|
||||
TextInput::make('priority')->label('Priorität')->helperText('Höher = weiter vorne')->integer()->default(0),
|
||||
]),
|
||||
Section::make('Termin')
|
||||
->description('Der Gast muss genau diesen Zeitraum buchen. Beworben wird er nur, solange er frei ist.')
|
||||
->columns(2)
|
||||
->visible(fn (Get $get): bool => $this->kind($get) === OfferKind::FixedDates)
|
||||
->schema([
|
||||
DatePicker::make('stay_from')->label('Anreise')->required(),
|
||||
DatePicker::make('stay_until')->label('Abreise')->after('stay_from')->required(),
|
||||
]),
|
||||
Section::make('Kalenderlücken')
|
||||
->description('Freie Zeiträume zwischen zwei Buchungen oder Sperrzeiten. Die Webseite zeigt bis zu drei gefundene Lücken mit Termin und Preis.')
|
||||
->columns(2)
|
||||
->visible(fn (Get $get): bool => $this->kind($get) === OfferKind::GapFiller)
|
||||
->schema([
|
||||
TextInput::make('max_gap_nights')->label('Lücken bis höchstens … Nächte')->integer()->minValue(1)->default(4)->required(),
|
||||
Toggle::make('waives_min_stay')
|
||||
->label('Mindestaufenthalt der Saison aufheben')
|
||||
->helperText('Damit auch kurze Lücken (z. B. 2 Nächte bei 5 Nächten Mindestaufenthalt) buchbar werden.')
|
||||
->default(true),
|
||||
]),
|
||||
Section::make('Bedingungen')
|
||||
->description('Leere Felder bedeuten: keine Einschränkung.')
|
||||
@@ -103,15 +173,15 @@ public function form(Schema $schema): Schema
|
||||
->helperText('Frühbucher, z. B. 180')
|
||||
->integer()
|
||||
->minValue(0),
|
||||
TextInput::make('min_nights')->label('Mindestens Nächte')->integer()->minValue(1),
|
||||
TextInput::make('max_nights')->label('Höchstens Nächte')->integer()->minValue(1),
|
||||
TextInput::make('min_nights')->label('Mindestens Nächte')->integer()->minValue(1)->hidden(fn (Get $get): bool => $this->kind($get) === OfferKind::FixedDates),
|
||||
TextInput::make('max_nights')->label('Höchstens Nächte')->integer()->minValue(1)->hidden(fn (Get $get): bool => $this->kind($get) === OfferKind::FixedDates),
|
||||
CheckboxList::make('arrival_weekdays')
|
||||
->label('Anreise nur am')
|
||||
->options([1 => 'Mo', 2 => 'Di', 3 => 'Mi', 4 => 'Do', 5 => 'Fr', 6 => 'Sa', 7 => 'So'])
|
||||
->columns(7)
|
||||
->columnSpanFull(),
|
||||
DatePicker::make('stay_from')->label('Aufenthalt frühestens ab'),
|
||||
DatePicker::make('stay_until')->label('Abreise spätestens am'),
|
||||
DatePicker::make('stay_from')->label('Aufenthalt frühestens ab')->hidden(fn (Get $get): bool => $this->kind($get) === OfferKind::FixedDates),
|
||||
DatePicker::make('stay_until')->label('Abreise spätestens am')->hidden(fn (Get $get): bool => $this->kind($get) === OfferKind::FixedDates),
|
||||
DateTimePicker::make('bookable_from')->label('Buchbar ab')->seconds(false),
|
||||
DateTimePicker::make('bookable_until')->label('Buchbar bis')->seconds(false),
|
||||
]),
|
||||
@@ -122,19 +192,22 @@ public function table(Table $table): Table
|
||||
{
|
||||
return $table
|
||||
->recordTitleAttribute('name')
|
||||
->defaultSort('priority', 'desc')
|
||||
->description('Sonderangebote werden bei jeder Preisberechnung automatisch geprüft und angewendet.')
|
||||
->columns([
|
||||
TextColumn::make('name')
|
||||
->label('Angebot')
|
||||
->description(fn (SpecialOffer $record): ?string => $record->public_description),
|
||||
TextColumn::make('kind')->label('Art')->badge(),
|
||||
TextColumn::make('discount')
|
||||
->label('Vorteil')
|
||||
->state(fn (SpecialOffer $record): string => match ($record->discount_type) {
|
||||
DiscountType::Percent => "−{$record->discount_value} %",
|
||||
DiscountType::AmountPerStay => '−'.Money::format($record->discount_value),
|
||||
DiscountType::NightlyRate => Money::format($record->discount_value).' / Nacht',
|
||||
DiscountType::FreeNights => "{$record->discount_value} Nacht/Nächte gratis",
|
||||
}),
|
||||
->state(fn (SpecialOffer $record): string => $record->advantageLabel()),
|
||||
TextColumn::make('conditions')
|
||||
->label('Bedingungen')
|
||||
->state(fn (SpecialOffer $record): string => implode(' · ', $record->conditionSummary()) ?: '–')
|
||||
->wrap(),
|
||||
IconColumn::make('is_featured')->label('Hervorgehoben')->boolean(),
|
||||
TextColumn::make('priority')->label('Priorität')->sortable(),
|
||||
TextColumn::make('code')->label('Code')->placeholder('automatisch')->badge(),
|
||||
TextColumn::make('season_names')->label('Saisons')->badge()->placeholder('alle'),
|
||||
IconColumn::make('is_combinable')->label('Kombinierbar')->boolean(),
|
||||
@@ -157,8 +230,10 @@ private function discountType(Get $get): DiscountType
|
||||
return $type instanceof DiscountType ? $type : (DiscountType::tryFrom((string) $type) ?? DiscountType::Percent);
|
||||
}
|
||||
|
||||
private function isMoney(?DiscountType $type): bool
|
||||
private function kind(Get $get): OfferKind
|
||||
{
|
||||
return in_array($type, [DiscountType::AmountPerStay, DiscountType::NightlyRate], true);
|
||||
$kind = $get('kind');
|
||||
|
||||
return $kind instanceof OfferKind ? $kind : (OfferKind::tryFrom((string) $kind) ?? OfferKind::Rule);
|
||||
}
|
||||
}
|
||||
@@ -5,12 +5,14 @@
|
||||
use App\Filament\Resources\Appearances\Schemas\AppearanceForm;
|
||||
use App\Models\Site;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Utilities\Get;
|
||||
use Filament\Schemas\Schema;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
class SiteForm
|
||||
{
|
||||
@@ -29,14 +31,26 @@ public static function configure(Schema $schema): Schema
|
||||
->helperText('Leer = Standard-Website für alle Adressen ohne eigene Zuordnung.')
|
||||
->unique(ignoreRecord: true)
|
||||
->maxLength(190),
|
||||
Select::make('theme')->label('Theme')->options(fn (): array => app(ThemeRegistry::class)->options())->default(config('themes.base'))->required()->live(),
|
||||
Select::make('theme')
|
||||
->label('Theme')
|
||||
->options(fn (): array => app(ThemeRegistry::class)->options())
|
||||
->default(config('themes.base'))
|
||||
->required()
|
||||
->live()
|
||||
->helperText(fn (Get $get): ?string => filled($get('theme')) ? app(ThemeRegistry::class)->get($get('theme'))->description : null)
|
||||
->hintAction(
|
||||
Action::make('previewTheme')
|
||||
->label('Vorschau')
|
||||
->icon('heroicon-o-eye')
|
||||
->url(fn (Get $get): string => URL::temporarySignedRoute('home', now()->addDay(), ['theme' => $get('theme') ?: config('themes.base')]), shouldOpenInNewTab: true),
|
||||
),
|
||||
Toggle::make('is_default')->label('Standard-Website')->inline(false),
|
||||
]),
|
||||
Section::make('Farben des Themes')
|
||||
->description('Grundfarben dieser Website; saisonale Erscheinungsbilder können einzelne Farben zusätzlich ändern.')
|
||||
->columns(3)
|
||||
->collapsible()
|
||||
->schema(fn (Get $get, ?Site $record): array => AppearanceForm::tokenFields($record?->id, 'theme_settings.tokens')),
|
||||
->schema(fn (Get $get, ?Site $record): array => AppearanceForm::tokenFields($record?->id, 'theme_settings.tokens', $get('theme'))),
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -11,10 +11,11 @@
|
||||
|
||||
/**
|
||||
* A seasonal look of a site (e.g. summer, winter, Christmas, New Year's Eve): colour tokens, hero photo,
|
||||
* texts and banner change – the page structure does not. The period recurs every year ("MM-DD" to "MM-DD",
|
||||
* photos per section, texts and banner change – the page structure does not (sections may be limited to
|
||||
* appearances, see SectionRegistry). Offers are advertised by their own rules (OfferShowcase). The period recurs every year ("MM-DD" to "MM-DD",
|
||||
* inclusive; a period may run over the turn of the year). The default appearance applies when none matches.
|
||||
*/
|
||||
#[Fillable(['site_id', 'name', 'starts_md', 'ends_md', 'priority', 'is_default', 'is_active', 'tokens', 'overrides', 'hero_photo_id', 'featured_offer_id'])]
|
||||
#[Fillable(['site_id', 'name', 'starts_md', 'ends_md', 'priority', 'is_default', 'is_active', 'tokens', 'overrides', 'hero_photo_id', 'section_photos'])]
|
||||
class Appearance extends Model
|
||||
{
|
||||
/** @use HasFactory<AppearanceFactory> */
|
||||
@@ -46,6 +47,7 @@ protected function casts(): array
|
||||
'is_active' => 'boolean',
|
||||
'tokens' => 'array',
|
||||
'overrides' => 'array',
|
||||
'section_photos' => 'array',
|
||||
];
|
||||
}
|
||||
|
||||
@@ -65,14 +67,6 @@ public function heroPhoto(): BelongsTo
|
||||
return $this->belongsTo(Photo::class, 'hero_photo_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<SpecialOffer, $this>
|
||||
*/
|
||||
public function featuredOffer(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(SpecialOffer::class, 'featured_offer_id');
|
||||
}
|
||||
|
||||
public function covers(CarbonInterface $date): bool
|
||||
{
|
||||
if ($this->starts_md === null || $this->ends_md === null) {
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/**
|
||||
* A page of a site, composed of sections from the catalogue (App\Themes\Sections).
|
||||
@@ -59,4 +60,34 @@ public function label(): string
|
||||
{
|
||||
return $this->menu_label ?: $this->title;
|
||||
}
|
||||
|
||||
protected static function booted(): void
|
||||
{
|
||||
static::saving(function (Page $page): void {
|
||||
$page->sections = self::assignSectionIds($page->sections ?? []);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Gives every placed section a stable id (data.id) – new and duplicated sections get a fresh one –
|
||||
* so appearances can address sections independently of their order.
|
||||
*
|
||||
* @param list<array{type: string, data?: array<string, mixed>}> $sections
|
||||
* @return list<array{type: string, data: array<string, mixed>}>
|
||||
*/
|
||||
public static function assignSectionIds(array $sections): array
|
||||
{
|
||||
$seen = [];
|
||||
|
||||
return array_values(array_map(function (array $section) use (&$seen): array {
|
||||
$data = $section['data'] ?? [];
|
||||
$id = $data['id'] ?? null;
|
||||
if (! is_string($id) || $id === '' || isset($seen[$id])) {
|
||||
$id = (string) Str::uuid();
|
||||
}
|
||||
$seen[$id] = true;
|
||||
|
||||
return [...$section, 'data' => [...$data, 'id' => $id]];
|
||||
}, $sections));
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,9 @@
|
||||
namespace App\Models;
|
||||
|
||||
use App\Enums\DiscountType;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Database\Factories\SpecialOfferFactory;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
@@ -14,16 +16,19 @@
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
/**
|
||||
* A discount rule such as last minute, early bird, long stay, special weekends or a code for regular guests.
|
||||
* Every condition left empty means "no restriction".
|
||||
* A discount rule such as last minute, early bird, long stay, special weekends or a code for regular guests,
|
||||
* a fixed date package or a gap filler (see OfferKind). Every condition left empty means "no restriction".
|
||||
*/
|
||||
#[Fillable([
|
||||
'property_id',
|
||||
'name',
|
||||
'kind',
|
||||
'public_description',
|
||||
'is_active',
|
||||
'is_public',
|
||||
'is_combinable',
|
||||
'priority',
|
||||
'is_featured',
|
||||
'code',
|
||||
'discount_type',
|
||||
'discount_value',
|
||||
@@ -35,6 +40,8 @@
|
||||
'max_days_before_arrival',
|
||||
'min_nights',
|
||||
'max_nights',
|
||||
'max_gap_nights',
|
||||
'waives_min_stay',
|
||||
'arrival_weekdays',
|
||||
'season_names',
|
||||
])]
|
||||
@@ -54,6 +61,9 @@ protected function casts(): array
|
||||
'is_active' => 'boolean',
|
||||
'is_public' => 'boolean',
|
||||
'is_combinable' => 'boolean',
|
||||
'is_featured' => 'boolean',
|
||||
'waives_min_stay' => 'boolean',
|
||||
'kind' => OfferKind::class,
|
||||
'discount_type' => DiscountType::class,
|
||||
'stay_from' => 'immutable_date',
|
||||
'stay_until' => 'immutable_date',
|
||||
@@ -84,13 +94,23 @@ protected function active(Builder $query): Builder
|
||||
|
||||
/**
|
||||
* Whether all conditions are met. Offers with a code only apply when the guest entered that code.
|
||||
* $gapNights is the length of the calendar gap containing the stay (null = not inside a gap); it only
|
||||
* matters for gap fillers.
|
||||
*/
|
||||
public function appliesTo(StayRequest $stay, string $arrivalSeasonName, CarbonImmutable $bookedAt): bool
|
||||
public function appliesTo(StayRequest $stay, string $arrivalSeasonName, CarbonImmutable $bookedAt, ?int $gapNights = null): bool
|
||||
{
|
||||
$nights = $stay->nights();
|
||||
$daysBeforeArrival = (int) $bookedAt->startOfDay()->diffInDays($stay->arrival, false);
|
||||
|
||||
$kindMatches = match ($this->kind ?? OfferKind::Rule) {
|
||||
OfferKind::Rule => true,
|
||||
OfferKind::FixedDates => $this->stay_from !== null && $this->stay_until !== null
|
||||
&& $stay->arrival->isSameDay($this->stay_from) && $stay->departure->isSameDay($this->stay_until),
|
||||
OfferKind::GapFiller => $gapNights !== null && ($this->max_gap_nights === null || $gapNights <= $this->max_gap_nights),
|
||||
};
|
||||
|
||||
return $this->is_active
|
||||
&& $kindMatches
|
||||
&& ($this->code === null || strcasecmp($this->code, (string) $stay->promoCode) === 0)
|
||||
&& ($this->stay_from === null || $stay->arrival->greaterThanOrEqualTo($this->stay_from))
|
||||
&& ($this->stay_until === null || $stay->departure->lessThanOrEqualTo($this->stay_until))
|
||||
@@ -118,11 +138,55 @@ public function discountFor(array $nightlyRates): int
|
||||
DiscountType::AmountPerStay => $this->discount_value,
|
||||
DiscountType::NightlyRate => array_sum(array_map(fn (int $rate): int => max(0, $rate - $this->discount_value), $nightlyRates)),
|
||||
DiscountType::FreeNights => array_sum(array_slice($this->sortedAscending($nightlyRates), 0, $this->discount_value)),
|
||||
DiscountType::FixedStayPrice => max(0, $accommodation - $this->discount_value),
|
||||
};
|
||||
|
||||
return min($discount, $accommodation);
|
||||
}
|
||||
|
||||
/**
|
||||
* Short label of the advantage, e.g. "−10 %", "59,00 € / Nacht" or "Pauschal 560,00 €".
|
||||
*/
|
||||
public function advantageLabel(): string
|
||||
{
|
||||
return match ($this->discount_type) {
|
||||
DiscountType::Percent => "−{$this->discount_value} %",
|
||||
DiscountType::AmountPerStay => '−'.Money::format($this->discount_value),
|
||||
DiscountType::NightlyRate => Money::format($this->discount_value).' / Nacht',
|
||||
DiscountType::FreeNights => $this->discount_value === 1 ? '1 Nacht gratis' : "{$this->discount_value} Nächte gratis",
|
||||
DiscountType::FixedStayPrice => 'Pauschal '.Money::format($this->discount_value),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The conditions in plain German for guests, e.g. ["ab 3 Nächten", "Anreise freitags", "bis 14 Tage vor Anreise"].
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
public function conditionSummary(): array
|
||||
{
|
||||
$weekdays = [1 => 'montags', 2 => 'dienstags', 3 => 'mittwochs', 4 => 'donnerstags', 5 => 'freitags', 6 => 'samstags', 7 => 'sonntags'];
|
||||
|
||||
return array_values(array_filter([
|
||||
match (true) {
|
||||
$this->kind === OfferKind::FixedDates => null,
|
||||
$this->min_nights !== null && $this->max_nights !== null && $this->min_nights === $this->max_nights => "genau {$this->min_nights} Nächte",
|
||||
$this->min_nights !== null && $this->max_nights !== null => "{$this->min_nights} bis {$this->max_nights} Nächte",
|
||||
$this->min_nights !== null => "ab {$this->min_nights} Nächten",
|
||||
$this->max_nights !== null => "bis {$this->max_nights} Nächte",
|
||||
default => null,
|
||||
},
|
||||
empty($this->arrival_weekdays) ? null : 'Anreise '.collect($this->arrival_weekdays)->map(fn ($day): string => $weekdays[(int) $day] ?? '')->implode(' oder '),
|
||||
$this->max_days_before_arrival !== null ? "Buchung bis {$this->max_days_before_arrival} Tage vor Anreise" : null,
|
||||
$this->min_days_before_arrival !== null ? "Buchung mindestens {$this->min_days_before_arrival} Tage vor Anreise" : null,
|
||||
empty($this->season_names) ? null : 'Anreise in: '.implode(', ', $this->season_names),
|
||||
$this->kind !== OfferKind::FixedDates && ($this->stay_from || $this->stay_until)
|
||||
? 'Reisezeitraum '.($this->stay_from?->format('d.m.Y') ?? 'ab sofort').' – '.($this->stay_until?->format('d.m.Y') ?? 'offen')
|
||||
: null,
|
||||
$this->bookable_until !== null ? 'buchbar bis '.$this->bookable_until->format('d.m.Y') : null,
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<int> $rates
|
||||
* @return list<int>
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
<?php
|
||||
|
||||
namespace App\Pricing;
|
||||
|
||||
use App\Models\SpecialOffer;
|
||||
use Carbon\CarbonImmutable;
|
||||
|
||||
/**
|
||||
* An offer as the website shows it: for fixed dates and gap fillers with concrete dates and an example price.
|
||||
*/
|
||||
final readonly class AdvertisedOffer
|
||||
{
|
||||
/**
|
||||
* @param list<string> $conditions
|
||||
*/
|
||||
public function __construct(
|
||||
public SpecialOffer $offer,
|
||||
public string $title,
|
||||
public ?string $description,
|
||||
public string $advantage,
|
||||
public array $conditions,
|
||||
public ?CarbonImmutable $arrival = null,
|
||||
public ?CarbonImmutable $departure = null,
|
||||
public ?PriceQuote $quote = null,
|
||||
) {}
|
||||
|
||||
public function nights(): ?int
|
||||
{
|
||||
return $this->arrival && $this->departure ? (int) $this->arrival->diffInDays($this->departure) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Price before the discount (accommodation, extra guests, cleaning) – for "statt …".
|
||||
*/
|
||||
public function regularTotal(): ?int
|
||||
{
|
||||
return $this->quote ? $this->quote->total() + $this->quote->discount() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Link to the booking page, with the dates filled in when the offer has concrete dates.
|
||||
*/
|
||||
public function bookingUrl(): string
|
||||
{
|
||||
return route('booking.create', array_filter([
|
||||
'anreise' => $this->arrival?->toDateString(),
|
||||
'abreise' => $this->departure?->toDateString(),
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Stable key for the view (an offer can appear several times with different gaps).
|
||||
*/
|
||||
public function key(): string
|
||||
{
|
||||
return $this->offer->id.'-'.($this->arrival?->toDateString() ?? 'rule');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
<?php
|
||||
|
||||
namespace App\Pricing;
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Availability\GapFinder;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Enums\QuoteLineType;
|
||||
use App\Models\Property;
|
||||
use App\Models\SpecialOffer;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
/**
|
||||
* Which offers the website advertises right now – independent of the seasonal appearance.
|
||||
*
|
||||
* Shown are active, public offers without a code whose booking window is open. Fixed dates only while they
|
||||
* are still free; gap fillers once per free gap found in the calendar. Fixed dates and gaps are priced
|
||||
* with PriceCalculator, so the advertised price is exactly what the guest is quoted. Order: highlighted
|
||||
* first, then priority, then the earliest date.
|
||||
*/
|
||||
class OfferShowcase
|
||||
{
|
||||
/** Gap fillers without a lead time limit look this many days ahead. */
|
||||
public const GAP_HORIZON_DAYS = 60;
|
||||
|
||||
/** At most this many gaps per gap filler. */
|
||||
public const GAPS_PER_OFFER = 3;
|
||||
|
||||
public function __construct(
|
||||
private PriceCalculator $calculator,
|
||||
private AvailabilityChecker $availability = new AvailabilityChecker,
|
||||
private GapFinder $gaps = new GapFinder,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @return Collection<int, AdvertisedOffer>
|
||||
*/
|
||||
public function current(Property $property, ?CarbonImmutable $now = null, ?int $limit = null, bool $featuredOnly = false): Collection
|
||||
{
|
||||
$now ??= CarbonImmutable::now();
|
||||
$today = $now->startOfDay();
|
||||
|
||||
$offers = $property->specialOffers()
|
||||
->active()
|
||||
->where('is_public', true)
|
||||
->whereNull('code')
|
||||
->when($featuredOnly, fn ($query) => $query->where('is_featured', true))
|
||||
->where(fn ($query) => $query->whereNull('bookable_from')->orWhere('bookable_from', '<=', $now))
|
||||
->where(fn ($query) => $query->whereNull('bookable_until')->orWhere('bookable_until', '>=', $now))
|
||||
->get();
|
||||
|
||||
$advertised = $offers->flatMap(fn (SpecialOffer $offer): array => match ($offer->kind ?? OfferKind::Rule) {
|
||||
OfferKind::Rule => $this->rule($offer, $today),
|
||||
OfferKind::FixedDates => $this->fixedDates($property, $offer, $now),
|
||||
OfferKind::GapFiller => $this->gapFiller($property, $offer, $now),
|
||||
});
|
||||
|
||||
$sorted = $advertised->sortBy([
|
||||
fn (AdvertisedOffer $a, AdvertisedOffer $b): int => $b->offer->is_featured <=> $a->offer->is_featured,
|
||||
fn (AdvertisedOffer $a, AdvertisedOffer $b): int => $b->offer->priority <=> $a->offer->priority,
|
||||
fn (AdvertisedOffer $a, AdvertisedOffer $b): int => ($a->arrival?->getTimestamp() ?? PHP_INT_MAX) <=> ($b->arrival?->getTimestamp() ?? PHP_INT_MAX),
|
||||
])->values();
|
||||
|
||||
return $limit ? $sorted->take($limit)->values() : $sorted;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<AdvertisedOffer>
|
||||
*/
|
||||
private function rule(SpecialOffer $offer, CarbonImmutable $today): array
|
||||
{
|
||||
if ($offer->stay_until !== null && $offer->stay_until->lessThanOrEqualTo($today)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return [$this->advertised($offer)];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<AdvertisedOffer>
|
||||
*/
|
||||
private function fixedDates(Property $property, SpecialOffer $offer, CarbonImmutable $now): array
|
||||
{
|
||||
if ($offer->stay_from === null || $offer->stay_until === null || $offer->stay_from->lessThanOrEqualTo($now->startOfDay())) {
|
||||
return [];
|
||||
}
|
||||
|
||||
if (! $this->availability->isAvailable($property, $offer->stay_from, $offer->stay_until)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$quote = $this->pricedWith($property, $offer, $offer->stay_from, $offer->stay_until, $now);
|
||||
|
||||
return $quote ? [$this->advertised($offer, $offer->stay_from, $offer->stay_until, $quote)] : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<AdvertisedOffer>
|
||||
*/
|
||||
private function gapFiller(Property $property, SpecialOffer $offer, CarbonImmutable $now): array
|
||||
{
|
||||
$today = $now->startOfDay();
|
||||
$from = $today->addDays(max(1, $offer->min_days_before_arrival ?? 1));
|
||||
$until = $today->addDays($offer->max_days_before_arrival ?? self::GAP_HORIZON_DAYS)->addDay();
|
||||
if ($offer->stay_from !== null && $offer->stay_from->greaterThan($from)) {
|
||||
$from = $offer->stay_from;
|
||||
}
|
||||
|
||||
$advertised = [];
|
||||
foreach ($this->gaps->gaps($property, $from, $until, $offer->max_gap_nights ?? 7) as [$arrival, $departure]) {
|
||||
$quote = $this->pricedWith($property, $offer, $arrival, $departure, $now);
|
||||
if ($quote !== null) {
|
||||
$advertised[] = $this->advertised($offer, $arrival, $departure, $quote);
|
||||
}
|
||||
|
||||
if (count($advertised) >= self::GAPS_PER_OFFER) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return $advertised;
|
||||
}
|
||||
|
||||
/**
|
||||
* The quote for the stay, if the offer is actually applied to it (it may lose against a better offer
|
||||
* or fail a condition such as the minimum stay); priced for the number of guests included in the rent.
|
||||
*/
|
||||
private function pricedWith(Property $property, SpecialOffer $offer, CarbonImmutable $arrival, CarbonImmutable $departure, CarbonImmutable $now): ?PriceQuote
|
||||
{
|
||||
$quote = rescue(
|
||||
fn (): PriceQuote => $this->calculator->calculate($property, new StayRequest($arrival, $departure, max(1, $property->included_guests)), $now),
|
||||
null,
|
||||
false,
|
||||
);
|
||||
|
||||
$applied = $quote !== null && collect($quote->lines)
|
||||
->contains(fn (QuoteLine $line): bool => $line->type === QuoteLineType::Discount && $line->label === $offer->name);
|
||||
|
||||
return $applied ? $quote : null;
|
||||
}
|
||||
|
||||
private function advertised(SpecialOffer $offer, ?CarbonImmutable $arrival = null, ?CarbonImmutable $departure = null, ?PriceQuote $quote = null): AdvertisedOffer
|
||||
{
|
||||
return new AdvertisedOffer(
|
||||
offer: $offer,
|
||||
title: $offer->name,
|
||||
description: $offer->public_description,
|
||||
advantage: $offer->advantageLabel(),
|
||||
conditions: $offer->conditionSummary(),
|
||||
arrival: $arrival,
|
||||
departure: $departure,
|
||||
quote: $quote,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,9 @@
|
||||
|
||||
namespace App\Pricing;
|
||||
|
||||
use App\Availability\GapFinder;
|
||||
use App\Enums\ExtraPricing;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Enums\QuoteLineType;
|
||||
use App\Models\Extra;
|
||||
use App\Models\Property;
|
||||
@@ -13,6 +15,8 @@
|
||||
|
||||
class PriceCalculator
|
||||
{
|
||||
public function __construct(private GapFinder $gaps = new GapFinder) {}
|
||||
|
||||
/**
|
||||
* Price a stay. Special offers are applied automatically; $bookedAt (default: now) decides
|
||||
* time-dependent offers such as last minute or early bird.
|
||||
@@ -32,14 +36,18 @@ public function calculate(Property $property, StayRequest $stay, ?CarbonImmutabl
|
||||
$nights = $stay->nights();
|
||||
$nightSeasons = $this->seasonPerNight($property, $stay);
|
||||
|
||||
$bookedAt ??= CarbonImmutable::now();
|
||||
$offers = $this->applicableOffers($property, $stay, $nightSeasons, $bookedAt);
|
||||
|
||||
$arrivalSeason = $nightSeasons[0];
|
||||
if ($nights < $arrivalSeason->min_nights) {
|
||||
$minimumStayWaived = $offers->contains(fn (SpecialOffer $offer): bool => $offer->waives_min_stay && $offer->kind === OfferKind::GapFiller);
|
||||
if ($nights < $arrivalSeason->min_nights && ! $minimumStayWaived) {
|
||||
throw QuoteException::minimumStay($arrivalSeason->min_nights, $arrivalSeason->name);
|
||||
}
|
||||
|
||||
$lines = $this->accommodationLines($nightSeasons);
|
||||
|
||||
$appliedOffers = $this->bestOffers($property, $stay, $nightSeasons, $bookedAt ?? CarbonImmutable::now());
|
||||
$appliedOffers = $this->bestOffers($offers, $nightSeasons);
|
||||
foreach ($appliedOffers as ['offer' => $offer, 'discount' => $discount]) {
|
||||
$lines[] = new QuoteLine(QuoteLineType::Discount, $offer->name, 1, -$discount, -$discount);
|
||||
}
|
||||
@@ -117,20 +125,37 @@ private function accommodationLines(array $nightSeasons): array
|
||||
), $runs);
|
||||
}
|
||||
|
||||
/**
|
||||
* Active offers whose conditions the stay meets. The calendar gap is only looked up if a gap filler exists.
|
||||
*
|
||||
* @param non-empty-list<Season> $nightSeasons
|
||||
* @return Collection<int, SpecialOffer>
|
||||
*/
|
||||
private function applicableOffers(Property $property, StayRequest $stay, array $nightSeasons, CarbonImmutable $bookedAt): Collection
|
||||
{
|
||||
$offers = $property->specialOffers()->active()->get();
|
||||
|
||||
$gapNights = $offers->contains(fn (SpecialOffer $offer): bool => $offer->kind === OfferKind::GapFiller)
|
||||
? $this->gaps->gapContaining($property, $stay->arrival, $stay->departure)
|
||||
: null;
|
||||
|
||||
return $offers->filter(fn (SpecialOffer $offer): bool => $offer->appliesTo($stay, $nightSeasons[0]->name, $bookedAt, $gapNights))->values();
|
||||
}
|
||||
|
||||
/**
|
||||
* The guest gets whichever is cheaper for them: the single best non-combinable offer,
|
||||
* or all combinable offers together (capped at the accommodation price).
|
||||
*
|
||||
* @param Collection<int, SpecialOffer> $offers
|
||||
* @param non-empty-list<Season> $nightSeasons
|
||||
* @return list<array{offer: SpecialOffer, discount: int}>
|
||||
*/
|
||||
private function bestOffers(Property $property, StayRequest $stay, array $nightSeasons, CarbonImmutable $bookedAt): array
|
||||
private function bestOffers(Collection $offers, array $nightSeasons): array
|
||||
{
|
||||
$nightlyRates = array_map(fn (Season $season): int => $season->nightly_rate, $nightSeasons);
|
||||
$accommodation = array_sum($nightlyRates);
|
||||
|
||||
$candidates = $property->specialOffers()->active()->get()
|
||||
->filter(fn (SpecialOffer $offer): bool => $offer->appliesTo($stay, $nightSeasons[0]->name, $bookedAt))
|
||||
$candidates = $offers
|
||||
->map(fn (SpecialOffer $offer): array => ['offer' => $offer, 'discount' => $offer->discountFor($nightlyRates)])
|
||||
->filter(fn (array $candidate): bool => $candidate['discount'] > 0);
|
||||
|
||||
|
||||
@@ -2,13 +2,19 @@
|
||||
|
||||
namespace App\Themes;
|
||||
|
||||
use App\Models\Appearance;
|
||||
use App\Themes\Sections\Section;
|
||||
use Filament\Forms\Components\Builder\Block;
|
||||
use Filament\Forms\Components\Hidden;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Support\Facades\View as ViewFactory;
|
||||
|
||||
/**
|
||||
* The section catalogue from config/themes.php: builder blocks for the admin and rendering for the website.
|
||||
*
|
||||
* Every placed section carries data.id (a stable UUID, see Page::assignSectionIds) so appearances can
|
||||
* address it, and data.appearances (appearance ids; empty = always shown).
|
||||
*/
|
||||
class SectionRegistry
|
||||
{
|
||||
@@ -36,13 +42,33 @@ public function blocks(): array
|
||||
{
|
||||
return array_values(array_map(
|
||||
fn (string $class): Block => Block::make($class::key())
|
||||
->label($class::label())
|
||||
->label(fn (?array $state): string => $this->blockLabel($class, $state))
|
||||
->icon($class::icon())
|
||||
->schema($class::schema()),
|
||||
->schema([
|
||||
Hidden::make('id'),
|
||||
...$class::schema(),
|
||||
Select::make('appearances')
|
||||
->label('Nur anzeigen im Erscheinungsbild')
|
||||
->helperText('Leer = immer anzeigen. Z. B. ein Weihnachts-Baustein nur im Erscheinungsbild „Weihnachten“.')
|
||||
->options(fn (): array => Appearance::query()->orderByDesc('is_default')->orderBy('name')->pluck('name', 'id')->all())
|
||||
->multiple(),
|
||||
]),
|
||||
$this->all(),
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a placed section is shown with the active appearance.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
public function isVisible(Theme $theme, array $data): bool
|
||||
{
|
||||
$appearances = array_map('intval', array_filter((array) ($data['appearances'] ?? [])));
|
||||
|
||||
return $appearances === [] || ($theme->appearance !== null && in_array($theme->appearance->id, $appearances, true));
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the stored sections of a page; unknown or failing types are skipped (and reported),
|
||||
* so a page never breaks because of one section.
|
||||
@@ -55,7 +81,7 @@ public function render(Theme $theme, ?array $sections): array
|
||||
$views = [];
|
||||
foreach ($sections ?? [] as $index => $stored) {
|
||||
$section = $this->get($stored['type'] ?? '');
|
||||
if ($section === null || ! ViewFactory::exists($section->view())) {
|
||||
if ($section === null || ! ViewFactory::exists($section->view()) || ! $this->isVisible($theme, $stored['data'] ?? [])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -68,4 +94,22 @@ public function render(Theme $theme, ?array $sections): array
|
||||
|
||||
return $views;
|
||||
}
|
||||
|
||||
/**
|
||||
* "Text mit Bild · Ihr Zuhause an der Ostsee · nur: Winter" for the collapsed builder item.
|
||||
*
|
||||
* @param class-string<Section> $class
|
||||
* @param array<string, mixed>|null $state
|
||||
*/
|
||||
private function blockLabel(string $class, ?array $state): string
|
||||
{
|
||||
if ($state === null) {
|
||||
return $class::label();
|
||||
}
|
||||
|
||||
$appearances = array_filter((array) ($state['appearances'] ?? []));
|
||||
$only = $appearances === [] ? null : 'nur: '.Appearance::query()->whereKey($appearances)->pluck('name')->implode(', ');
|
||||
|
||||
return collect([$class::label(), $class::summary($state), $only])->filter()->implode(' · ');
|
||||
}
|
||||
}
|
||||
@@ -38,12 +38,17 @@ public static function schema(): array
|
||||
];
|
||||
}
|
||||
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return ['photo_id' => ['label' => 'Hintergrundfoto', 'type' => self::SLOT_SINGLE]];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
return [
|
||||
'title' => $theme->text('cta.title', $data['title'] ?? null),
|
||||
'text' => $theme->text('cta.text', $data['text'] ?? null),
|
||||
'photo' => isset($data['photo_id']) ? Photo::find($data['photo_id']) : null,
|
||||
'photo' => $this->seasonalPhoto($theme, $data, 'photo_id') ?? (isset($data['photo_id']) ? Photo::find($data['photo_id']) : null),
|
||||
'buttonLabel' => $data['button_label'] ?? 'Belegung & Preise',
|
||||
'buttonUrl' => $this->pageUrl($data['button_page'] ?? null) ?? route('booking.create'),
|
||||
];
|
||||
|
||||
@@ -37,16 +37,21 @@ public static function schema(): array
|
||||
];
|
||||
}
|
||||
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return ['photo_ids' => ['label' => 'Galerie', 'type' => self::SLOT_COLLECTION]];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
$category = PhotoCategory::tryFrom($data['category'] ?? '');
|
||||
|
||||
return [
|
||||
'heading' => $data['heading'] ?? null,
|
||||
'photos' => Photo::query()->published()->with('media')
|
||||
'photos' => $this->withSeasonalPhotos($theme, $data, 'photo_ids', Photo::query()->published()->with('media')
|
||||
->when($category, fn ($query) => $query->where('category', $category))
|
||||
->when(filled($data['limit'] ?? null), fn ($query) => $query->limit((int) $data['limit']))
|
||||
->get(),
|
||||
->get()),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Themes\Sections;
|
||||
|
||||
use App\Models\Photo;
|
||||
use App\Pricing\OfferShowcase;
|
||||
use App\Themes\Theme;
|
||||
use Filament\Forms\Components\Textarea;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
@@ -36,18 +37,31 @@ public static function schema(): array
|
||||
Textarea::make('text')->label('Text')->rows(2)->maxLength(400),
|
||||
static::photoSelect('photo_id', 'Foto (wenn das Erscheinungsbild keins vorgibt)'),
|
||||
Toggle::make('show_search')->label('Verfügbarkeitssuche anzeigen')->default(true),
|
||||
Toggle::make('show_offer')
|
||||
->label('Hervorgehobenes Sonderangebot im Titelbereich zeigen')
|
||||
->helperText('Das wichtigste als „hervorgehoben“ markierte Angebot, sofern gerade eins gilt.')
|
||||
->default(true),
|
||||
];
|
||||
}
|
||||
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return ['photo_id' => ['label' => 'Foto', 'type' => self::SLOT_SINGLE]];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
$fallback = isset($data['photo_id']) ? Photo::find($data['photo_id']) : Photo::query()->published()->first();
|
||||
$featuredOffer = ($data['show_offer'] ?? true) && $theme->property()
|
||||
? app(OfferShowcase::class)->current($theme->property(), limit: 1, featuredOnly: true)->first()
|
||||
: null;
|
||||
|
||||
return [
|
||||
'eyebrow' => $theme->text('hero.eyebrow', $data['eyebrow'] ?? null),
|
||||
'title' => $theme->text('hero.title', $data['title'] ?? $theme->site->name),
|
||||
'text' => $theme->text('hero.text', $data['text'] ?? null),
|
||||
'photo' => $theme->heroPhoto($fallback),
|
||||
'photo' => $this->seasonalPhoto($theme, $data, 'photo_id') ?? $theme->heroPhoto($fallback),
|
||||
'featuredOffer' => $featuredOffer,
|
||||
'showSearch' => (bool) ($data['show_search'] ?? true),
|
||||
'property' => $theme->property(),
|
||||
];
|
||||
|
||||
@@ -39,6 +39,11 @@ public static function schema(): array
|
||||
];
|
||||
}
|
||||
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return ['photo_ids' => ['label' => 'Bilder der Umgebung', 'type' => self::SLOT_COLLECTION]];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
$address = $theme->property()?->address;
|
||||
@@ -50,7 +55,7 @@ public function data(Theme $theme, array $data): array
|
||||
'address' => $address,
|
||||
'mapUrl' => $address ? 'https://www.openstreetmap.org/search?query='.rawurlencode($address) : null,
|
||||
'photos' => ($data['show_photos'] ?? true)
|
||||
? Photo::query()->published()->with('media')->where('category', PhotoCategory::Area)->limit(6)->get()
|
||||
? $this->withSeasonalPhotos($theme, $data, 'photo_ids', Photo::query()->published()->with('media')->where('category', PhotoCategory::Area)->limit(6)->get())
|
||||
: collect(),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -2,15 +2,24 @@
|
||||
|
||||
namespace App\Themes\Sections;
|
||||
|
||||
use App\Models\SpecialOffer;
|
||||
use App\Pricing\OfferShowcase;
|
||||
use App\Themes\Theme;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
|
||||
/**
|
||||
* Public special offers (active, promoted, without code); the appearance's featured offer comes first.
|
||||
* The offers OfferShowcase advertises right now (independent of the appearance), shown side by side,
|
||||
* as a list or one after another (rotating). The section disappears when there is no current offer.
|
||||
*/
|
||||
class OffersSection extends Section
|
||||
{
|
||||
public const DISPLAYS = [
|
||||
'grid' => 'Nebeneinander (Kacheln)',
|
||||
'list' => 'Untereinander (Liste)',
|
||||
'rotating' => 'Rollierend (eins nach dem anderen)',
|
||||
];
|
||||
|
||||
public static function key(): string
|
||||
{
|
||||
return 'offers';
|
||||
@@ -30,27 +39,22 @@ public static function schema(): array
|
||||
{
|
||||
return [
|
||||
TextInput::make('heading')->label('Überschrift')->default('Aktuelle Angebote')->maxLength(120),
|
||||
Radio::make('display')->label('Darstellung, wenn mehrere Angebote gelten')->options(self::DISPLAYS)->default('grid'),
|
||||
TextInput::make('limit')->label('Höchstens anzeigen')->integer()->minValue(1)->maxValue(12)->default(6),
|
||||
Toggle::make('featured_only')->label('Nur hervorgehobene Angebote')->default(false),
|
||||
];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
$offers = $theme->property()?->specialOffers()
|
||||
->active()
|
||||
->where('is_public', true)
|
||||
->whereNull('code')
|
||||
->where(fn ($query) => $query->whereNull('bookable_until')->orWhere('bookable_until', '>=', now()))
|
||||
->get() ?? collect();
|
||||
|
||||
$featured = $theme->appearance?->featuredOffer;
|
||||
if ($featured) {
|
||||
$offers = $offers->reject(fn (SpecialOffer $offer): bool => $offer->is($featured))->prepend($featured);
|
||||
}
|
||||
$property = $theme->property();
|
||||
|
||||
return [
|
||||
'heading' => $data['heading'] ?? null,
|
||||
'offers' => $offers,
|
||||
'featuredId' => $featured?->id,
|
||||
'display' => array_key_exists($data['display'] ?? '', self::DISPLAYS) ? $data['display'] : 'grid',
|
||||
'offers' => $property
|
||||
? app(OfferShowcase::class)->current($property, limit: (int) ($data['limit'] ?? 6) ?: 6, featuredOnly: (bool) ($data['featured_only'] ?? false))
|
||||
: collect(),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Themes\Sections;
|
||||
|
||||
use App\Filament\Forms\Components\PhotoSelect;
|
||||
use App\Models\Page;
|
||||
use App\Models\Photo;
|
||||
use App\Themes\Theme;
|
||||
@@ -17,6 +18,15 @@
|
||||
*/
|
||||
abstract class Section
|
||||
{
|
||||
/** One photo (field holds a photo id). */
|
||||
public const SLOT_SINGLE = 'single';
|
||||
|
||||
/** Several chosen photos (field holds a list of ids). */
|
||||
public const SLOT_MULTIPLE = 'multiple';
|
||||
|
||||
/** Photos picked automatically (e.g. by category); an appearance may replace or precede them. */
|
||||
public const SLOT_COLLECTION = 'collection';
|
||||
|
||||
abstract public static function key(): string;
|
||||
|
||||
abstract public static function label(): string;
|
||||
@@ -39,6 +49,28 @@ public static function schema(): array
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Photo places an appearance can fill with seasonal photos ("Bilder je Baustein").
|
||||
*
|
||||
* @return array<string, array{label: string, type: string, max?: int}>
|
||||
*/
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Short text identifying a placed section in admin lists, e.g. its heading.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
public static function summary(array $data): ?string
|
||||
{
|
||||
$text = $data['heading'] ?? $data['title'] ?? null;
|
||||
|
||||
return filled($text) ? str(strip_tags((string) $text))->replace('*', '')->limit(50)->toString() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Variables for the view.
|
||||
*
|
||||
@@ -75,6 +107,55 @@ protected function photos(?array $ids): Collection
|
||||
return new Collection(array_values(array_filter(array_map(fn ($id) => $photos->get((int) $id), $ids))));
|
||||
}
|
||||
|
||||
/**
|
||||
* The seasonal photo the active appearance sets for a single slot of this placed section.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
protected function seasonalPhoto(Theme $theme, array $data, string $slot): ?Photo
|
||||
{
|
||||
return $this->seasonalPhotos($theme, $data, $slot)?->first();
|
||||
}
|
||||
|
||||
/**
|
||||
* The seasonal photos the active appearance sets for a slot of this placed section, null if none.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
* @return Collection<int, Photo>|null
|
||||
*/
|
||||
protected function seasonalPhotos(Theme $theme, array $data, string $slot): ?Collection
|
||||
{
|
||||
$ids = $theme->sectionPhotoIds($data['id'] ?? null, $slot);
|
||||
if ($ids === []) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$photos = $this->photos($ids);
|
||||
|
||||
return $photos->isEmpty() ? null : $photos;
|
||||
}
|
||||
|
||||
/**
|
||||
* Photos of a collection slot: the automatic photos, replaced or preceded by the seasonal ones.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
* @param Collection<int, Photo> $automatic
|
||||
* @return Collection<int, Photo>
|
||||
*/
|
||||
protected function withSeasonalPhotos(Theme $theme, array $data, string $slot, Collection $automatic): Collection
|
||||
{
|
||||
$seasonal = $this->seasonalPhotos($theme, $data, $slot);
|
||||
if ($seasonal === null) {
|
||||
return $automatic;
|
||||
}
|
||||
|
||||
if ($theme->sectionPhotoMode($data['id'] ?? null) === 'prepend') {
|
||||
return $seasonal->merge($automatic)->unique('id')->values();
|
||||
}
|
||||
|
||||
return $seasonal;
|
||||
}
|
||||
|
||||
protected function pageUrl(?string $slug): ?string
|
||||
{
|
||||
if (blank($slug)) {
|
||||
@@ -85,15 +166,13 @@ protected function pageUrl(?string $slug): ?string
|
||||
}
|
||||
|
||||
/**
|
||||
* Select field listing the website photos.
|
||||
* Select field listing the website photos with thumbnails.
|
||||
*/
|
||||
protected static function photoSelect(string $name, string $label, bool $multiple = false): Select
|
||||
{
|
||||
return Select::make($name)
|
||||
return PhotoSelect::make($name)
|
||||
->label($label)
|
||||
->options(fn (): array => Photo::query()->orderBy('category')->orderBy('sort_order')->pluck('alt_text', 'id')->all())
|
||||
->multiple($multiple)
|
||||
->searchable();
|
||||
->multiple($multiple);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -40,13 +40,18 @@ public static function schema(): array
|
||||
];
|
||||
}
|
||||
|
||||
public static function photoSlots(): array
|
||||
{
|
||||
return ['photo_ids' => ['label' => 'Bilder', 'type' => self::SLOT_MULTIPLE, 'max' => 3]];
|
||||
}
|
||||
|
||||
public function data(Theme $theme, array $data): array
|
||||
{
|
||||
return [
|
||||
'eyebrow' => $data['eyebrow'] ?? null,
|
||||
'heading' => $data['heading'] ?? '',
|
||||
'text' => $this->html($data['text'] ?? null),
|
||||
'photos' => $this->photos($data['photo_ids'] ?? []),
|
||||
'photos' => $this->seasonalPhotos($theme, $data, 'photo_ids') ?? $this->photos($data['photo_ids'] ?? []),
|
||||
'imagePosition' => $data['image_position'] ?? 'right',
|
||||
'linkLabel' => $data['link_label'] ?? null,
|
||||
'linkUrl' => $this->pageUrl($data['link_page'] ?? null),
|
||||
|
||||
@@ -34,6 +34,7 @@ public function activate(): self
|
||||
{
|
||||
$paths = array_map(fn (ThemeManifest $theme): string => $theme->viewsPath(), $this->chain());
|
||||
View::replaceNamespace('theme', $paths);
|
||||
View::getFinder()->flush();
|
||||
|
||||
return $this;
|
||||
}
|
||||
@@ -96,6 +97,32 @@ public function heroPhoto(?Photo $fallback = null): ?Photo
|
||||
return $this->appearance?->heroPhoto ?? $fallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Photo ids the active appearance sets for a slot of a placed section ("Bilder je Baustein").
|
||||
*
|
||||
* @return list<int>
|
||||
*/
|
||||
public function sectionPhotoIds(?string $sectionId, string $slot): array
|
||||
{
|
||||
if (blank($sectionId) || $this->appearance === null) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$ids = $this->appearance->section_photos[$sectionId][$slot] ?? null;
|
||||
|
||||
return array_values(array_map('intval', array_filter((array) $ids)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether seasonal photos replace the automatic photos of a section ('replace') or come first ('prepend').
|
||||
*/
|
||||
public function sectionPhotoMode(?string $sectionId): string
|
||||
{
|
||||
$mode = $sectionId ? ($this->appearance?->section_photos[$sectionId]['mode'] ?? null) : null;
|
||||
|
||||
return $mode === 'prepend' ? 'prepend' : 'replace';
|
||||
}
|
||||
|
||||
public function appearanceKey(): string
|
||||
{
|
||||
return $this->appearance ? str($this->appearance->name)->slug()->toString() : 'standard';
|
||||
|
||||
@@ -0,0 +1,334 @@
|
||||
<?php
|
||||
|
||||
namespace App\Themes;
|
||||
|
||||
use App\Models\Appearance;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Symfony\Component\Finder\Finder;
|
||||
|
||||
/**
|
||||
* Checks a theme against the theme contract (docs/THEME-ERSTELLUNG.md) so a theme built elsewhere – e.g. by a
|
||||
* design session – can be verified before it is selected: manifest, inheritance, build entry points, required
|
||||
* markup of overridden views, token-only colours, no external resources and WCAG contrast of the colour tokens
|
||||
* (theme defaults and every appearance).
|
||||
*/
|
||||
class ThemeChecker
|
||||
{
|
||||
/** Pairs [text token, background token] that must reach WCAG AA for normal text (4.5:1). */
|
||||
public const CONTRAST_PAIRS = [
|
||||
['ink', 'ground'], ['muted', 'ground'], ['accent', 'ground'],
|
||||
['ink', 'surface'], ['muted', 'surface'], ['accent', 'surface'],
|
||||
['accent-ink', 'accent'], ['band-ink', 'band'], ['band-muted', 'band'], ['banner-ink', 'banner'],
|
||||
];
|
||||
|
||||
public const MIN_CONTRAST = 4.5;
|
||||
|
||||
/** View files a theme may provide besides sections/<key> (custom partials are allowed in partials/). */
|
||||
private const KNOWN_VIEWS = ['layouts/app', 'page', 'partials/banner', 'partials/header', 'partials/footer', 'partials/image', 'partials/mobile-booking-bar'];
|
||||
|
||||
/**
|
||||
* Markup an overridden view must keep, with the reason shown when it is missing.
|
||||
*
|
||||
* @var array<string, array<string, string>>
|
||||
*/
|
||||
private const REQUIRED_MARKUP = [
|
||||
'layouts/app' => [
|
||||
"@yield('content')" => 'Seiteninhalt fehlt (@yield(\'content\')).',
|
||||
"@stack('head')" => 'Bausteine können nichts in <head> ergänzen (JSON-LD) – @stack(\'head\') fehlt.',
|
||||
'$theme->assets()' => 'CSS/JS werden nicht geladen – @vite($theme->assets()) fehlt.',
|
||||
'$theme->cssVariables()' => 'Farb-Tokens werden nicht ausgegeben – $theme->cssVariables() fehlt.',
|
||||
'@livewireStyles' => 'Buchungsformular braucht @livewireStyles.',
|
||||
'@livewireScripts' => 'Buchungsformular braucht @livewireScripts.',
|
||||
'noindex' => 'Vorschau und Testbetrieb müssen noindex setzen.',
|
||||
'id="lightbox"' => 'Galerie-Lightbox fehlt (<dialog id="lightbox"> mit img, [data-caption], [data-close]).',
|
||||
'data-appearance' => 'data-appearance am <html> fehlt (saisonale CSS-Regeln).',
|
||||
],
|
||||
'page' => [
|
||||
'$sections' => 'Die Bausteine der Seite werden nicht ausgegeben.',
|
||||
'$structuredData' => 'JSON-LD der Startseite fehlt ($structuredData).',
|
||||
],
|
||||
'partials/header' => ["menu('main')" => 'Hauptmenü fehlt ($theme->menu(\'main\')).'],
|
||||
'partials/footer' => ["menu('footer')" => 'Fußmenü (Impressum/Datenschutz) fehlt ($theme->menu(\'footer\')).'],
|
||||
'sections/hero' => [
|
||||
'name="anreise"' => 'Verfügbarkeitssuche: Feld name="anreise" fehlt.',
|
||||
'name="abreise"' => 'Verfügbarkeitssuche: Feld name="abreise" fehlt.',
|
||||
"route('booking.create')" => 'Verfügbarkeitssuche muss an route(\'booking.create\') senden.',
|
||||
],
|
||||
'sections/booking' => ['livewire:booking-request' => 'Kalender/Anfrage fehlt (<livewire:booking-request :property="$property" />).'],
|
||||
'sections/gallery' => ['data-lightbox' => 'Galerie-Links brauchen data-lightbox und data-alt.'],
|
||||
'sections/faq' => ['application/ld+json' => 'FAQ-JSON-LD fehlt.'],
|
||||
'sections/reviews' => ['nur Gäste' => 'Pflichthinweis zur Echtheit der Bewertungen (§ 5b UWG) fehlt.'],
|
||||
'sections/offers' => ['$display' => 'Darstellung (nebeneinander/Liste/rollierend) wird nicht berücksichtigt.'],
|
||||
];
|
||||
|
||||
public function __construct(private ThemeRegistry $registry) {}
|
||||
|
||||
/**
|
||||
* @return array{errors: list<string>, warnings: list<string>}
|
||||
*/
|
||||
public function check(ThemeManifest $theme): array
|
||||
{
|
||||
$errors = [];
|
||||
$warnings = [];
|
||||
|
||||
$this->checkManifest($theme, $errors, $warnings);
|
||||
$this->checkAssets($theme, $errors, $warnings);
|
||||
$this->checkViews($theme, $errors, $warnings);
|
||||
$this->checkContrast($theme, $errors, $warnings);
|
||||
|
||||
return ['errors' => $errors, 'warnings' => $warnings];
|
||||
}
|
||||
|
||||
/**
|
||||
* WCAG contrast ratio of two hex colours (1 … 21).
|
||||
*/
|
||||
public static function contrast(string $foreground, string $background): float
|
||||
{
|
||||
$luminance = function (string $hex): float {
|
||||
$hex = ltrim($hex, '#');
|
||||
if (strlen($hex) === 3) {
|
||||
$hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
|
||||
}
|
||||
$channels = array_map(function (string $pair): float {
|
||||
$value = hexdec($pair) / 255;
|
||||
|
||||
return $value <= 0.03928 ? $value / 12.92 : (($value + 0.055) / 1.055) ** 2.4;
|
||||
}, str_split(substr($hex, 0, 6), 2));
|
||||
|
||||
return 0.2126 * $channels[0] + 0.7152 * $channels[1] + 0.0722 * $channels[2];
|
||||
};
|
||||
|
||||
[$lighter, $darker] = [max($luminance($foreground), $luminance($background)), min($luminance($foreground), $luminance($background))];
|
||||
|
||||
return round(($lighter + 0.05) / ($darker + 0.05), 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $errors
|
||||
* @param list<string> $warnings
|
||||
*/
|
||||
private function checkManifest(ThemeManifest $theme, array &$errors, array &$warnings): void
|
||||
{
|
||||
if (! preg_match('/^[a-z0-9]+(-[a-z0-9]+)*$/', $theme->key)) {
|
||||
$errors[] = "Key „{$theme->key}“: nur Kleinbuchstaben, Ziffern und Bindestriche.";
|
||||
}
|
||||
if (basename($theme->path) !== $theme->key) {
|
||||
$errors[] = 'Ordnername ('.basename($theme->path).") und key ({$theme->key}) müssen gleich sein – sonst baut Vite die Assets nicht.";
|
||||
}
|
||||
if (! preg_match('/^\d+\.\d+\.\d+$/', $theme->version)) {
|
||||
$errors[] = "version „{$theme->version}“ ist keine Versionsnummer (z. B. 0.1.0).";
|
||||
}
|
||||
if (blank($theme->description)) {
|
||||
$warnings[] = 'description fehlt – sie wird im Admin bei der Theme-Auswahl angezeigt.';
|
||||
}
|
||||
if ($theme->parent !== null) {
|
||||
if ($theme->parent === $theme->key) {
|
||||
$errors[] = 'parent verweist auf das Theme selbst.';
|
||||
} elseif (! isset($this->registry->all()[$theme->parent])) {
|
||||
$errors[] = "Eltern-Theme „{$theme->parent}“ ist nicht installiert.";
|
||||
}
|
||||
}
|
||||
foreach ($theme->tokens as $key => $token) {
|
||||
if (! is_array($token) || blank($token['label'] ?? null) || ! preg_match('/^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/', (string) ($token['default'] ?? ''))) {
|
||||
$errors[] = "Token „{$key}“ braucht label und default als Hex-Farbe (#RRGGBB).";
|
||||
}
|
||||
}
|
||||
$missing = array_diff(array_keys($this->registry->tokens(config('themes.base'))), array_keys($this->registry->tokens($theme->key)));
|
||||
if ($missing !== []) {
|
||||
$errors[] = 'Basis-Tokens fehlen in der Theme-Kette: '.implode(', ', $missing).' (die Basis-Vorlagen und Formulare nutzen sie).';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $errors
|
||||
* @param list<string> $warnings
|
||||
*/
|
||||
private function checkAssets(ThemeManifest $theme, array &$errors, array &$warnings): void
|
||||
{
|
||||
$css = $theme->assets['css'] ?? null;
|
||||
$js = $theme->assets['js'] ?? null;
|
||||
if ($css === null && $js === null) {
|
||||
if (is_dir($theme->viewsPath()) && Finder::create()->files()->name('*.blade.php')->in($theme->viewsPath())->hasResults()) {
|
||||
$errors[] = 'Eigene Vorlagen ohne eigene Assets: deren Tailwind-Klassen werden nicht gebaut – theme.css/theme.js anlegen (themes:make macht das) und in assets eintragen.';
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$folder = str_replace('\\', '/', ltrim(substr($theme->path, strlen(base_path())), '/\\'));
|
||||
if (! str_starts_with($folder, 'resources/themes/')) {
|
||||
$warnings[] = 'Theme liegt nicht unter resources/themes – vite.config.js baut seine Assets dort nicht automatisch.';
|
||||
}
|
||||
|
||||
foreach (['css' => 'theme.css', 'js' => 'theme.js'] as $type => $file) {
|
||||
$expected = "{$folder}/{$file}";
|
||||
$declared = $theme->assets[$type] ?? null;
|
||||
if ($declared === null) {
|
||||
$errors[] = "assets.{$type} fehlt: Ein Theme mit eigenen Assets ersetzt CSS und JS des Eltern-Themes vollständig – {$file} anlegen (darf das Eltern-Theme importieren).";
|
||||
} elseif ($declared !== $expected) {
|
||||
$errors[] = "assets.{$type} muss „{$expected}“ heißen – nur diese Datei baut Vite (vite.config.js).";
|
||||
} elseif (! is_file(base_path($declared))) {
|
||||
$errors[] = "{$declared} fehlt.";
|
||||
}
|
||||
}
|
||||
|
||||
$cssFile = $css !== null ? base_path($css) : null;
|
||||
if ($cssFile !== null && is_file($cssFile)) {
|
||||
$content = (string) file_get_contents($cssFile);
|
||||
$resolved = $this->withLocalImports($cssFile);
|
||||
|
||||
if (preg_match("~@import\s+['\"]\.\./[a-z0-9-]+/theme\.css['\"]~", $content)) {
|
||||
$warnings[] = 'theme.css importiert das theme.css eines anderen Themes – besser dessen theme-base.css importieren und die Quellen selbst angeben (siehe Anleitung).';
|
||||
}
|
||||
if (! str_contains($content, "@import 'tailwindcss'") && ! str_contains($content, '@import "tailwindcss"')) {
|
||||
$errors[] = "theme.css muss mit @import 'tailwindcss'; beginnen.";
|
||||
}
|
||||
foreach ($this->registry->chain($theme->key) as $ancestor) {
|
||||
$source = ThemeManifest::relativePath($theme->path, $ancestor->viewsPath());
|
||||
if ($ancestor->key !== $theme->key && ! str_contains($resolved, $source)) {
|
||||
$errors[] = "theme.css scannt die Vorlagen von „{$ancestor->key}“ nicht (@source '{$source}') – geerbte Bausteine wären ungestylt.";
|
||||
}
|
||||
}
|
||||
if (is_dir($theme->viewsPath()) && ! preg_match("~@source\s+['\"]\./views['\"]~", $content)) {
|
||||
$errors[] = "theme.css scannt die eigenen Vorlagen nicht (@source './views').";
|
||||
}
|
||||
if (! str_contains($resolved, 'views/livewire')) {
|
||||
$errors[] = "theme.css scannt die Buchungsformulare nicht (@source '".ThemeManifest::relativePath($theme->path, resource_path('views/livewire'))."').";
|
||||
}
|
||||
foreach (array_keys($this->registry->tokens($theme->key)) as $token) {
|
||||
if (! str_contains($resolved, "--color-{$token}:")) {
|
||||
$errors[] = "Token „{$token}“ ist nicht gemappt (@theme inline { --color-{$token}: var(--{$token}); }) – Klassen wie bg-{$token} fehlen.";
|
||||
}
|
||||
}
|
||||
$this->scanExternal($resolved, 'theme.css', $errors);
|
||||
}
|
||||
|
||||
$jsFile = $js !== null ? base_path($js) : null;
|
||||
if ($jsFile !== null && is_file($jsFile)) {
|
||||
$content = (string) file_get_contents($jsFile);
|
||||
if (! preg_match("~import\s+['\"]\.\./[a-z0-9-]+/theme\.js['\"]~", $content) && ! str_contains($content, 'data-rotator')) {
|
||||
$warnings[] = "theme.js importiert kein anderes Theme (import '../ostsee-licht/theme.js') – Lightbox, Suche und rollierende Angebote müssen dann selbst umgesetzt sein.";
|
||||
}
|
||||
$this->scanExternal($content, 'theme.js', $errors);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $errors
|
||||
* @param list<string> $warnings
|
||||
*/
|
||||
private function checkViews(ThemeManifest $theme, array &$errors, array &$warnings): void
|
||||
{
|
||||
if (! is_dir($theme->viewsPath())) {
|
||||
return;
|
||||
}
|
||||
|
||||
$sections = array_keys(app(SectionRegistry::class)->all());
|
||||
foreach (Finder::create()->files()->in($theme->viewsPath()) as $file) {
|
||||
$name = str_replace('\\', '/', $file->getRelativePathname());
|
||||
if (! str_ends_with($name, '.blade.php')) {
|
||||
if ($name !== '.gitkeep') {
|
||||
$warnings[] = "views/{$name}: keine Blade-Datei (wird ignoriert).";
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$view = substr($name, 0, -strlen('.blade.php'));
|
||||
$isSection = str_starts_with($view, 'sections/');
|
||||
if ($isSection && ! in_array(substr($view, 9), $sections, true)) {
|
||||
$errors[] = "views/{$name}: unbekannter Baustein (erlaubt: ".implode(', ', $sections).').';
|
||||
} elseif (! $isSection && ! in_array($view, self::KNOWN_VIEWS, true) && ! str_starts_with($view, 'partials/')) {
|
||||
$warnings[] = "views/{$name}: wird vom System nicht aufgerufen (nur eigene Includes).";
|
||||
}
|
||||
|
||||
$content = $file->getContents();
|
||||
foreach (self::REQUIRED_MARKUP[$view] ?? [] as $needle => $reason) {
|
||||
if (str_contains($content, $needle)) {
|
||||
continue;
|
||||
}
|
||||
if ($view === 'sections/offers') {
|
||||
$warnings[] = "views/{$name}: {$reason}";
|
||||
} else {
|
||||
$errors[] = "views/{$name}: {$reason}";
|
||||
}
|
||||
}
|
||||
if ($isSection && ! str_contains($content, '$sectionId')) {
|
||||
$warnings[] = "views/{$name}: \$sectionId nicht genutzt (eindeutige IDs für aria-labelledby).";
|
||||
}
|
||||
if (preg_match('/\b(?:bg|text|border|ring|fill|stroke|from|via|to|outline|decoration|divide|shadow)-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|[1-9]00|950)\b|-\[(?:#|rgb)/', $content, $match)) {
|
||||
$errors[] = "views/{$name}: feste Farbe „{$match[0]}“ – nur Token-Klassen verwenden (bg-accent, text-muted …), sonst wirken Erscheinungsbilder nicht.";
|
||||
}
|
||||
if (preg_match('/style="[^"]*(?:#[0-9a-fA-F]{3,8}\b|rgba?\()/', $content)) {
|
||||
$errors[] = "views/{$name}: feste Farbe im style-Attribut – var(--token) verwenden.";
|
||||
}
|
||||
if (str_contains($content, '<iframe')) {
|
||||
$warnings[] = "views/{$name}: <iframe> eingebettet – Drittanbieter brauchen ein Einwilligungskonzept (DSGVO).";
|
||||
}
|
||||
$this->scanExternal($content, "views/{$name}", $errors);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $errors
|
||||
* @param list<string> $warnings
|
||||
*/
|
||||
private function checkContrast(ThemeManifest $theme, array &$errors, array &$warnings): void
|
||||
{
|
||||
$defaults = array_map(fn (array $token): string => (string) ($token['default'] ?? ''), $this->registry->tokens($theme->key));
|
||||
$variants = ['Theme-Standard' => $defaults];
|
||||
|
||||
if (Schema::hasTable('appearances')) {
|
||||
foreach (Appearance::query()->where('is_active', true)->get() as $appearance) {
|
||||
$variants["Erscheinungsbild „{$appearance->name}“"] = [...$defaults, ...array_filter($appearance->tokens ?? [], fn ($value): bool => is_string($value) && preg_match('/^#[0-9a-fA-F]{3,8}$/', $value) === 1)];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($variants as $label => $tokens) {
|
||||
foreach (self::CONTRAST_PAIRS as [$text, $background]) {
|
||||
if (! isset($tokens[$text], $tokens[$background]) || ! preg_match('/^#/', $tokens[$text]) || ! preg_match('/^#/', $tokens[$background])) {
|
||||
continue;
|
||||
}
|
||||
$ratio = self::contrast($tokens[$text], $tokens[$background]);
|
||||
if ($ratio < self::MIN_CONTRAST) {
|
||||
$message = "{$label}: Kontrast {$text} auf {$background} nur {$ratio}:1 (mind. ".self::MIN_CONTRAST.':1).';
|
||||
if ($label === 'Theme-Standard') {
|
||||
$errors[] = $message;
|
||||
} else {
|
||||
$warnings[] = $message;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The CSS file with its relative @imports (theme-base.css etc.) inlined, for checks across files.
|
||||
*/
|
||||
private function withLocalImports(string $file, int $depth = 0): string
|
||||
{
|
||||
$content = (string) file_get_contents($file);
|
||||
if ($depth > 3) {
|
||||
return $content;
|
||||
}
|
||||
|
||||
return preg_replace_callback("~@import\s+['\"](\.{1,2}/[^'\"]+\.css)['\"]\s*;~", function (array $match) use ($file, $depth): string {
|
||||
$imported = dirname($file).DIRECTORY_SEPARATOR.$match[1];
|
||||
|
||||
return is_file($imported) ? $this->withLocalImports($imported, $depth + 1) : $match[0];
|
||||
}, $content) ?? $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $errors
|
||||
*/
|
||||
private function scanExternal(string $content, string $file, array &$errors): void
|
||||
{
|
||||
if (preg_match('~https?://(?:fonts\.googleapis|fonts\.gstatic|use\.typekit|[a-z0-9.-]*cdn[a-z0-9.-]*|unpkg\.com|cdnjs)[^\s"\')]*~i', $content, $match)) {
|
||||
$errors[] = "{$file}: externe Quelle „{$match[0]}“ – Schriften und Skripte selbst hosten (DSGVO, kein Cookie-Banner).";
|
||||
}
|
||||
if (preg_match('~<script[^>]+src=["\']https?://~i', $content)) {
|
||||
$errors[] = "{$file}: externes Skript – nicht erlaubt.";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,22 +18,28 @@ public function __construct(private ThemeRegistry $registry) {}
|
||||
public function forRequest(Request $request): Theme
|
||||
{
|
||||
$site = $this->site($request->getHost());
|
||||
$isSigned = ($request->query('vorschau') || $request->query('theme')) && $request->hasValidSignature();
|
||||
|
||||
$preview = null;
|
||||
if ($request->query('vorschau') && $request->hasValidSignature()) {
|
||||
$preview = $site->appearances()->find($request->query('vorschau'));
|
||||
$preview = $isSigned && $request->query('vorschau') ? $site->appearances()->find($request->query('vorschau')) : null;
|
||||
|
||||
// Theme preview: the site is shown with another installed theme without changing it (not saved).
|
||||
$previewTheme = $isSigned ? (string) $request->query('theme') : '';
|
||||
if ($previewTheme !== '' && isset($this->registry->all()[$previewTheme])) {
|
||||
$site = (clone $site)->setAttribute('theme', $previewTheme);
|
||||
|
||||
return $this->forSite($site, $preview, isPreview: true);
|
||||
}
|
||||
|
||||
return $this->forSite($site, $preview);
|
||||
}
|
||||
|
||||
public function forSite(Site $site, ?Appearance $preview = null): Theme
|
||||
public function forSite(Site $site, ?Appearance $preview = null, bool $isPreview = false): Theme
|
||||
{
|
||||
return new Theme(
|
||||
$this->registry,
|
||||
$site,
|
||||
$preview ?? ($site->exists ? $site->appearanceOn(today()) : null),
|
||||
isPreview: $preview !== null,
|
||||
isPreview: $isPreview || $preview !== null,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -48,4 +48,22 @@ public function viewsPath(): string
|
||||
{
|
||||
return $this->path.DIRECTORY_SEPARATOR.'views';
|
||||
}
|
||||
|
||||
/**
|
||||
* Relative path with forward slashes from one directory to another, as used in CSS @import/@source
|
||||
* and JS imports, e.g. "../ostsee-licht/views".
|
||||
*/
|
||||
public static function relativePath(string $fromDirectory, string $to): string
|
||||
{
|
||||
$normalise = fn (string $path): array => array_values(array_filter(explode('/', str_replace('\\', '/', realpath($path) ?: $path)), fn (string $part): bool => $part !== ''));
|
||||
$from = $normalise($fromDirectory);
|
||||
$target = $normalise($to);
|
||||
|
||||
while ($from !== [] && $target !== [] && strcasecmp($from[0], $target[0]) === 0) {
|
||||
array_shift($from);
|
||||
array_shift($target);
|
||||
}
|
||||
|
||||
return implode('/', [...array_fill(0, count($from), '..'), ...$target]) ?: '.';
|
||||
}
|
||||
}
|
||||
@@ -57,6 +57,21 @@ public function chain(string $key): array
|
||||
return array_values($chain);
|
||||
}
|
||||
|
||||
/**
|
||||
* Colour tokens of a theme including the inherited ones (base first, the theme's own definitions win).
|
||||
*
|
||||
* @return array<string, array{label: string, default: string}>
|
||||
*/
|
||||
public function tokens(string $key): array
|
||||
{
|
||||
$tokens = [];
|
||||
foreach (array_reverse($this->chain($key)) as $theme) {
|
||||
$tokens = [...$tokens, ...$theme->tokens];
|
||||
}
|
||||
|
||||
return $tokens;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
<?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('special_offers', function (Blueprint $table) {
|
||||
$table->string('kind', 20)->default('rule')->after('name');
|
||||
$table->unsignedSmallInteger('max_gap_nights')->nullable()->after('max_nights');
|
||||
$table->boolean('waives_min_stay')->default(false)->after('max_gap_nights');
|
||||
$table->integer('priority')->default(0)->after('is_combinable');
|
||||
$table->boolean('is_featured')->default(false)->after('priority');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('special_offers', function (Blueprint $table) {
|
||||
$table->dropColumn(['kind', 'max_gap_nights', 'waives_min_stay', 'priority', 'is_featured']);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Offers are advertised by their own rules now (OfferShowcase) instead of per appearance;
|
||||
* appearances get photos per section instead.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('appearances', function (Blueprint $table) {
|
||||
$table->dropConstrainedForeignId('featured_offer_id');
|
||||
$table->json('section_photos')->nullable()->after('hero_photo_id');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('appearances', function (Blueprint $table) {
|
||||
$table->dropColumn('section_photos');
|
||||
$table->foreignId('featured_offer_id')->nullable()->constrained('special_offers')->nullOnDelete();
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Page;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Existing pages: every placed section gets its stable id (see Page::assignSectionIds).
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
DB::table('pages')->orderBy('id')->each(function (object $page): void {
|
||||
$sections = json_decode((string) $page->sections, true);
|
||||
if (! is_array($sections)) {
|
||||
return;
|
||||
}
|
||||
|
||||
DB::table('pages')->where('id', $page->id)->update(['sections' => json_encode(Page::assignSectionIds($sections))]);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Ids are harmless when rolling back; nothing to undo.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
//
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,222 @@
|
||||
# Datenschutz- und Datenfluss-Audit – Ferienwohnung Stommer
|
||||
|
||||
Stand: 22.10.2026 · Art: **Read-only-Codeaudit** (Repository-Stand `main` + lokale, noch nicht committete Änderungen) · Verantwortliche: Brigitte Stommer
|
||||
|
||||
> **Hinweis zur Verwendung:** Dies ist eine technische Bestandsaufnahme, keine Rechtsberatung. Alle Rechtsgrundlagen sind *Prüfannahmen*. Vor Veröffentlichung der Datenschutzerklärung ist eine juristische Prüfung (ggf. Datenschutzbeauftragte/r bzw. Rechtsberatung) erforderlich. Der Bericht ist vor Weitergabe an Dritte zu prüfen und zu validieren.
|
||||
|
||||
**Methodik und Grenzen**
|
||||
- Untersucht: Quellcode, Konfiguration (`config/*`), Migrationen, Views, Routen, Tests-Namen, Betriebsdokumentation (`docs/*`).
|
||||
- **Nicht durchgeführt:** Zugriff auf Staging/Produktion, Browser-/Netzwerkanalyse, Test-Buchungen, Einsicht in Server-`.env`, Strato-Verträge/-Einstellungen. Es gibt daher **kein „tatsächlich beobachtetes Browserverhalten“** – alle Aussagen zu Cookies/Requests sind Codebefunde.
|
||||
- Es wurden keine Zugangsdaten, Tokens oder echten Gästedaten in diesen Bericht übernommen.
|
||||
|
||||
**Statuskennzeichnung:** ✅ Implementiert und im Code belegt · 📄 Nur konfiguriert/dokumentiert · 🗓 Geplant · ❓ Unbekannt / zu prüfen
|
||||
|
||||
---
|
||||
|
||||
## 1. Executive Summary
|
||||
|
||||
**Gesamtbild:** Die Anwendung ist datensparsam aufgebaut. Es gibt **keine Analyse-/Marketing-Dienste, keine externen Skripte/CDNs/Schriften, keine eingebettete Karte, kein Kundenkonto**. Nach Code-Lage setzt die Seite nur technisch notwendige Cookies (Session, XSRF). Gästedaten liegen in einer MySQL/MariaDB bei STRATO; E-Mail-Versand läuft über den Strato-SMTP (Produktion geplant).
|
||||
|
||||
**Positiv (✅):** selbst gehostete Schriften; Double-Opt-in für Angebots-E-Mails mit signiertem Abmeldelink; automatische Anonymisierung nach Aufbewahrungsfrist (Standard 10 Jahre, Steuerberatung zu bestätigen); Honeypot + IP-Rate-Limit am Buchungsformular; Admin-Rollen mit Policies; Pflicht-2FA für Admins; HMAC-signierte Webhooks; iCal-Feed ohne Gästedaten; Mietvertrag-PDF nicht öffentlich abgelegt.
|
||||
|
||||
**Wichtigste Lücken (Details §5):**
|
||||
1. **Datenschutzerklärung und Impressum sind leer** (`legal.privacy`/`legal.imprint` ohne Default) – Blocker für die Produktivsetzung.
|
||||
2. **Anonymisierung ist unvollständig:** Vertrags-PDFs, `portal_emails.excerpt`, `bookings.internal_notes`, Bewertungen (Name, privates Feedback), UTM-Daten, Sitzungs-IPs und Logs werden nicht mitgelöscht/anonymisiert.
|
||||
3. **Kein dokumentiertes Löschkonzept für Nicht-Buchungen:** Abgelaufene/abgelehnte Anfragen bleiben (Guest + Booking) bis zur 10-Jahres-Anonymisierung gespeichert – Frist vermutlich zu lang für Anfragen ohne Vertragsabschluss (juristisch prüfen).
|
||||
4. **Backups:** Datenbank-Backups sind nur im Konzept („täglich“) erwähnt, im Code/Deployment nicht belegt (❓).
|
||||
5. **Geheimnisse in URL-Query** (`?token=` für `/health/sync`, `/automation/scheduler`) landen in Server-/Proxy-Logs; Betrieb über n8n auf einem „privaten Server“ ist eine Auftragsverarbeitungs-/Drittlandfrage, falls dort Gästedaten fließen.
|
||||
6. **Kein Angebot/Annahme-Schritt im System:** Der Prozess kennt nur *Anfrage (Reserved) → vom Vermieter bestätigt (Confirmed)*; die Gast-Annahme ist nicht abgebildet. Das ist für Datenschutzerklärung (Vertragsanbahnung) und AGB relevant.
|
||||
7. **KI:** Keine KI-Komponente im Code vorhanden (🗓 nur perspektivisch). Vor Einführung sind AVV, Drittlandtransfer, Art. 22 DSGVO und DSFA zu klären.
|
||||
8. **Fehlende Security-Header** (CSP, HSTS, X-Frame-Options etc.) im Anwendungscode; ggf. nur über Strato/.htaccess (❓).
|
||||
|
||||
---
|
||||
|
||||
## 2. Systemübersicht und Datenflussdiagramm
|
||||
|
||||
### 2.1 Technik (alle ✅ soweit nicht anders vermerkt)
|
||||
|
||||
| Bereich | Befund | Quelle |
|
||||
|---|---|---|
|
||||
| Framework | Laravel 13 (PHP 8.4), Livewire, Filament 5 (Admin `/admin`), Blade-Theme-System, Tailwind/Vite (lokal gebaut) | `composer.json`, `CLAUDE.md` |
|
||||
| Hosting | STRATO Shared Webhosting (Hosting Pro), kein Node zur Laufzeit; Atomic Releases, nur aktive Version auf dem Server | `docs/BETRIEB.md` §2, `docs/DEPLOYMENT.md` |
|
||||
| Datenbank | MariaDB (STRATO) in Staging 📄; lokal SQLite. Enthält Gäste, Buchungen, Zahlungen, Sessions, Cache, Jobs | `docs/BETRIEB.md` §3, `database/migrations/*` |
|
||||
| Dateispeicher | `storage/app` (privat: Vertrags-PDFs) und `storage/app/public` (Fotos, WebP-Größen); Spatie Media Library | `app/Documents/RentalContract.php`, `config/filesystems.php`, `config/media-library.php` |
|
||||
| Sessions/Cache/Queue | `database`-Treiber; Queue `sync` (kein Worker) | `config/session.php`, `docs/BETRIEB.md` §5 |
|
||||
| Mail | Staging: `MAIL_MAILER=log` (E-Mails landen im Logfile!); Produktion: Strato-SMTP 🗓/📄 | `docs/BETRIEB.md` §1/§5, `config/mail.php` |
|
||||
| Postfach-Abruf | IMAP (Strato) für Portal-Benachrichtigungen, Staging aus, Produktion 🗓 | `app/Channels/Mail/MailboxReader.php`, `config/fewo.php` |
|
||||
| Logging | Laravel-Log (Datei `storage/logs`, Level `debug` als Default); Slack/Papertrail-Kanäle nur als Framework-Defaults, nicht aktiv konfiguriert (❓ Produktiv-`.env`) | `config/logging.php` |
|
||||
| Monitoring | Eigener Endpoint `/health/sync` (Token), geplant n8n als externer Wächter 📄 | `ChannelController::health`, `docs/KONZEPT.md` |
|
||||
| Fehlerberichte | Kein Sentry/Bugsnag o. Ä. (nicht in `composer.json`) | `composer.json` |
|
||||
| Drittanbieter-Pakete (lokal ausgeführt) | dompdf (PDF), webklex/php-imap, Filament, Spatie Media Library – keine ausgehenden Aufrufe an Dritte außer IMAP/SMTP | `composer.json` |
|
||||
| Backups | ❓ Nicht belegt (Konzept: „Datenbank-Backups täglich“ 🗓); Strato-eigene Backups unbekannt | `docs/KONZEPT.md` Z. 153 |
|
||||
|
||||
### 2.2 Datenflussdiagramm
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
G[Gast / Besucher<br/>Browser] -->|HTTPS| W[stommer.info bzw. fewo-stommer.de<br/>Laravel auf STRATO]
|
||||
W -->|Anfrage-Formular: Name, E-Mail, Adresse, Telefon, Nachricht| DB[(MariaDB bei STRATO<br/>guests, bookings, payments,<br/>reviews, sessions, cache)]
|
||||
W -->|SMTP| SM[STRATO Mail-Server]
|
||||
SM -->|Bestätigungen, Erinnerungen, Vertrag| G
|
||||
SM -->|Benachrichtigung neue Anfrage| V[Vermieterin<br/>fewo@… Postfach]
|
||||
A[Admin /admin<br/>Rollen + 2FA] --> W
|
||||
W --- FS[(storage: Vertrags-PDFs,<br/>Fotos, Logs)]
|
||||
P1[FeWo-direkt u. a. Portale] -->|iCal-Import: Belegung ohne Gästedaten| W
|
||||
W -->|iCal-Export 'Belegt'<br/>Token-URL, ohne Gästedaten| P1
|
||||
P1 -->|Buchungs-E-Mail inkl. ggf. Gästedaten| PM[Postfach bei STRATO]
|
||||
PM -->|IMAP jede Minute| W
|
||||
N8N[n8n auf privatem Server 📄/🗓] -->|GET health / scheduler mit Token| W
|
||||
W -->|optional Webhook, HMAC-signiert 📄| N8N
|
||||
KI[KI-Agent 🗓] -.nicht implementiert.-> W
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Verarbeitungstätigkeiten
|
||||
|
||||
Rechtsgrundlagen sind **Prüfannahmen** (juristisch zu bestätigen).
|
||||
|
||||
| # | Verarbeitung | Datenkategorien | Zweck | Quelle → Empfänger | Speicherort | Aufbewahrung / Löschung | Prüfannahme Rechtsgrundlage | Sicherheit | Status |
|
||||
|---|---|---|---|---|---|---|---|---|---|
|
||||
| V1 | Buchungsanfrage / Vorreservierung | Vor-/Nachname, E-Mail, Telefon (opt.), Anschrift (opt.), Reisedaten, Personenzahl, Extras, Preisangebot (JSON), freier Nachrichtentext, Herkunft (`referral_source`, `utm_*`) | Vertragsanbahnung, Verfügbarkeit halten | Gast → Vermieterin, STRATO (Hosting, SMTP) | Tabellen `guests`, `bookings` | Keine Löschung nach Ablauf/Ablehnung; nur Nachricht-Nullung + Anonymisierung nach `guest_retention_years` (10 J.) seit letztem Aufenthalt/Anlage, monatlicher Job `guests:anonymize` | Art. 6 (1) b; Herkunft/UTM ggf. Art. 6 (1) f | HTTPS (📄), Honeypot, IP-Rate-Limit 5/h, CSRF (Livewire), Validierung | ✅ `app/Livewire/BookingRequest.php`, `app/Actions/CreateReservation.php`, `app/Actions/AnonymizeGuests.php` |
|
||||
| V2 | Eingangs-/Bestätigungs-E-Mails | Gästedaten, Preisangebot, Nachricht | Information, Vermieter-Benachrichtigung | Anwendung → Gast, Vermieterin | Strato-SMTP; Staging: Logfile | Mailversand-Kopien: ❓ (Strato-Postfach); Log-Rotation ❓ | Art. 6 (1) b | SMTP-Transportverschlüsselung ❓ | ✅ `app/Mail/*`, `resources/views/mail/*` |
|
||||
| V3 | Bestätigung / verbindliche Buchung + Mietvertrag (PDF) | Gäste- und Buchungsdaten, Preise, Zahlungstermine | Vertragserfüllung, Abrechnung | Vermieterin → Gast | `storage/app/private/contracts/…pdf` (Disk `local`), Pfad in `bookings.contract_path` | **Nicht** durch Anonymisierung gelöscht (PDF enthält Namen/Anschrift) | Art. 6 (1) b, c (§ 147 AO) | Nicht öffentlich erreichbar; Download nur Admin | ✅ `app/Actions/ConfirmBooking.php`, `app/Documents/RentalContract.php` |
|
||||
| V4 | Zahlungserfassung & -erinnerungen | Zahlbeträge, Datum, Methode, Notiz, erfassende Person; Bankdaten des Vermieters in Mail | Zahlungsabwicklung (manuell, Überweisung) | Vermieterin → Gast | `payments`; `FEWO_BANK_*` in `.env` | Buchhaltungsaufbewahrung (Steuerberater klären) | Art. 6 (1) b, c | Kein Zahlungsdienstleister, keine Kartendaten (**PCI-DSS nicht berührt**) | ✅ `app/Actions/RecordPayment.php`, `SendBookingReminders.php` |
|
||||
| V5 | Ankunftsinformation, Bewertungsanfrage | E-Mail, Name, Reisedaten | Gästeservice | Anwendung → Gast | `bookings.*_sent_at` | s. V1 | Art. 6 (1) b bzw. (1) f (Bewertungsmail: juristisch prüfen, § 7 UWG) | Signierter, 90 Tage gültiger Link | ✅ `app/Actions/RequestReviews.php`, `app/Mail/ReviewRequest.php` |
|
||||
| V6 | Bewertungen | Anzeigename, Bewertungstext, privates Feedback, Einwilligung zur Veröffentlichung, Aufenthaltsdatum | Qualitätssicherung, Veröffentlichung nach Freigabe | Gast → Vermieterin → öffentlich (bei Einwilligung) | `reviews` | **Keine** Löschung/Anonymisierung (nicht in `Guest::anonymize`) | Art. 6 (1) a (Veröffentlichung), (1) f | Moderation (Status Pending) | ✅ `app/Actions/SubmitReview.php`, `app/Livewire/ReviewForm.php` |
|
||||
| V7 | Newsletter / Angebots-E-Mails | E-Mail, Name, Einwilligungszeitpunkt | Marketing | Gast (Opt-in im Formular) → Vermieterin | `guests.marketing_consent_at` | Widerruf per Abmeldelink; Anonymisierung entfernt Consent | Art. 6 (1) a, § 7 (2) UWG (DOI) | Signierte Links, DOI (14 Tage). **Hinweis:** Versandfunktion von Angebots-Mails selbst im Code nicht gefunden – nur Consent + CSV-Export | ✅ (Consent) / ❓ (Versand) `MarketingConsentController`, `RequestMarketingConsent`, `ListGuests` Export |
|
||||
| V8 | Gästekartei (CRM) | Stammdaten, Notizen, Tags, Aufenthalte | Kundenpflege | Vermieterin | `guests` (Notizen, Tags) | s. V1; Notizen/Tags bei Anonymisierung gelöscht ✅ | Art. 6 (1) f | Policy: nur Rolle `rentals` (+admin) | ✅ `app/Models/Guest.php`, `app/Filament/Resources/Guests` |
|
||||
| V9 | CSV-Export Gäste | Alle Stammdaten nicht anonymisierter Gäste | Mailing/Verwaltung | Admin-Download | Browser des Admins | Verantwortung beim Nutzer; kein Export-Log | Art. 6 (1) f | Nur eingeloggte Rolle; kein Audit-Log ❓ | ✅ `app/Filament/Resources/Guests/Pages/ListGuests.php` |
|
||||
| V10 | Portal-Kalenderabgleich (iCal) | Nur Zeiträume („Belegt“); keine Gästedaten | Doppelbuchungen vermeiden | Portal ↔ Anwendung | `blocked_periods`, `channels`, `channel_sync_logs` | – | Art. 6 (1) b/f (kein Personenbezug im Feed) | Token-URL (`export_token`), Throttle 60/min | ✅ `app/Channels/ICal/*`, `ChannelController::feed` |
|
||||
| V11 | Portal-Buchungs-E-Mails (Schnellpfad) | Absender, Betreff, **500-Zeichen-Auszug des Mailtextes** (kann Gästedaten enthalten), Referenz, Zeitraum | Sofortige Sperre | Portal → IMAP-Postfach → Anwendung → Vermieterin | `portal_emails`; Postfach | **Keine Löschfrist, keine Anonymisierung** | Art. 6 (1) b/f | IMAP über SSL, Zertifikatsprüfung; Parsing, „nie raten“ | ✅ Code / 🗓 Produktivbetrieb. `ProcessPortalMail`, `MailboxReader` |
|
||||
| V12 | Admin-Konten | Name, E-Mail, Passwort-Hash, Rolle, 2FA-Secret (verschlüsselt), Sessions | Zugriff Verwaltung | Admin | `users`, `sessions` | bis Löschung durch Admin | Art. 6 (1) f | bcrypt, Pflicht-2FA (Admins), Session `AuthenticateSession` | ✅ `AdminPanelProvider`, `RequireTwoFactorForAdmins` |
|
||||
| V13 | Server-/Anwendungs-Logs & Sessions | IP-Adresse, User-Agent (Tabelle `sessions`), Zeit, Fehler-Stacktraces (ggf. mit Daten), Rate-Limit-Schlüssel mit IP (Cache) | Betrieb, Sicherheit, Missbrauchsschutz | Besucher → Hosting | `sessions`, `cache`, `storage/logs`, STRATO-Webserver-Logs (❓) | Session-Lifetime 120 min, aber Zeilen werden bis Garbage-Collection vorgehalten; Log-Rotation ❓ | Art. 6 (1) f | – | ✅ `0001_01_01_000000_create_users_table.php`, `config/session.php`; Webserver-Logs ❓ |
|
||||
| V14 | Analyse / Tracking | – | – | – | – | – | – | – | ✅ **nicht vorhanden** (kein Matomo/GA/Pixel) |
|
||||
| V15 | Automation/Webhook (n8n) | Aufgabeninhalte (Sperr-Aufgaben: Zeiträume, ggf. Referenz), Health-Status | Portalsperre, Überwachung | Anwendung ↔ privater Server | extern ❓ | ❓ | ❓ | HMAC-SHA256, Token | 📄 `config/fewo.php` (`automation`), `docs/PORTALE.md` |
|
||||
| V16 | KI-gestützte Buchungsbearbeitung | – | – | – | – | – | – | – | 🗓 **kein Code vorhanden** |
|
||||
|
||||
---
|
||||
|
||||
## 4. Externe Dienste und Empfänger
|
||||
|
||||
| Dienst | Rolle | Daten | Belegt in | Status | Offene Punkte |
|
||||
|---|---|---|---|---|---|
|
||||
| **STRATO AG** (Hosting, DB, SMTP/IMAP, Domains) | Auftragsverarbeiter (vermutlich) | Alle Anwendungsdaten, E-Mails, Logs | `docs/BETRIEB.md` | ✅/📄 | AVV-Abschluss prüfen; Serverstandort/Backup-Verhalten ❓; Mail-Kanal TLS ❓ |
|
||||
| **OpenStreetMap** | Nur *Verlinkung* (kein Einbetten) | Adresse als URL-Parameter nur bei Klick des Besuchers auf `https://www.openstreetmap.org/search?query=…`; **keine Tile-Server-Anfragen** beim Seitenaufruf | `app/Themes/Sections/LocationSection.php`, `resources/themes/ostsee-licht/views/sections/location.blade.php` | ✅ | Bei Klick Übermittlung IP an OSMF (Datenschutzerklärung erwähnen). Falls später eingebettete Karte: Einwilligung/2-Klick |
|
||||
| **Schriftarten** | Selbst gehostet (`@fontsource`, vom Build gebündelt) | – | `resources/themes/ostsee-licht/theme.css`, `docs/THEMES.md` | ✅ | Im gebauten Output stichprobenartig prüfen (kein `fonts.googleapis`) |
|
||||
| **Externe Skripte/CDNs/Bilder** | Keine gefunden (`grep` über `resources/`, nur `schema.org`-Kennung und `sitemaps.org`-Namespace als Bezeichner, keine Abrufe) | – | `resources/**` | ✅ | Browser-Verifikation nötig (❓) |
|
||||
| **FeWo-direkt / Vrbo / weitere Portale** | Eigenständig Verantwortliche für ihre Gästedaten; Empfänger/Absender von iCal | iCal: nur Zeiträume. Portal-Mails: ggf. Gästedaten | `app/Channels/*`, `docs/PORTALE.md` | ✅ iCal / 📄 Portal-Mail | Prüfen, welche Gästedaten die Portal-Mails tatsächlich enthalten |
|
||||
| **n8n / privater Server (FastAPI, Playwright)** | Unabhängiger Wächter / Browser-Bot | Health-Status; ggf. Sperr-Aufgaben | `docs/KONZEPT.md` Z. 139, `docs/PORTALE.md` Z. 89 | 📄/🗓 | Standort, Betreiber, Logs, AVV ❓ (privat betrieben → Haushaltsausnahme gilt hier nicht automatisch) |
|
||||
| **Gitea (gitea.stommer.de)** | Code-Repository/CI | Kein Gästedatenfluss (Repo enthält keine `.env`; Fotolisten-CSV) | `CLAUDE.md`, `.gitignore` | ✅ | Prüfen, dass nie Echtdaten/DB-Dumps committet werden |
|
||||
| **KI-Anbieter** | – | – | – | 🗓 nicht vorhanden | s. §5/§6 |
|
||||
| **Slack/Papertrail/AWS/Postmark/Resend** | Nur Framework-Platzhalter in Configs, nicht aktiv | – | `config/logging.php`, `config/services.php` | 📄 | Sicherstellen, dass Produktiv-`.env` sie nicht aktiviert |
|
||||
|
||||
---
|
||||
|
||||
## 5. Gap-Analyse mit Risikopriorität
|
||||
|
||||
Priorität: **K** = kritisch (Blocker für Go-Live), **H** = hoch, **M** = mittel, **N** = niedrig.
|
||||
|
||||
| ID | Prio | Befund | Beleg | Empfehlung |
|
||||
|---|---|---|---|---|
|
||||
| G1 | **K** | Datenschutzerklärung und Impressum haben keinen Inhalt (`default => null`); Link-Pflicht Art. 13 DSGVO / § 5 DDG | `config/content.php` Z. 48–49, `SiteSeeder.php` | Texte erstellen/juristisch prüfen lassen, bevor Produktion indexiert wird; Faktenbasis siehe §8 |
|
||||
| G2 | **K** | Einwilligungstext im Formular ist ein Einverständnis zur Speicherung „(siehe Datenschutzerklärung)“ – Verlinkung/Art. 13-Information unklar; Rechtsgrundlage Vertragsanbahnung braucht eigentlich keine Einwilligung | `resources/views/livewire/booking-request.blade.php` Z. 204–207 | Text auf Information umstellen, Link auf Datenschutzerklärung und Hinweis auf Pflichtfelder; juristisch prüfen |
|
||||
| G3 | **H** | Anonymisierung unvollständig: Vertrags-PDFs, `portal_emails.excerpt`, `bookings.internal_notes`, `bookings.utm_*`, Reviews (`display_name`, `private_feedback`), Zahlungsnotizen | `app/Models/Guest.php::anonymize` | Löschkonzept: je Datenkategorie Frist definieren (§ 147 AO: 6/8/10 Jahre – nur steuerlich relevante Unterlagen); PDFs nach Frist löschen; Auszüge/Notizen leeren; Reviews anonymisieren |
|
||||
| G4 | **H** | Keine Löschung von Anfragen ohne Vertragsabschluss (Reserved/Expired/Declined) vor 10 Jahren | `AnonymizeGuests`, `ExpireReservations` | Eigene, kürzere Frist (z. B. Monate bis wenige Jahre – juristisch festlegen) und Job |
|
||||
| G5 | **H** | Backups nicht belegt; Wiederherstellbarkeit, Verschlüsselung, Aufbewahrung, Löschung aus Backups ❓ | `docs/KONZEPT.md` | Backup-Verfahren dokumentieren (Strato-Backup oder eigener `mysqldump`), Retention an Löschkonzept koppeln |
|
||||
| G6 | **H** | Betriebsgeheimnisse als Query-Parameter (`?token=`) → Logs/Proxys | `ChannelController::health/scheduler` | Token per Header (`Authorization`/`X-Token`) statt Query; Webserver-Logs auf Tokens prüfen |
|
||||
| G7 | **H** | n8n/privater Server mit Zugriff auf Betriebsdaten und evtl. Gästedaten; Rolle (Auftragsverarbeiter/eigenverantwortlich) und Absicherung unklar | `docs/PORTALE.md` Z. 89 | Datenfluss minimieren (keine Gästedaten in Webhooks), Standort/Logs dokumentieren, ggf. AVV/TOMs |
|
||||
| G8 | **H** | Logfile als Mailkanal in Staging; im Produktivbetrieb `LOG_LEVEL=debug`-Default; Logs können personenbezogene Daten enthalten (Exceptions, Mails) | `config/logging.php`, `docs/BETRIEB.md` | Produktiv: `LOG_LEVEL=warning`/`error`, `LOG_CHANNEL=daily` mit Rotation (`LOG_DAILY_DAYS`), `MAIL_MAILER=smtp`; keine Daten in Exception-Meldungen |
|
||||
| G9 | **M** | Cookies: nach Code (Standard-Laravel-`web`-Stack) werden `…-session` und `XSRF-TOKEN` bei jedem Seitenaufruf gesetzt (technisch notwendig → i. d. R. kein Banner, aber Information in DSE und TDDDG-Prüfung). **Nicht im Browser verifiziert** | `bootstrap/app.php`, `config/session.php` | Browser-Test (DevTools), Cookie-Tabelle für DSE; Local/Session Storage: im eigenen JS nicht genutzt ✅ |
|
||||
| G10 | **M** | Session-Tabelle speichert IP + User-Agent aller Besucher (mit Session) | `0001_01_01_000000_create_users_table.php` | Gesetzten Zweck/Löschfrist dokumentieren; ggf. Session nur für Seiten mit Formular starten |
|
||||
| G11 | **M** | Sicherheits-Header nicht im Code gesetzt (CSP, HSTS, X-Frame-Options, Referrer-Policy, Permissions-Policy) | Grep über `app/`, `bootstrap/`, `public/.htaccess` | Per Middleware oder `.htaccess` ergänzen; HSTS erst nach HTTPS-Prüfung |
|
||||
| G12 | **M** | Review-Link (signiert, 90 Tage) ohne Throttle; Signatur schützt, aber Brute-Force/Spam auf Formular begrenzen | `routes/web.php` | `throttle` ergänzen |
|
||||
| G13 | **M** | Zugriff ohne Kundenkonto: Gäste erhalten keine Online-Einsicht – Auskunfts-/Löschwünsche laufen manuell; Löschung eines einzelnen Gastes nur über „Anonymisieren“ (Aktion im Admin, Code `Guest::anonymize`) | `app/Models/Guest.php` | Prozess für Betroffenenrechte (Art. 15–21) dokumentieren, Frist 1 Monat |
|
||||
| G14 | **M** | Kein Audit-Log für Admin-Zugriffe/Exporte/Statuswechsel (nur Zahlungs-`recorded_by`, Sync-Logs) | – | Minimal-Protokoll für Export, Anonymisierung, Statuswechsel erwägen |
|
||||
| G15 | **M** | Admin-Rollen: `rentals` darf Gäste exportieren; 2FA nur für `admin` verpflichtend | `GuestPolicy`, `AdminPanelProvider` | 2FA für `rentals` ebenfalls verpflichtend erwägen |
|
||||
| G16 | **M** | Selbstregistrierung/Passwort-Reset: Reset-Mails und Passwortrichtlinie nicht geprüft | – | Prüfen (❓) |
|
||||
| G17 | **M** | Dev-Zugangsdaten (`admin@example.com`/`password`) in Doku für lokale Entwicklung; Sicherstellen, dass Seeder nie in Produktion läuft | `docs/BETRIEB.md` §7 | In Produktion nur `ProductionSeeder` (bereits dokumentiert ✅) |
|
||||
| G18 | **M** | Prozessbeschreibung Angebot/Annahme fehlt: Status kennen weder „Angebot versandt“ noch „vom Gast angenommen“; „Bestätigt“ = Verbindlichkeit durch Vermieterin, Mail „Erst mit unserer Bestätigung ist die Buchung verbindlich“ | `BookingStatus`, `reservation-received.blade.php` | Vertragsmechanik (Annahme durch Gast) rechtlich klären und – falls gewünscht – implementieren; DSE-Text entsprechend |
|
||||
| G19 | **N** | OSM-Link überträgt Adresse nur bei Klick | `LocationSection.php` | In DSE erwähnen |
|
||||
| G20 | **N** | UTM-/Herkunftsdaten werden zusammen mit Buchung gespeichert | `BookingRequest.php`, `CreateReservation.php` | Zweck/Rechtsgrundlage in DSE; Löschfrist festlegen |
|
||||
| G21 | **N** | Fotos: Kein EXIF-Stripping im Code gefunden (GPS-Daten in Fotos möglich) | Grep `exif` negativ | Prüfen, ob WebP-Konvertierung Metadaten entfernt |
|
||||
| G22 | **N** | Review-Anonymität: `display_name` Freitext; Veröffentlichung nur bei `publish_consent` | `ReviewForm` | Hinweis im Formular auf Pseudonym |
|
||||
|
||||
### KI-spezifische Lücken (🗓, vorausschauend)
|
||||
- **K (vor Einführung):** Anbieter, Modell, Region (EU/EWR vs. Drittland), AVV, Zero-Data-Retention/Opt-out vom Training, Subprozessoren – alle ❓.
|
||||
- **H:** Art. 22 DSGVO: Preise/Angebote/Ablehnungen nicht vollautomatisch ohne menschliche Freigabe; aktuell hat kein Code KI-Entscheidungsbefugnisse (✅ Entscheidungen manuell in Admin: `ConfirmBooking`, `DeclineBooking`).
|
||||
- **H:** Datenminimierung: Pseudonymisierung vor Übergabe an KI (keine Namen/Anschriften), Prompt-/Antwort-Logging mit Löschfrist, Audit-Log je KI-Aktion.
|
||||
- **M:** DSFA-Pflicht prüfen (Datenschutzbeauftragte/r / Rechtsberatung); KI-Transparenz (Art. 13 (2) f.).
|
||||
|
||||
---
|
||||
|
||||
## 6. Offene Fragen
|
||||
|
||||
1. Wer ist Hosting-Vertragspartner (Strato-Vertrag, AVV abgeschlossen?) und wo liegen Server/Backups?
|
||||
2. Wird für die Produktion ein Cookie-/TDDDG-Konzept benötigt, oder bleibt es bei rein technischen Cookies? (Browserverifikation fehlt)
|
||||
3. Welche Gästedaten enthalten die FeWo-direkt-/Vrbo-Buchungsmails tatsächlich (Name, E-Mail, Telefon)? Werden diese in `portal_emails.excerpt` gespeichert?
|
||||
4. Welche Aufbewahrungsfristen gelten für: Anfragen ohne Vertrag, Verträge/Rechnungen, Zahlungsnachweise, Bewertungen, Marketing-Einwilligungen? (Steuerberatung/Rechtsberatung)
|
||||
5. Wie wird der Versand der Angebots-/Newsletter-Mails technisch erfolgen? (Im Code nur Einwilligung + CSV-Export gefunden – wird extern versendet? Dann Dienstleister/AVV.)
|
||||
6. Wo läuft n8n (Standort, Betreiber), welche Daten erhält es, wie wird abgesichert?
|
||||
7. Welcher Anbieter/welches Modell soll für die KI-gestützte Buchungsbearbeitung genutzt werden, mit welchen Daten, in welcher Region, mit welcher menschlichen Freigabe?
|
||||
8. Werden Server-Zugriffslogs bei Strato geführt, wie lange, und sind IP-Adressen gekürzt?
|
||||
9. Wie wird ein Backup/Restore getestet, und wie werden Löschungen in Backups umgesetzt?
|
||||
10. Ist ein Verarbeitungsverzeichnis (Art. 30) vorhanden? Ist die Benennung eines Datenschutzbeauftragten erforderlich?
|
||||
11. Gibt es weitere Empfänger (Steuerberater, Buchhaltung, Kurverwaltung/Meldeschein, Kurtaxe)?
|
||||
12. Soll es einen verbindlichen Angebots-/Annahmeprozess im System geben (G18)?
|
||||
13. Wird in der Produktion ein eigener Cookie-Banner/Einwilligungs-Mechanismus benötigt (derzeit **kein** Mechanismus vorhanden)?
|
||||
|
||||
---
|
||||
|
||||
## 7. Maßnahmenplan für die Produktivsetzung
|
||||
|
||||
**Vor Go-Live (Blocker)**
|
||||
1. Impressum und Datenschutzerklärung erstellen und rechtlich prüfen lassen; Verlinkung im Footer und im Formular (G1, G2).
|
||||
2. AVV mit STRATO prüfen/abschließen; Verarbeitungsverzeichnis anlegen.
|
||||
3. Produktiv-`.env`: `APP_ENV=production`, `APP_DEBUG=false`, `LOG_LEVEL` ≥ warning, `LOG_CHANNEL=daily`, `MAIL_MAILER=smtp` mit TLS, `SESSION_SECURE_COOKIE=true` (G8).
|
||||
4. Backup-Verfahren einrichten und Restore testen (G5).
|
||||
5. Löschkonzept festlegen und umsetzen (G3, G4); Datenschutzerklärung entsprechend ausrichten.
|
||||
6. Browser-Verifikation: Netzwerk-/Cookie-Analyse auf Staging (G9), Ergebnis in DSE übernehmen.
|
||||
7. Security-Header ergänzen (G11); Tokens aus der Query in Header verlegen (G6).
|
||||
|
||||
**Kurzfristig nach Go-Live**
|
||||
8. 2FA auch für Rolle `rentals` (G15); Audit-Log für Export/Anonymisierung (G14); Throttle Review-Route (G12).
|
||||
9. Betroffenenrechte-Prozess dokumentieren (G13).
|
||||
10. n8n-Datenfluss dokumentieren und minimieren (G7).
|
||||
|
||||
**Vor KI-Einsatz**
|
||||
11. DSFA-/Risikoprüfung, Anbieterwahl, AVV, Drittlandfrage, Pseudonymisierung, menschliche Freigabe bei Preis/Angebot/Annahme/Ablehnung, Audit-Log (KI-Abschnitt §5).
|
||||
|
||||
---
|
||||
|
||||
## 8. Faktenbasis für die neue Datenschutzerklärung
|
||||
|
||||
*(Faktenlage aus dem Code – Text und Rechtsgrundlagen juristisch zu formulieren.)*
|
||||
|
||||
| Thema | Faktenbasis | Status |
|
||||
|---|---|---|
|
||||
| Verantwortliche | Brigitte Stommer (Name/Anschrift/Kontakt aus `config/fewo.php`, `legal.imprint`) | 📄 |
|
||||
| Hosting | STRATO (Webspace, Datenbank, E-Mail) | 📄 |
|
||||
| Server-Logfiles | Beim Aufruf fallen technisch IP, Zeit, URL, User-Agent im Hosting an (Strato-Standard, ❓) | ❓ |
|
||||
| Cookies | Session-Cookie und XSRF-Token (technisch notwendig), Laufzeit bis Ende der Session/120 Minuten; kein Tracking | ✅ Code / ❓ Browser |
|
||||
| Local/Session Storage | Von der Anwendung nicht verwendet | ✅ |
|
||||
| Schriftarten | Lokal eingebunden | ✅ |
|
||||
| Karten | Nur Link zu OpenStreetMap (Klick); keine Einbettung | ✅ |
|
||||
| Analyse/Marketing-Tracking | Keine | ✅ |
|
||||
| Buchungsanfrage | Pflichtfelder: Anreise, Abreise, Personen, Vorname, Nachname, E-Mail, Zustimmung; optional: Telefon, Anschrift, Nachricht, Herkunft, Newsletter | ✅ |
|
||||
| Speicherung | Datenbank bei STRATO; Anonymisierung nach `guest_retention_years` (Standard 10 Jahre) | ✅ / Frist juristisch ❓ |
|
||||
| E-Mails | Eingangsbestätigung, Buchungsbestätigung mit Vertrag (PDF), Zahlungserinnerung, Ankunftsinfo, Bewertungsanfrage, ggf. Ablehnung | ✅ |
|
||||
| Newsletter | Opt-in im Formular + Double-Opt-in-Link (14 Tage), Abmeldelink in Mails; Widerruf jederzeit | ✅ |
|
||||
| Bewertungen | Freiwillig, Veröffentlichung nur bei Einwilligung und Freigabe | ✅ |
|
||||
| Zahlungen | Überweisung, manuelle Erfassung; kein Zahlungsdienstleister | ✅ |
|
||||
| Portale | Kalenderabgleich per iCal ohne Gästedaten; Auswertung von Portal-Benachrichtigungs-E-Mails (nur 500 Zeichen Auszug, Zeiträume) | ✅ Code / 🗓 Produktiv |
|
||||
| Empfänger | STRATO (Hosting/Mail); ggf. Portalbetreiber; ggf. Steuerberater | ❓ |
|
||||
| Drittlandübermittlung | Keine bekannt (✅ nach Code) – Strato-Subunternehmer ❓ | ❓ |
|
||||
| KI | Derzeit **keine** KI-Verarbeitung; bei Einführung DSE aktualisieren | 🗓 |
|
||||
| Betroffenenrechte | Art. 15–21, Beschwerderecht – Texte juristisch zu formulieren | ❓ |
|
||||
| Automatisierte Entscheidungen | Keine (alle Statuswechsel manuell durch Vermieterin) | ✅ |
|
||||
|
||||
---
|
||||
|
||||
### Anhang: wichtigste Quelldateien
|
||||
`app/Livewire/BookingRequest.php`, `app/Actions/{CreateReservation,ConfirmBooking,DeclineBooking,ExpireReservations,RecordPayment,AnonymizeGuests,RequestMarketingConsent,SubmitReview,RequestReviews,SendBookingReminders,ProcessPortalMail}.php`, `app/Models/Guest.php`, `app/Channels/**`, `app/Http/Controllers/{ChannelController,MarketingConsentController}.php`, `routes/web.php`, `routes/console.php`, `config/{fewo,channels,session,logging,mail,filesystems,content}.php`, `database/migrations/*`, `resources/themes/ostsee-licht/**`, `docs/{BETRIEB,DEPLOYMENT,KONZEPT,PORTALE,THEMES}.md`.
|
||||
+5
-1
@@ -48,7 +48,7 @@ ## 4a. Theme- und Vorlagensystem (Entscheidungen vom 22.10.2026 – umgesetzt, D
|
||||
|
||||
- **Themes** (Design) als Code-Pakete mit Manifest, eigenen Vorlagen und eigenem CSS; was ein Theme nicht mitbringt, kommt aus einem vollständigen **Basis-Theme** (Child-Theme-Prinzip). Erstes Theme: **„Ostsee-Licht“** (Entwurf A, orientiert an der bisherigen Webseite). Die Entwürfe B/C können später als weitere Themes folgen.
|
||||
- **Bausteinsystem (geführt):** Seiten werden aus einem festen Katalog von Abschnitten zusammengestellt (Reihenfolge, Sichtbarkeit); Seiten und Menüs können je Ausrichtung unterschiedlich sein. Keine freie Seitengestaltung.
|
||||
- **Saisonale Erscheinungsbilder:** wechseln Fotos, Texte, Farben/Akzente, Banner und hervorgehobene Angebote – nicht den Aufbau. Zeitplan jährlich wiederkehrend mit Priorität und Standard; Vorschau-Link vor Aktivierung. Startset: **Sommer** (Strand, Baden), **Winter** (raue See, stimmungsvoller Himmel), **Weihnachten** (gemütlich, besinnlich), **Silvester** (Party, Feuerwerk). Klickbare Vorschau: lokale HTML-Datei (Scratchpad der Sitzung).
|
||||
- **Saisonale Erscheinungsbilder:** wechseln Fotos (Titelbild und **Bilder je Baustein**), Texte, Farben/Akzente und Banner – nicht den Aufbau. Bausteine können **nur in bestimmten Erscheinungsbildern** erscheinen (z. B. ein Weihnachts-Baustein). Sonderangebote werden seit 22.10.2026 **unabhängig** davon nach eigenen Regeln beworben (5a). Zeitplan jährlich wiederkehrend mit Priorität und Standard; Vorschau-Link vor Aktivierung. Startset: **Sommer** (Strand, Baden), **Winter** (raue See, stimmungsvoller Himmel), **Weihnachten** (gemütlich, besinnlich), **Silvester** (Party, Feuerwerk). Klickbare Vorschau: lokale HTML-Datei (Scratchpad der Sitzung).
|
||||
- **Mehrfähigkeit offen halten:** „Site“ = Domain + Theme/Erscheinungsbilder + angezeigte Wohnungen; kein Portal, aber andere Vermieter könnten die Funktionen über eine eigene Domain nutzen (Mandantenfähigkeit vorbereiten, nicht ausbauen).
|
||||
- **Plugins:** Theme- und Baustein-Plugins als Composer-Pakete (Registry wie bei den Portal-Connectoren); Auslieferung per Deployment – kein Upload von Vorlagen im Admin (Sicherheit).
|
||||
- **Strato:** CSS aller Themes wird beim Deployment gebaut; Seiten-Cache je Erscheinungsbild.
|
||||
@@ -88,6 +88,10 @@ ## 5a. Sonderangebote & Sonderkonditionen
|
||||
|
||||
Rabatte gelten auf den Übernachtungspreis (nicht auf Endreinigung/Extras); die Anzahlung wird auf den rabattierten Mietpreis berechnet. Treffen mehrere Angebote zu, erhält der Gast automatisch die günstigere Variante: das beste Einzelangebot **oder** die Summe aller als „kombinierbar“ markierten Angebote.
|
||||
|
||||
**Angebotsarten** (Entscheidung 22.10.2026): **Rabattaktion** (nur Bedingungen, z. B. Last Minute, „ab 3 Nächten −10 %“, 7 = 6, Special Weekend) · **Fester Termin** (genau diese An-/Abreise, z. B. „Ostsee-Woche 07.–14.11.“, oft mit **Pauschalpreis** für alle Nächte) · **Lückenfüller** (freie Lücken bis N Nächte zwischen zwei Belegungen, automatisch erkannt; kann den Mindestaufenthalt der Saison aufheben). Im Admin gibt es Vorlagen für die typischen Fälle.
|
||||
|
||||
**Bewerbung unabhängig vom Erscheinungsbild** (`App\Pricing\OfferShowcase`): gezeigt werden aktive, öffentliche Angebote ohne Code im Buchungszeitraum; feste Termine nur solange frei; Lückenfüller mit bis zu drei konkreten Lücken. Feste Termine und Lücken werden mit dem `PriceCalculator` gerechnet – der beworbene Preis ist exakt der spätere Angebotspreis („499 € statt 640 €“, Link mit vorausgefüllten Daten). Reihenfolge: hervorgehoben → Priorität → frühestes Datum. Gelten mehrere gleichzeitig, zeigt der Baustein sie wahlweise **nebeneinander, als Liste oder rollierend**; das wichtigste hervorgehobene Angebot erscheint optional im Titelbereich.
|
||||
|
||||
## 6. Workflows
|
||||
|
||||
```
|
||||
|
||||
@@ -0,0 +1,244 @@
|
||||
# Neues Theme erstellen – verbindliche Bauanleitung
|
||||
|
||||
Stand: 22.10.2026 · gilt für jede Design-Sitzung (z. B. auf dem privaten Rechner mit dem Skill/Plugin `frontend-design`) · Architektur und Datenverträge: [THEMES.md](THEMES.md)
|
||||
|
||||
> **Kurz:** Ein neues Design entsteht als **zusätzliches Theme** in einem eigenen Ordner `resources/themes/<key>/`. Das vorhandene Theme **„Ostsee-Licht“ wird nicht verändert**. Das neue Theme erbt alles, was es nicht selbst mitbringt, wird mit `php artisan themes:check <key>` geprüft, per Vorschau-Link angesehen und erst dann im Admin für die Website ausgewählt. Zurück geht es jederzeit durch Auswahl des alten Themes.
|
||||
|
||||
---
|
||||
|
||||
## 1. Grundregeln (nicht verhandelbar)
|
||||
|
||||
1. **Nur im eigenen Ordner arbeiten:** `resources/themes/<key>/**`. Zusätzlich erlaubt: `package.json`/`package-lock.json` für **selbst gehostete Schriften** (`@fontsource/*`). Alles andere bleibt unangetastet, insbesondere `resources/themes/ostsee-licht/**`, `app/**`, `config/**`, `database/**`, `routes/**`, `resources/views/livewire/**`.
|
||||
2. **Neues Theme immer mit `php artisan themes:make <key>` anlegen.** Der Befehl erzeugt das korrekte Format und überschreibt nie einen vorhandenen Ordner.
|
||||
3. **Nur Optik:** Blade-Vorlagen, CSS, etwas JavaScript, Farb-Tokens. Keine Datenbankabfragen, keine Geschäftslogik und keine neuen PHP-Klassen in Vorlagen. Daten kommen fertig aufbereitet aus den Bausteinen (Variablen siehe [THEMES.md §4–5](THEMES.md)).
|
||||
4. **Farben nur über Tokens** (`bg-accent`, `text-muted` …), nie fest (`#123456`, `text-blue-700`, `bg-[#…]`, `style="color:#…"`). Sonst wirken die saisonalen Erscheinungsbilder nicht. Ausnahme ohne Saisonbezug: `text-white`/`bg-black` auf Fotos und Overlays.
|
||||
5. **Nichts von fremden Servern laden:** keine Google Fonts, CDNs, externen Skripte, eingebetteten Karten oder Videos von Drittanbietern. Grund: DSGVO, und die Seite kommt so ohne Cookie-Banner aus.
|
||||
6. **Pflicht-Markup erhalten** (§6): Verfügbarkeitssuche, Buchungsformular, Lightbox, rollierende Angebote, Echtheitshinweis der Bewertungen, JSON-LD, `noindex` in der Vorschau.
|
||||
7. **Fertig ist ein Theme erst, wenn** `php artisan themes:check <key>` ohne Fehler, `npm run build` fehlerfrei und `php artisan test --compact` grün ist und die Checkliste in §10 abgehakt ist.
|
||||
|
||||
## 2. Schnellstart
|
||||
|
||||
```bash
|
||||
git pull # aktuellen Stand holen
|
||||
composer install && npm ci # einmalig auf dem Rechner
|
||||
cp .env.example .env && php artisan key:generate # einmalig, lokale SQLite-Datenbank …
|
||||
touch database/database.sqlite # … als leere Datei anlegen (PowerShell: New-Item database/database.sqlite)
|
||||
php artisan migrate:fresh --seed # Testdaten: Wohnung, Seiten, 5 Erscheinungsbilder
|
||||
php artisan photos:import <Ordner> --manifest=database/data/wordpress-photos.csv # optional: echte Fotos (siehe BETRIEB.md)
|
||||
|
||||
php artisan themes:make ostsee-nacht --name="Ostsee-Nacht" --description="Dunkel, ruhig, großformatige Fotos"
|
||||
# → resources/themes/ostsee-nacht/ (erbt zunächst alles von Ostsee-Licht)
|
||||
|
||||
npm run dev # oder npm run build
|
||||
php artisan serve # http://localhost:8000 · Admin: /admin (admin@example.com / password, 2FA beim ersten Login einrichten)
|
||||
php artisan themes:preview ostsee-nacht # Vorschau-Links: jede Seite × jedes Erscheinungsbild
|
||||
php artisan themes:check ostsee-nacht # Prüfung gegen diese Anleitung
|
||||
```
|
||||
|
||||
**Key wählen:** Kleinbuchstaben, Ziffern und Bindestriche; Ordnername gleich Key, z. B. `ostsee-nacht`, `kuestenmagazin`. Der Key ist dauerhaft, weil die Website ihn speichert. Der Anzeigename (`name`) darf sich ändern.
|
||||
|
||||
## 3. Aufbau eines Themes
|
||||
|
||||
```
|
||||
resources/themes/<key>/
|
||||
├── theme.json Manifest (Pflicht)
|
||||
├── theme.css Vite-Einstiegspunkt CSS (Pflicht, sobald das Theme eigenes CSS hat – themes:make legt es an)
|
||||
├── theme.js Vite-Einstiegspunkt JS (Pflicht zusammen mit theme.css)
|
||||
├── README.md kurze Beschreibung, welche Vorlagen überschrieben sind
|
||||
└── views/
|
||||
├── layouts/app.blade.php optional: Grundgerüst (<head>, Banner, Kopf, Inhalt, Fuß, Lightbox)
|
||||
├── page.blade.php optional: Ausgabe der Bausteine einer Seite
|
||||
├── partials/ optional: banner, header, footer, image, mobile-booking-bar + eigene Includes
|
||||
└── sections/<baustein>.blade.php optional: je Baustein eine Vorlage (Liste in §5)
|
||||
```
|
||||
|
||||
**Vererbung:** Jede Vorlage, die im Theme fehlt, kommt vom Eltern-Theme (`parent`) und zuletzt vom Basis-Theme „Ostsee-Licht“. Ein frisch angelegtes Theme sieht daher genauso aus wie Ostsee-Licht. Man überschreibt Schritt für Schritt nur, was anders werden soll. Für ein komplett neues Design werden in der Regel alle Vorlagen überschrieben. Ausgangspunkt ist dann jeweils die gleichnamige Datei aus `resources/themes/ostsee-licht/views/`: in den eigenen Ordner **kopieren** und umgestalten, das Original nicht ändern.
|
||||
|
||||
### 3.1 `theme.json`
|
||||
|
||||
```json
|
||||
{
|
||||
"key": "ostsee-nacht",
|
||||
"name": "Ostsee-Nacht",
|
||||
"version": "0.1.0",
|
||||
"parent": "ostsee-licht",
|
||||
"description": "Dunkel, ruhig, großformatige Fotos",
|
||||
"assets": {
|
||||
"css": "resources/themes/ostsee-nacht/theme.css",
|
||||
"js": "resources/themes/ostsee-nacht/theme.js"
|
||||
},
|
||||
"tokens": {
|
||||
"ground": { "label": "Hintergrund", "default": "#0F1A22" },
|
||||
"accent": { "label": "Akzent (Buttons, Hervorhebungen)", "default": "#E8B04A" }
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
| Feld | Regel |
|
||||
|---|---|
|
||||
| `key` | = Ordnername, `^[a-z0-9]+(-[a-z0-9]+)*$` |
|
||||
| `name`, `description` | erscheinen im Admin bei der Theme-Auswahl |
|
||||
| `version` | `MAJOR.MINOR.PATCH`; bei jeder Auslieferung erhöhen |
|
||||
| `parent` | in der Regel `ostsee-licht`; auch ein anderes installiertes Theme ist möglich |
|
||||
| `assets.css` / `assets.js` | **genau** `resources/themes/<key>/theme.css` bzw. `theme.js`: Nur diese Dateien baut `vite.config.js` automatisch. Hat ein Theme eigene Assets, ersetzen sie die des Eltern-Themes **vollständig** (deshalb importieren beide Dateien das Eltern-Theme, §3.2/3.3). |
|
||||
| `tokens` | Farbwerte als `#RRGGBB` mit deutschem `label`. `themes:make` übernimmt alle geerbten Tokens; die Defaults sind neu zu setzen. Alle 12 Basis-Tokens müssen in der Kette vorhanden sein. Neue Tokens sind erlaubt (§4). |
|
||||
|
||||
### 3.2 `theme.css` (so legt `themes:make` sie an)
|
||||
|
||||
```css
|
||||
@import 'tailwindcss';
|
||||
@import '../ostsee-licht/theme-base.css'; /* Schriften, Token-Mapping, Basis-Klassen des Eltern-Themes */
|
||||
|
||||
/* eigene Schriften – selbst gehostet */
|
||||
@import '@fontsource/fraunces/400.css';
|
||||
|
||||
/* Vorlagen, deren Tailwind-Klassen gebaut werden – alle drei Zeilen sind Pflicht */
|
||||
@source '../ostsee-licht/views'; /* geerbte Vorlagen */
|
||||
@source '../../views/livewire'; /* Buchungs- und Bewertungsformular */
|
||||
@source './views'; /* eigene Vorlagen */
|
||||
|
||||
@theme inline {
|
||||
--font-display: 'Fraunces', Georgia, serif;
|
||||
--font-sans: 'Inter', ui-sans-serif, system-ui, sans-serif;
|
||||
/* neues Token: */
|
||||
--color-glow: var(--glow);
|
||||
}
|
||||
|
||||
@layer components {
|
||||
.heading-display { /* Basis-Klassen dürfen neu definiert werden */ }
|
||||
}
|
||||
```
|
||||
|
||||
- **Tailwind v4** (kein `tailwind.config.js`, keine `@apply` auf eigene Klassen).
|
||||
- `theme-base.css` des Eltern-Themes liefert: Schriften von Ostsee-Licht, das Mapping aller Tokens auf Tailwind-Farben (`--color-<token>: var(--<token>)`), Formular-Grundstile, Fokusrahmen, `prefers-reduced-motion`. Dazu kommen die Klassen, die geerbte Vorlagen und die Formulare nutzen: `.eyebrow`, `.heading-display`, `.btn-primary`, `.btn-accent`, `.prose-theme`, `.reveal`. **Wer `theme-base.css` nicht importiert, muss all das selbst bereitstellen.** `themes:check` prüft Mapping und Quellen.
|
||||
- **Nicht** `../ostsee-licht/theme.css` importieren, sondern `theme-base.css`. Die Quellen gibt das neue Theme selbst an.
|
||||
|
||||
### 3.3 `theme.js`
|
||||
|
||||
```js
|
||||
import '../ostsee-licht/theme.js'; // Lightbox, Verfügbarkeitssuche, rollierende Angebote
|
||||
|
||||
// eigene, kleine Verbesserungen – progressive enhancement: ohne JS muss alles funktionieren
|
||||
```
|
||||
|
||||
Kein Framework (React/Vue/Alpine-Komponenten), keine externen Skripte. Livewire/Alpine lädt das Layout bereits für das Buchungsformular.
|
||||
|
||||
## 4. Farben und Tokens
|
||||
|
||||
- Das Layout gibt die Tokens als CSS-Variablen aus (`:root{--accent:#…}`). Die Reihenfolge ist: Theme-Standard → Website (Admin › System › Websites › Farben) → Erscheinungsbild (Admin › Webseite › Erscheinungsbilder › Farben).
|
||||
- Basis-Tokens (Bedeutung **nicht** umdeuten, nur neu einfärben):
|
||||
|
||||
| Token | Tailwind | Verwendung |
|
||||
|---|---|---|
|
||||
| `ground` | `bg-ground` | Seitenhintergrund |
|
||||
| `surface` | `bg-surface` | Karten, Formulare |
|
||||
| `ink` | `text-ink` | Haupttext |
|
||||
| `muted` | `text-muted` | Nebentext |
|
||||
| `line` | `border-line` | Linien, Rahmen |
|
||||
| `accent` / `accent-ink` | `bg-accent` / `text-accent-ink` | Buttons, Hervorhebungen / Text darauf |
|
||||
| `band` / `band-ink` / `band-muted` | `bg-band` … | dunkles Band (z. B. Lage) |
|
||||
| `banner` / `banner-ink` | `bg-banner` … | Hinweis-Banner oben |
|
||||
|
||||
- **Kontraste (WCAG 2.2 AA, ≥ 4,5 : 1)** werden von `themes:check` für die Theme-Standards (Fehler) und für jedes aktive Erscheinungsbild der Datenbank (Warnung) geprüft. Paare: ink/muted/accent auf ground und surface, accent-ink auf accent, band-ink/band-muted auf band, banner-ink auf banner. Bei Warnungen in den Erscheinungsbildern die Saisonfarben im Admin anpassen oder die Theme-Standards so wählen, dass die Saisons passen.
|
||||
- Saisonale Feinheiten im CSS: `<html data-appearance="weihnachten">`, also etwa `[data-appearance=silvester] .hero-overlay { … }`. Schlüssel: `standard`, `sommer`, `winter`, `weihnachten`, `silvester` (Slug des Namens).
|
||||
- **Neues Token:** in `theme.json › tokens` (mit `label`, `default`) und in `theme.css › @theme inline` als `--color-<token>: var(--<token>);` mappen. Es erscheint dann automatisch als Farbfeld im Admin.
|
||||
|
||||
## 5. Bausteine und Vorlagen
|
||||
|
||||
Jede Seite ist eine Liste von Bausteinen, die die Vermieterin im Admin anordnet. Für jeden Baustein rendert das System `theme::sections.<key>` mit fertigen Variablen. **Welche Variablen es gibt, steht verbindlich in [THEMES.md](THEMES.md) §5.** Die Vorlagen von Ostsee-Licht sind die Referenz-Implementierung.
|
||||
|
||||
| Datei (`views/…`) | Baustein / Zweck |
|
||||
|---|---|
|
||||
| `sections/hero` | Titelbereich mit Verfügbarkeitssuche, optional Top-Angebot |
|
||||
| `sections/facts` | Eckdaten |
|
||||
| `sections/text_image` | Text mit bis zu 3 Bildern |
|
||||
| `sections/gallery` | Bildergalerie mit Lightbox |
|
||||
| `sections/amenities` | Ausstattung |
|
||||
| `sections/location` | Lage & Umgebung |
|
||||
| `sections/prices` | Preise & Saisons |
|
||||
| `sections/offers` | Sonderangebote (nebeneinander / Liste / rollierend) |
|
||||
| `sections/booking` | Kalender & Anfrage (Livewire) |
|
||||
| `sections/reviews` | Gästebewertungen |
|
||||
| `sections/host` | Gastgeberin |
|
||||
| `sections/faq` | Häufige Fragen |
|
||||
| `sections/cta` | Abschluss mit Aufruf |
|
||||
| `sections/contact` | Kontakt |
|
||||
| `sections/rich_text` | Fließtext (Impressum, Datenschutz …) |
|
||||
| `layouts/app`, `page`, `partials/*` | Grundgerüst, Kopf, Fuß, Banner, Bild-Helfer, mobile Buchungsleiste |
|
||||
|
||||
Regeln für Vorlagen:
|
||||
|
||||
- **Immer vorhanden:** `$theme` und `$sectionId`. `$sectionId` für `id`/`aria-labelledby` verwenden, weil ein Baustein mehrfach auf einer Seite stehen kann.
|
||||
- **Leere Daten abfangen:** Bausteine ohne Inhalt (keine Angebote, keine Bewertungen, kein Foto) rendern nichts bzw. einen ruhigen Platzhalter. Nie mit Fehlern abbrechen.
|
||||
- **Bilder** immer über `@include('theme::partials.image', ['photo' => $photo, 'sizes' => '(min-width: 1024px) 50vw, 100vw', 'class' => '…', 'eager' => false])`. Das liefert responsives WebP (640/1280/2048 px) und Alt-Text aus dem Admin. `eager => true` nur für das erste große Bild der Seite.
|
||||
- **Saisonbilder je Baustein** und **Bausteine nur in bestimmten Erscheinungsbildern** regelt das System. Vorlagen nehmen einfach `$photo`/`$photos`.
|
||||
- **Texte** kommen aus dem Admin. Feste Texte in Vorlagen nur für Bedienelemente („Preis berechnen“, „Schließen“); auf Deutsch, per „Sie“.
|
||||
- **Eigene Teil-Vorlagen** nach `views/partials/<name>.blade.php` legen und mit `@include('theme::partials.<name>')` einbinden.
|
||||
- **Buchungs- und Bewertungsformular** (`resources/views/livewire/*.blade.php`) sind für alle Themes gemeinsam und nicht änderbar. Sie nutzen nur Token-Klassen und `.btn-*`; ein Theme passt sie über Tokens und die Basis-Klassen an.
|
||||
|
||||
## 6. Pflicht-Markup (wird von `themes:check` geprüft)
|
||||
|
||||
| Vorlage | Muss enthalten | Warum |
|
||||
|---|---|---|
|
||||
| `layouts/app` | `@vite($theme->assets())`, `{!! $theme->cssVariables() !!}` in `<style>`, `@livewireStyles`, `@livewireScripts`, `@stack('head')`, `@yield('content')`, `data-appearance="{{ $theme->appearanceKey() }}"` am `<html>`, `<meta name="robots" content="noindex">` wenn `$theme->isPreview \|\| ! app()->isProduction()`, Vorschau-Hinweis, `<dialog id="lightbox">` mit `img`, `[data-caption]`, `[data-close]`, Sprunglink `#inhalt` | Assets, Farben, Buchung, SEO-Schutz, Lightbox, Barrierefreiheit |
|
||||
| `page` | Ausgabe von `$sections` (`{!! $section->render() !!}`) und JSON-LD aus `$structuredData` per `@push('head')` | Inhalt, Google |
|
||||
| `partials/header` | `$theme->menu('main')` (Links `->url()`, Text `->label()`), Button zur Buchung | Navigation |
|
||||
| `partials/footer` | `$theme->menu('footer')` (Impressum, Datenschutz) | Rechtspflicht |
|
||||
| `sections/hero` | GET-Formular an `route('booking.create')` mit `data-availability-search` und Feldern `name="anreise"`, `name="abreise"` (Y-m-d), `name="personen"` | Suche → Buchungsseite |
|
||||
| `sections/booking` | `<livewire:booking-request :property="$property" />` | Kalender, Preis, Anfrage |
|
||||
| `sections/gallery` | Links `<a href="{{ $photo->url('lg') }}" data-lightbox data-alt="{{ $photo->alt_text }}">` | Lightbox |
|
||||
| `sections/offers` | Umsetzung von `$display`: bei `rotating` die Attribute `data-rotator` (Container), `data-rotator-slide` (je Angebot, außer dem ersten `hidden`), `data-rotator-prev`/`-next`, `data-rotator-dot="<index>"` mit `aria-selected` | rollierende Angebote (theme.js) |
|
||||
| `sections/reviews` | Hinweis: „Bewertungen über unsere Webseite können nur Gäste mit einer Buchung bei uns abgeben …“ (Wortlaut sinngemäß, muss „nur Gäste“ enthalten) | § 5b UWG |
|
||||
| `sections/faq` | FAQ-JSON-LD per `@push('head')` | Google |
|
||||
| `partials/mobile-booking-bar` | auf dem Handy immer erreichbarer Buchungs-Button | Konversion |
|
||||
|
||||
## 7. Schriften, Bilder, Icons, Bewegung
|
||||
|
||||
- **Schriften:** `npm install @fontsource/<schrift>` (oder `@fontsource-variable/<schrift>`), in `theme.css` importieren, in `@theme inline` als `--font-display` / `--font-sans` setzen. Höchstens zwei Familien und wenige Schnitte (Ladezeit). Lizenz: nur Open-Font-Lizenzen (Fontsource sind OFL).
|
||||
- **Bilder:** nur Fotos aus dem Admin (Webseite › Fotos). Dekorative Grafiken als Inline-SVG in der Vorlage oder als Datei im Theme-Ordner, eingebunden über `{{ Vite::asset('resources/themes/<key>/img/…') }}`. Damit Vite diese Dateien baut, in `theme.js` einmal `import.meta.glob(['./img/**'], { eager: true, query: '?url' });` ergänzen. Keine Bild-URLs von fremden Servern.
|
||||
- **Icons:** Inline-SVG; Heroicons sind über Blade verfügbar (`<x-heroicon-o-sparkles class="size-5" />`, kommt mit Filament).
|
||||
- **Bewegung:** nur mit Zweck; `@media (prefers-reduced-motion: no-preference)` und `@supports (animation-timeline: view())` als Verbesserung. Ohne Animation und ohne JS muss alles vollständig funktionieren. Kein Autoplay-Video mit Ton; Video nur stumm, mit Standbild und nicht bei `prefers-reduced-data`.
|
||||
|
||||
## 8. Qualität
|
||||
|
||||
Es gelten [THEMES.md](THEMES.md) §8:
|
||||
- Mobil zuerst (ab 360 px).
|
||||
- LCP unter 2,5 s.
|
||||
- WCAG 2.2 AA mit Kontrasten, Tastaturbedienung, sichtbarem Fokus und genau einem `h1` je Seite.
|
||||
- Reduced Motion wird respektiert.
|
||||
- SEO-Ausgaben bleiben erhalten.
|
||||
|
||||
## 9. Prüfen, ansehen, einbinden
|
||||
|
||||
1. **Prüfen:** `php artisan themes:check <key>`. Rote Punkte (✗) sind Fehler und müssen behoben werden, gelbe (!) sind Hinweise.
|
||||
2. **Ansehen, ohne etwas umzuschalten:** `php artisan themes:preview <key>` gibt für jede Seite signierte Links aus: „heute“ und je Erscheinungsbild (Standard, Sommer, Winter, Weihnachten, Silvester). Im Admin geht das auch unter System › Websites › Theme: Theme wählen, dann **„Vorschau“** (öffnet einen neuen Tab), noch nicht speichern. Vorschauseiten sind `noindex`. Klickt man in der Vorschau auf einen Menülink, verlässt man sie; deshalb für jede Seite den eigenen Link verwenden.
|
||||
3. **Bauen und testen:** `npm run build` und `php artisan test --compact`. Der Test `test_installed_themes_fulfil_the_theme_contract` lässt die Suite rot werden, wenn ein Theme die Prüfung nicht besteht.
|
||||
4. **Einreichen:** Commit (nur `resources/themes/<key>/**`, ggf. `package*.json`) und Push nach Gitea.
|
||||
5. **Ausliefern:** `bash scripts/deploy.sh staging deploy` (Testbetrieb https://stommer.info, siehe [BETRIEB.md](BETRIEB.md)). Die Vorschau-Links funktionieren dort genauso (`php artisan themes:preview <key>` über `bash scripts/deploy.sh staging artisan themes:preview <key>`).
|
||||
6. **Auswählen:** Admin › System › Websites › Website bearbeiten › **Theme** wählen › Speichern. Die Farbfelder darunter zeigen jetzt die Tokens des neuen Themes.
|
||||
7. **Zurück:** dort das vorherige Theme wählen. Alle Themes bleiben installiert; es wird nichts überschrieben.
|
||||
|
||||
## 10. Checkliste vor Abschluss
|
||||
|
||||
- [ ] Theme mit `themes:make` angelegt; `resources/themes/ostsee-licht/**` unverändert (`git status`)
|
||||
- [ ] `themes:check <key>` ohne Fehler; Warnungen bewertet
|
||||
- [ ] Alle Seiten (`/`, `/wohnung`, `/kuehlungsborn`, `/buchen`, `/kontakt`, `/impressum`, `/datenschutz`) auf Handy (360 px), Tablet und Desktop geprüft
|
||||
- [ ] Alle 5 Erscheinungsbilder über `themes:preview` geprüft (Silvester ist dunkel, Kontraste!)
|
||||
- [ ] Buchungsablauf in der Vorschau durchgespielt: Termin wählen → Preis erscheint → Anfrage absenden
|
||||
- [ ] Sonderangebote in allen drei Darstellungen (Baustein-Einstellung) angesehen
|
||||
- [ ] Tastatur: alles erreichbar, Fokus sichtbar; Reduced Motion an → keine Animation
|
||||
- [ ] Nur selbst gehostete Schriften, keine externen Anfragen (Browser-Netzwerkanalyse)
|
||||
- [ ] `npm run build` fehlerfrei, `php artisan test --compact` grün
|
||||
- [ ] `README.md` des Themes: welche Vorlagen überschrieben sind, Schriften, Besonderheiten; `version` erhöht
|
||||
|
||||
## 11. Gut zu wissen
|
||||
|
||||
- **Tailwind-Klassen werden themeübergreifend gesammelt:** Das Vite-Plugin sammelt beim Build die Klassen aller Themes, deshalb kann die CSS-Datei jedes Themes auch Klassen der anderen enthalten. Das ist harmlos (etwas größer). Eigene Schriften, Tokens und Komponenten-Stile bleiben dagegen im jeweiligen Theme, das ist geprüft.
|
||||
- **Strato hat ein Datei-Limit:** Bilder im Theme-Ordner sparsam einsetzen; Fotos gehören in den Admin.
|
||||
- **Ein Theme pro Website:** Weitere Vermieter mit eigener Domain können später ein anderes Theme nutzen (Admin › Websites).
|
||||
|
||||
## 12. Auftrag für die Design-Sitzung (zum Kopieren)
|
||||
|
||||
> Lies `CLAUDE.md`, `docs/THEME-ERSTELLUNG.md` und `docs/THEMES.md` vollständig. Erstelle mit dem Skill `frontend-design` ein **neues, zusätzliches Theme** für die Ferienwohnung Stommer in Kühlungsborn. Lege es mit `php artisan themes:make <key> --name="…" --description="…"` an und arbeite ausschließlich in `resources/themes/<key>/` (plus `package.json` für `@fontsource`-Schriften). Verändere `resources/themes/ostsee-licht` nicht. Kopiere die Referenzvorlagen aus `resources/themes/ostsee-licht/views` in dein Theme und gestalte sie neu. Halte dabei den Vorlagen-Vertrag (THEMES.md §5) und das Pflicht-Markup (THEME-ERSTELLUNG.md §6) ein. Nur Token-Farben, keine externen Quellen, mobil zuerst, WCAG 2.2 AA. Prüfe laufend mit `php artisan themes:check <key>` und sieh jede Seite in allen Erscheinungsbildern über `php artisan themes:preview <key>` an. Abschluss: Checkliste §10, `npm run build`, `php artisan test --compact`, Commit nur der Theme-Dateien.
|
||||
>
|
||||
> Gestalterische Leitideen: siehe THEMES.md §10.
|
||||
+15
-9
@@ -3,6 +3,8 @@ # Theme-System – Architektur, Vorlagen-Vertrag, Übergabe Design
|
||||
Stand: 22.10.2026 · Basis-Theme: **„Ostsee-Licht“** (`resources/themes/ostsee-licht`) · Entscheidungen: `docs/KONZEPT.md` §4a
|
||||
|
||||
> **Kurz:** Logik, Daten und Admin sind fertig und getestet. Ein Theme ist **nur Optik**: Blade-Vorlagen, CSS, ein wenig JS und Farb-Tokens. Für ein neues Design wird ausschließlich unter `resources/themes/<theme>/` gearbeitet.
|
||||
>
|
||||
> **Neues Theme bauen:** verbindliche Schritt-für-Schritt-Anleitung in [THEME-ERSTELLUNG.md](THEME-ERSTELLUNG.md) (`themes:make`, `themes:check`, `themes:preview`).
|
||||
|
||||
---
|
||||
|
||||
@@ -26,7 +28,7 @@ ## 1. Überblick
|
||||
| **Theme** | `resources/themes/<key>/` | Manifest `theme.json`, Vorlagen `views/`, `theme.css`, `theme.js` |
|
||||
| **Seite** | `pages`, Admin › Webseite › Seiten | Adresse, Menü (Haupt/Fuß/keins), SEO, **Bausteine** (Builder) |
|
||||
| **Baustein** (Section) | `app/Themes/Sections/*`, Katalog in `config/themes.php` | Admin-Formular + Datenaufbereitung; Darstellung: `theme::sections.<key>` |
|
||||
| **Erscheinungsbild** (Appearance) | `appearances`, Admin › Webseite › Erscheinungsbilder | Jährlicher Zeitraum + Priorität; ersetzt Farben (Tokens), Titelbild, ausgewählte Texte, Banner, hervorgehobenes Angebot – **nicht** den Aufbau |
|
||||
| **Erscheinungsbild** (Appearance) | `appearances`, Admin › Webseite › Erscheinungsbilder | Jährlicher Zeitraum + Priorität; ersetzt Farben (Tokens), Titelbild, **Bilder je Baustein**, ausgewählte Texte, Banner – **nicht** den Aufbau. Bausteine können auf Erscheinungsbilder beschränkt werden. Sonderangebote sind **unabhängig** davon (`OfferShowcase`) |
|
||||
|
||||
Code: `app/Themes/` (Theme, ThemeFactory, ThemeRegistry, ThemeManifest, SectionRegistry, Sections/), `app/Http/Middleware/ResolveTheme.php`, `app/Http/Controllers/PageController.php`, `app/Providers/ThemeServiceProvider.php`.
|
||||
|
||||
@@ -35,7 +37,8 @@ ## 2. Aufbau eines Themes
|
||||
```
|
||||
resources/themes/ostsee-licht/
|
||||
├── theme.json Manifest
|
||||
├── theme.css Tailwind v4 + Schriften + Token-Mapping
|
||||
├── theme.css Vite-Einstieg: @import 'tailwindcss' + theme-base.css + @source der Vorlagen
|
||||
├── theme-base.css wiederverwendbar: Schriften, Token-Mapping, Basis-Klassen (Child-Themes importieren diese Datei)
|
||||
├── theme.js kleine Verbesserungen (Lightbox, Suche)
|
||||
└── views/
|
||||
├── layouts/app.blade.php Grundgerüst: <head>, Banner, Kopf, @yield('content'), Fuß, Lightbox
|
||||
@@ -58,8 +61,8 @@ ### theme.json
|
||||
}
|
||||
```
|
||||
|
||||
- **Vererbung:** Vorlagen, die ein Theme nicht hat, kommen vom Eltern-Theme, zuletzt vom Basis-Theme (`config('themes.base')`). Ein Child-Theme kann also mit einer einzigen Datei beginnen (z. B. nur `sections/hero.blade.php`). Hat ein Child-Theme keine eigenen `assets`, werden die des Eltern-Themes geladen.
|
||||
- **Neues Theme anlegen:** Ordner `resources/themes/<key>/` mit `theme.json` (+ optional eigene Assets) → erscheint automatisch in Admin › System › Websites › Theme. `npm run build` baut alle Themes (`vite.config.js` liest die Ordner).
|
||||
- **Vererbung:** Vorlagen, die ein Theme nicht hat, kommen vom Eltern-Theme, zuletzt vom Basis-Theme (`config('themes.base')`). Ein Child-Theme kann also mit einer einzigen Datei beginnen (z. B. nur `sections/hero.blade.php`). Hat ein Child-Theme keine eigenen `assets`, werden die des Eltern-Themes geladen – das reicht nur ohne eigene Vorlagen; sobald es Vorlagen gibt, braucht das Theme eigene `theme.css`/`theme.js` (sonst fehlen deren Tailwind-Klassen; `themes:check` meldet das).
|
||||
- **Neues Theme anlegen:** `php artisan themes:make <key>` (überschreibt nie etwas) → erscheint automatisch in Admin › System › Websites › Theme (mit „Vorschau“). `npm run build` baut alle Themes (`vite.config.js` liest die Ordner). Prüfen: `php artisan themes:check`; Vorschau-Links: `php artisan themes:preview <key>` (signiert, `?theme=<key>` und optional `&vorschau=<Erscheinungsbild-ID>`). Details: [THEME-ERSTELLUNG.md](THEME-ERSTELLUNG.md).
|
||||
- **Plugins:** Ein Theme-Paket legt seinen Ordner unter einen Pfad aus `config('themes.paths')`. Themes werden **nie** über den Admin hochgeladen (Vorlagen sind ausführbarer Code).
|
||||
|
||||
## 3. Design-Tokens (Farben)
|
||||
@@ -83,6 +86,7 @@ ## 4. Was Layout und Vorlagen zur Verfügung haben
|
||||
| `$theme->appearanceKey()` | z. B. `weihnachten` – steht als `data-appearance` am `<html>`; für saisonale CSS-Details nutzbar: `[data-appearance=silvester] .hero {…}` |
|
||||
| `$theme->text($key, $fallback)` | Text des Erscheinungsbilds oder Fallback (Schlüssel: `Appearance::OVERRIDABLE`) |
|
||||
| `$theme->heroPhoto($fallback)` | Titelbild des Erscheinungsbilds oder Fallback |
|
||||
| `$theme->sectionPhotoIds($sectionId, $slot)` / `sectionPhotoMode($sectionId)` | Saisonbilder eines platzierten Bausteins (in Bausteinen über `seasonalPhoto()`, `seasonalPhotos()`, `withSeasonalPhotos()` der Basisklasse) |
|
||||
| `$theme->property()` | Hauptwohnung der Site |
|
||||
| `$theme->menu('main' \| 'footer')` | veröffentlichte Seiten des Menüs (`->url()`, `->label()`) |
|
||||
| `$theme->tokens()`, `cssVariables()`, `assets()` | für das Layout |
|
||||
@@ -97,14 +101,14 @@ ## 5. Bausteinkatalog – Vertrag der Vorlagen
|
||||
|
||||
| Key | Admin-Name | Variablen |
|
||||
|---|---|---|
|
||||
| `hero` | Titelbereich mit Suche | `$eyebrow`, `$title` (Text, `*Wort*` = Hervorhebung), `$text`, `$photo`, `$showSearch`, `$property` – Suche als GET-Formular an `route('booking.create')` mit `anreise`, `abreise` (Y-m-d), `personen` |
|
||||
| `hero` | Titelbereich mit Suche | `$eyebrow`, `$title` (Text, `*Wort*` = Hervorhebung), `$text`, `$photo`, `$showSearch`, `$property`, `$featuredOffer` (`AdvertisedOffer`\|null: wichtigstes hervorgehobenes Angebot) – Suche als GET-Formular an `route('booking.create')` mit `anreise`, `abreise` (Y-m-d), `personen` |
|
||||
| `facts` | Eckdaten | `$heading`, `$property`, `$highlights` (Collection<string>), `$fromPrice` (Cent\|null) |
|
||||
| `text_image` | Text mit Bildern | `$eyebrow`, `$heading`, `$text` (HtmlString\|null), `$photos` (≤3), `$imagePosition` (`left`\|`right`), `$linkLabel`, `$linkUrl` |
|
||||
| `gallery` | Bildergalerie | `$heading`, `$photos` – Lightbox: `<a href="{{ $photo->url('lg') }}" data-lightbox data-alt="…">` |
|
||||
| `amenities` | Ausstattung | `$heading`, `$groups` (Bereich ⇒ Collection<Amenity>) |
|
||||
| `location` | Lage & Umgebung | `$eyebrow`, `$heading`, `$text`, `$address`, `$mapUrl` (OpenStreetMap-Link, keine eingebettete Karte), `$photos` |
|
||||
| `prices` | Preise & Saisons | `$eyebrow`, `$heading`, `$text`, `$property`, `$seasons` (nächste 12 Monate), `$extras`, `$featuredSeason` (Name des Erscheinungsbilds) |
|
||||
| `offers` | Sonderangebote | `$heading`, `$offers` (öffentlich, ohne Code), `$featuredId` |
|
||||
| `offers` | Sonderangebote | `$heading`, `$display` (`grid`\|`list`\|`rotating`), `$offers` (Collection<`App\Pricing\AdvertisedOffer`>: `title`, `description`, `advantage`, `conditions`, `arrival`/`departure`/`nights()` bei festen Terminen und Lücken, `quote` + `regularTotal()` für „statt …“, `bookingUrl()`). Rollierend: `data-rotator`, `data-rotator-slide`, `data-rotator-prev/next/dot` (theme.js) |
|
||||
| `booking` | Kalender & Anfrage | `$heading`, `$text`, `$property` – bindet `<livewire:booking-request :property="$property" />` ein |
|
||||
| `reviews` | Gästebewertungen | `$heading`, `$reviews`, `$count`, `$average`, `$categories` – **Pflichthinweis** zur Echtheit (§ 5b UWG) muss sichtbar bleiben |
|
||||
| `host` | Gastgeber | `$heading`, `$quote`, `$text`, `$photo`, `$name` |
|
||||
@@ -115,11 +119,13 @@ ## 5. Bausteinkatalog – Vertrag der Vorlagen
|
||||
|
||||
Rich-Text-Variablen sind bereits bereinigt (HtmlString) und werden mit `{{ $text }}` ausgegeben.
|
||||
|
||||
**Jeder platzierte Baustein** hat `data.id` (feste UUID, `Page::assignSectionIds` beim Speichern; Kopien bekommen eine neue) und `data.appearances` (Erscheinungsbild-IDs; leer = immer sichtbar, sonst nur in diesen – z. B. ein Weihnachts-Baustein). Bausteine mit Bildern melden ihre Bildplätze über `photoSlots()` (`single`, `multiple`, `collection` = automatisch gewählte Bilder, die ein Erscheinungsbild ersetzen oder voranstellen kann); daraus baut das Erscheinungsbild-Formular „Bilder je Baustein“ (`appearances.section_photos[<id>][<slot>]`, bei Sammlungen zusätzlich `mode`). Alle Bildauswahlen nutzen `App\Filament\Forms\Components\PhotoSelect` (Vorschaubild + Beschreibung, nach Kategorie gruppiert).
|
||||
|
||||
**Neuer Baustein** (auch als Plugin): Klasse `extends App\Themes\Sections\Section` (`key()`, `label()`, `icon()`, `schema()` = Admin-Felder, `data()` = Variablen) → in `config/themes.php › sections` eintragen → Vorlage `sections/<key>.blade.php` im Basis-Theme anlegen (Test `test_base_theme_is_discovered_and_provides_a_view_for_every_section` erzwingt das). Unbekannte Bausteine werden auf der Seite übersprungen, nie ein Fehler.
|
||||
|
||||
## 6. Erscheinungsbilder
|
||||
|
||||
- Felder: Name, Zeitraum `TT.MM.`–`TT.MM.` (jährlich, darf über Silvester laufen), Priorität, Standard, aktiv, Titelbild, hervorgehobenes Angebot, Texte (`banner.text`, `banner.link_label`, `banner.link_url`, `hero.eyebrow`, `hero.title`, `hero.text`, `cta.title`, `cta.text`), Farben.
|
||||
- Felder: Name, Zeitraum `TT.MM.`–`TT.MM.` (jährlich, darf über Silvester laufen), Priorität, Standard, aktiv, Titelbild, **Bilder je Baustein** (alle Bausteine mit Bildern auf allen Seiten; leer = Bild aus der Seite), Texte (`banner.text`, `banner.link_label`, `banner.link_url`, `hero.eyebrow`, `hero.title`, `hero.text`, `cta.title`, `cta.text`), Farben.
|
||||
- Startset (Seeder): Standard · Sommer 01.06.–31.08. · Winter 01.11.–31.03. · Weihnachten 01.12.–25.12. (Prio 20) · Silvester 26.12.–03.01. (Prio 20).
|
||||
- **Vorschau:** Admin › Erscheinungsbilder › „Vorschau“ = signierter Link (24 h), `noindex`.
|
||||
- Ohne Erscheinungsbild-Banner wird der neueste aktive Hinweis (Admin › Hinweis-Banner) gezeigt.
|
||||
@@ -153,9 +159,9 @@ ## 9. Lokal starten und prüfen
|
||||
|
||||
## 10. Übergabe: Auftrag für die Design-Sitzung (privater Rechner, Plugin `frontend-design`)
|
||||
|
||||
**Ziel:** Das Basis-Theme „Ostsee-Licht“ gestalterisch auf ein wirklich herausragendes Niveau heben (Recherche & Ideen: Chat vom 22.10.2026, Zusammenfassung unten), oder ein neues Theme als Child bzw. eigenständiges Theme anlegen und im Admin umschalten.
|
||||
**Ziel:** Ein **neues, zusätzliches Theme** auf wirklich herausragendem Niveau (Recherche & Ideen: Chat vom 22.10.2026, Zusammenfassung unten), angelegt mit `themes:make`, auswählbar im Admin – „Ostsee-Licht“ bleibt unverändert als Basis und Rückfall. **Verbindliche Anleitung und Auftragstext: [THEME-ERSTELLUNG.md](THEME-ERSTELLUNG.md).**
|
||||
|
||||
**Arbeitsbereich:** nur `resources/themes/<theme>/**` – dazu bei Bedarf die theme-neutralen Livewire-Formulare `resources/views/livewire/*.blade.php` (nur Klassen, keine Logik).
|
||||
**Arbeitsbereich:** nur `resources/themes/<neues-theme>/**` (+ `package.json` für `@fontsource`-Schriften). Die Livewire-Formulare `resources/views/livewire/*.blade.php` sind für alle Themes gemeinsam und werden nicht verändert.
|
||||
|
||||
**Nicht anfassen:** `app/**` (außer ein neuer Baustein wird bewusst gebraucht – dann §5), Datenbank, Admin, `config/**`.
|
||||
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
/* Reusable styles of "Ostsee-Licht" (fonts, token mapping, base classes) – imported by theme.css and by child themes. */
|
||||
|
||||
/* Self-hosted fonts (no request to Google – GDPR). */
|
||||
@import '@fontsource/cormorant-garamond/500.css';
|
||||
@import '@fontsource/cormorant-garamond/500-italic.css';
|
||||
@import '@fontsource/cormorant-garamond/600.css';
|
||||
@import '@fontsource/figtree/400.css';
|
||||
@import '@fontsource/figtree/500.css';
|
||||
@import '@fontsource/figtree/600.css';
|
||||
|
||||
/*
|
||||
* Colour tokens come from theme.json and can be changed per site and per appearance; the layout prints them
|
||||
* as CSS variables. Tailwind classes such as bg-accent or text-muted refer to these variables.
|
||||
*/
|
||||
@theme inline {
|
||||
--color-ground: var(--ground);
|
||||
--color-surface: var(--surface);
|
||||
--color-ink: var(--ink);
|
||||
--color-muted: var(--muted);
|
||||
--color-line: var(--line);
|
||||
--color-accent: var(--accent);
|
||||
--color-accent-ink: var(--accent-ink);
|
||||
--color-band: var(--band);
|
||||
--color-band-ink: var(--band-ink);
|
||||
--color-band-muted: var(--band-muted);
|
||||
--color-banner: var(--banner);
|
||||
--color-banner-ink: var(--banner-ink);
|
||||
|
||||
--font-display: 'Cormorant Garamond', Georgia, serif;
|
||||
--font-sans: 'Figtree', ui-sans-serif, system-ui, sans-serif;
|
||||
}
|
||||
|
||||
@layer base {
|
||||
html {
|
||||
scroll-behavior: smooth;
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--ground);
|
||||
color: var(--ink);
|
||||
transition: background-color 0.4s, color 0.4s;
|
||||
}
|
||||
|
||||
input:not([type='checkbox']):not([type='radio']),
|
||||
select,
|
||||
textarea {
|
||||
border-width: 1px;
|
||||
border-color: var(--line);
|
||||
padding: 0.6rem 0.8rem;
|
||||
background-color: var(--surface);
|
||||
color: var(--ink);
|
||||
}
|
||||
|
||||
input[type='checkbox'] {
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
accent-color: var(--accent);
|
||||
}
|
||||
|
||||
:focus-visible {
|
||||
outline: 2px solid var(--accent);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
@layer components {
|
||||
.eyebrow {
|
||||
@apply mb-3 text-xs font-semibold tracking-[0.24em] text-accent uppercase;
|
||||
}
|
||||
|
||||
.heading-display {
|
||||
@apply font-display text-4xl leading-[1.08] font-medium sm:text-[2.875rem];
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
@apply inline-flex min-h-11 items-center justify-center rounded-full bg-ink px-6 py-3 text-[15px] font-semibold text-ground transition hover:opacity-90;
|
||||
}
|
||||
|
||||
.btn-accent {
|
||||
@apply inline-flex min-h-11 items-center justify-center rounded-full bg-accent px-6 py-3 text-[15px] font-semibold text-accent-ink transition hover:opacity-90;
|
||||
}
|
||||
|
||||
.prose-theme {
|
||||
@apply text-muted;
|
||||
}
|
||||
|
||||
.prose-theme p {
|
||||
@apply mb-4;
|
||||
}
|
||||
|
||||
.prose-theme ul,
|
||||
.prose-theme ol {
|
||||
@apply mb-4 ml-5 list-outside;
|
||||
}
|
||||
|
||||
.prose-theme ul {
|
||||
@apply list-disc;
|
||||
}
|
||||
|
||||
.prose-theme ol {
|
||||
@apply list-decimal;
|
||||
}
|
||||
|
||||
.prose-theme a {
|
||||
@apply text-accent underline;
|
||||
}
|
||||
|
||||
.prose-theme h2,
|
||||
.prose-theme h3 {
|
||||
@apply mt-6 mb-2 font-display text-2xl text-ink;
|
||||
}
|
||||
}
|
||||
|
||||
/* Gentle reveal while scrolling – only where supported and only without "reduce motion". */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
@supports (animation-timeline: view()) {
|
||||
.reveal {
|
||||
animation: reveal linear both;
|
||||
animation-timeline: view();
|
||||
animation-range: entry 0% entry 35%;
|
||||
}
|
||||
|
||||
@keyframes reveal {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(24px);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
html {
|
||||
scroll-behavior: auto;
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
transition-duration: 0.01ms !important;
|
||||
animation-duration: 0.01ms !important;
|
||||
}
|
||||
}
|
||||
@@ -1,146 +1,9 @@
|
||||
/*
|
||||
* Entry point of the theme "Ostsee-Licht": Tailwind, the reusable theme styles and the template sources.
|
||||
* Child themes import theme-base.css (not this file) and list their own sources – see docs/THEME-ERSTELLUNG.md.
|
||||
*/
|
||||
@import 'tailwindcss';
|
||||
|
||||
/* Self-hosted fonts (no request to Google – GDPR). */
|
||||
@import '@fontsource/cormorant-garamond/500.css';
|
||||
@import '@fontsource/cormorant-garamond/500-italic.css';
|
||||
@import '@fontsource/cormorant-garamond/600.css';
|
||||
@import '@fontsource/figtree/400.css';
|
||||
@import '@fontsource/figtree/500.css';
|
||||
@import '@fontsource/figtree/600.css';
|
||||
@import './theme-base.css';
|
||||
|
||||
@source './views';
|
||||
@source '../../views/livewire';
|
||||
|
||||
/*
|
||||
* Colour tokens come from theme.json and can be changed per site and per appearance; the layout prints them
|
||||
* as CSS variables. Tailwind classes such as bg-accent or text-muted refer to these variables.
|
||||
*/
|
||||
@theme inline {
|
||||
--color-ground: var(--ground);
|
||||
--color-surface: var(--surface);
|
||||
--color-ink: var(--ink);
|
||||
--color-muted: var(--muted);
|
||||
--color-line: var(--line);
|
||||
--color-accent: var(--accent);
|
||||
--color-accent-ink: var(--accent-ink);
|
||||
--color-band: var(--band);
|
||||
--color-band-ink: var(--band-ink);
|
||||
--color-band-muted: var(--band-muted);
|
||||
--color-banner: var(--banner);
|
||||
--color-banner-ink: var(--banner-ink);
|
||||
|
||||
--font-display: 'Cormorant Garamond', Georgia, serif;
|
||||
--font-sans: 'Figtree', ui-sans-serif, system-ui, sans-serif;
|
||||
}
|
||||
|
||||
@layer base {
|
||||
html {
|
||||
scroll-behavior: smooth;
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--ground);
|
||||
color: var(--ink);
|
||||
transition: background-color 0.4s, color 0.4s;
|
||||
}
|
||||
|
||||
input:not([type='checkbox']):not([type='radio']),
|
||||
select,
|
||||
textarea {
|
||||
border-width: 1px;
|
||||
border-color: var(--line);
|
||||
padding: 0.6rem 0.8rem;
|
||||
background-color: var(--surface);
|
||||
color: var(--ink);
|
||||
}
|
||||
|
||||
input[type='checkbox'] {
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
accent-color: var(--accent);
|
||||
}
|
||||
|
||||
:focus-visible {
|
||||
outline: 2px solid var(--accent);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
@layer components {
|
||||
.eyebrow {
|
||||
@apply mb-3 text-xs font-semibold tracking-[0.24em] text-accent uppercase;
|
||||
}
|
||||
|
||||
.heading-display {
|
||||
@apply font-display text-4xl leading-[1.08] font-medium sm:text-[2.875rem];
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
@apply inline-flex min-h-11 items-center justify-center rounded-full bg-ink px-6 py-3 text-[15px] font-semibold text-ground transition hover:opacity-90;
|
||||
}
|
||||
|
||||
.btn-accent {
|
||||
@apply inline-flex min-h-11 items-center justify-center rounded-full bg-accent px-6 py-3 text-[15px] font-semibold text-accent-ink transition hover:opacity-90;
|
||||
}
|
||||
|
||||
.prose-theme {
|
||||
@apply text-muted;
|
||||
}
|
||||
|
||||
.prose-theme p {
|
||||
@apply mb-4;
|
||||
}
|
||||
|
||||
.prose-theme ul,
|
||||
.prose-theme ol {
|
||||
@apply mb-4 ml-5 list-outside;
|
||||
}
|
||||
|
||||
.prose-theme ul {
|
||||
@apply list-disc;
|
||||
}
|
||||
|
||||
.prose-theme ol {
|
||||
@apply list-decimal;
|
||||
}
|
||||
|
||||
.prose-theme a {
|
||||
@apply text-accent underline;
|
||||
}
|
||||
|
||||
.prose-theme h2,
|
||||
.prose-theme h3 {
|
||||
@apply mt-6 mb-2 font-display text-2xl text-ink;
|
||||
}
|
||||
}
|
||||
|
||||
/* Gentle reveal while scrolling – only where supported and only without "reduce motion". */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
@supports (animation-timeline: view()) {
|
||||
.reveal {
|
||||
animation: reveal linear both;
|
||||
animation-timeline: view();
|
||||
animation-range: entry 0% entry 35%;
|
||||
}
|
||||
|
||||
@keyframes reveal {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(24px);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
html {
|
||||
scroll-behavior: auto;
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
transition-duration: 0.01ms !important;
|
||||
animation-duration: 0.01ms !important;
|
||||
}
|
||||
}
|
||||
@@ -43,3 +43,28 @@ document.addEventListener('submit', (event) => {
|
||||
form.querySelector('[name=anreise]').focus();
|
||||
}
|
||||
});
|
||||
|
||||
// Rotating offers: one slide at a time, advancing every 7 s; pauses on hover/focus and
|
||||
// does not advance by itself when the visitor prefers reduced motion.
|
||||
document.querySelectorAll('[data-rotator]').forEach((rotator) => {
|
||||
const slides = [...rotator.querySelectorAll('[data-rotator-slide]')];
|
||||
const dots = [...rotator.querySelectorAll('[data-rotator-dot]')];
|
||||
let current = 0;
|
||||
let paused = false;
|
||||
|
||||
const show = (index) => {
|
||||
current = (index + slides.length) % slides.length;
|
||||
slides.forEach((slide, i) => { slide.hidden = i !== current; });
|
||||
dots.forEach((dot, i) => dot.setAttribute('aria-selected', i === current ? 'true' : 'false'));
|
||||
};
|
||||
|
||||
rotator.querySelector('[data-rotator-prev]')?.addEventListener('click', () => show(current - 1));
|
||||
rotator.querySelector('[data-rotator-next]')?.addEventListener('click', () => show(current + 1));
|
||||
dots.forEach((dot, i) => dot.addEventListener('click', () => show(i)));
|
||||
['mouseenter', 'focusin'].forEach((type) => rotator.addEventListener(type, () => { paused = true; }));
|
||||
['mouseleave', 'focusout'].forEach((type) => rotator.addEventListener(type, () => { paused = false; }));
|
||||
|
||||
if (!window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
|
||||
setInterval(() => { if (!paused && !document.hidden) show(current + 1); }, 7000);
|
||||
}
|
||||
});
|
||||
@@ -32,7 +32,7 @@
|
||||
<a href="#inhalt" class="sr-only focus:not-sr-only focus:fixed focus:top-4 focus:left-4 focus:z-50 focus:rounded focus:bg-surface focus:px-4 focus:py-2">Zum Inhalt springen</a>
|
||||
|
||||
@if ($theme->isPreview)
|
||||
<div class="bg-ink py-2 text-center text-sm text-ground">Vorschau des Erscheinungsbilds „{{ $theme->appearance?->name }}“</div>
|
||||
<div class="bg-ink py-2 text-center text-sm text-ground">Vorschau · Theme „{{ $theme->manifest()->name }}“ · Erscheinungsbild „{{ $theme->appearance?->name ?? 'Standard' }}“</div>
|
||||
@endif
|
||||
|
||||
@include('theme::partials.banner')
|
||||
|
||||
@@ -5,6 +5,17 @@
|
||||
@if ($eyebrow)<p class="eyebrow">{{ $eyebrow }}</p>@endif
|
||||
<h1 id="{{ $sectionId }}-title" class="font-display text-[2.5rem] leading-[1.02] font-medium sm:text-[3.5rem]">{!! preg_replace('/\*(.+?)\*/u', '<em>$1</em>', e($title)) !!}</h1>
|
||||
@if ($text)<p class="mt-4 text-muted">{{ $text }}</p>@endif
|
||||
@if ($featuredOffer ?? null)
|
||||
<a href="{{ $featuredOffer->bookingUrl() }}" class="mt-5 flex items-center gap-3 rounded border border-accent p-3 hover:bg-surface">
|
||||
<span class="rounded bg-accent px-2 py-1 text-sm font-semibold whitespace-nowrap text-accent-ink">{{ $featuredOffer->advantage }}</span>
|
||||
<span class="text-sm">
|
||||
<strong>{{ $featuredOffer->title }}</strong>
|
||||
@if ($featuredOffer->arrival)
|
||||
· {{ $featuredOffer->arrival->format('d.m.') }}–{{ $featuredOffer->departure->format('d.m.') }}
|
||||
@endif
|
||||
</span>
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -1,17 +1,74 @@
|
||||
{{-- Contract: $heading, $display (grid|list|rotating), $offers (Collection of App\Pricing\AdvertisedOffer) --}}
|
||||
@if ($offers->isNotEmpty())
|
||||
<section class="mx-auto max-w-7xl px-4 py-16 sm:px-8" aria-labelledby="{{ $sectionId }}-title">
|
||||
<h2 id="{{ $sectionId }}-title" class="heading-display mb-8">{{ $heading }}</h2>
|
||||
<ul class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||
@foreach ($offers as $offer)
|
||||
<li @class(['reveal rounded bg-surface p-7', 'ring-2 ring-accent' => $offer->id === $featuredId])>
|
||||
<p class="font-display text-2xl">{{ $offer->name }}</p>
|
||||
@if ($offer->public_description)<p class="mt-2 text-muted">{{ $offer->public_description }}</p>@endif
|
||||
@if ($offer->stay_from || $offer->stay_until)
|
||||
<p class="mt-3 text-sm text-muted">Reisezeitraum {{ $offer->stay_from?->format('d.m.Y') ?? 'ab sofort' }} – {{ $offer->stay_until?->format('d.m.Y') ?? 'offen' }}</p>
|
||||
@endif
|
||||
@php($layout = $display === 'rotating' && $offers->count() === 1 ? 'grid' : $display)
|
||||
@php($rotating = $layout === 'rotating')
|
||||
<section class="mx-auto max-w-7xl px-4 py-16 sm:px-8" aria-labelledby="{{ $sectionId }}-title"
|
||||
@if ($rotating) data-rotator aria-roledescription="Karussell" @endif>
|
||||
<div class="mb-8 flex items-end justify-between gap-4">
|
||||
<h2 id="{{ $sectionId }}-title" class="heading-display">{{ $heading }}</h2>
|
||||
@if ($rotating)
|
||||
<div class="flex gap-2">
|
||||
<button type="button" data-rotator-prev class="rounded border border-line px-3 py-1.5 hover:bg-surface" aria-label="Vorheriges Angebot">←</button>
|
||||
<button type="button" data-rotator-next class="rounded border border-line px-3 py-1.5 hover:bg-surface" aria-label="Nächstes Angebot">→</button>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<ul @class([
|
||||
'grid gap-4 sm:grid-cols-2 lg:grid-cols-3' => $layout === 'grid',
|
||||
'grid gap-4' => $layout === 'list',
|
||||
'relative' => $rotating,
|
||||
]) @if ($rotating) data-rotator-track aria-live="polite" @endif>
|
||||
@foreach ($offers as $advertised)
|
||||
<li data-offer="{{ $advertised->key() }}" @class([
|
||||
'reveal flex flex-col rounded bg-surface p-7',
|
||||
'ring-2 ring-accent' => $advertised->offer->is_featured,
|
||||
'sm:flex-row sm:items-center sm:gap-8' => $layout === 'list',
|
||||
]) @if ($rotating) data-rotator-slide @if (! $loop->first) hidden @endif aria-label="Angebot {{ $loop->iteration }} von {{ $offers->count() }}" @endif>
|
||||
<div class="flex-1">
|
||||
<p class="inline-block rounded bg-accent px-2.5 py-1 text-sm font-semibold text-accent-ink">{{ $advertised->advantage }}</p>
|
||||
<p class="mt-3 font-display text-2xl">{{ $advertised->title }}</p>
|
||||
@if ($advertised->arrival)
|
||||
<p class="mt-1 font-semibold">
|
||||
{{ $advertised->arrival->locale('de')->isoFormat('dd DD.MM.') }} – {{ $advertised->departure->locale('de')->isoFormat('dd DD.MM.YYYY') }}
|
||||
· {{ $advertised->nights() }} {{ $advertised->nights() === 1 ? 'Nacht' : 'Nächte' }}
|
||||
</p>
|
||||
@endif
|
||||
@if ($advertised->description)<p class="mt-2 text-muted">{{ $advertised->description }}</p>@endif
|
||||
@if ($advertised->conditions)
|
||||
<ul class="mt-3 flex flex-wrap gap-2 text-sm text-muted">
|
||||
@foreach ($advertised->conditions as $condition)
|
||||
<li class="rounded border border-line px-2 py-0.5">{{ $condition }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
</div>
|
||||
<div @class(['mt-5', 'sm:mt-0 sm:text-right' => $layout === 'list'])>
|
||||
@if ($advertised->quote)
|
||||
<p class="text-lg">
|
||||
<strong>{{ \App\Support\Money::format($advertised->quote->total()) }}</strong>
|
||||
@if ($advertised->regularTotal() > $advertised->quote->total())
|
||||
<span class="text-muted">statt <s>{{ \App\Support\Money::format($advertised->regularTotal()) }}</s></span>
|
||||
@endif
|
||||
</p>
|
||||
<p class="text-sm text-muted">für {{ $advertised->quote->guests }} {{ $advertised->quote->guests === 1 ? 'Person' : 'Personen' }} inkl. Endreinigung</p>
|
||||
@endif
|
||||
<a href="{{ $advertised->bookingUrl() }}" class="mt-3 inline-block rounded bg-accent px-5 py-2.5 font-semibold text-accent-ink hover:opacity-90">
|
||||
{{ $advertised->arrival ? 'Diesen Termin anfragen' : 'Preis berechnen' }}
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
<p class="mt-4 text-sm text-muted">Angebote werden bei der Preisberechnung automatisch berücksichtigt.</p>
|
||||
|
||||
@if ($rotating)
|
||||
<div class="mt-4 flex justify-center gap-2" role="tablist" aria-label="Angebote">
|
||||
@foreach ($offers as $advertised)
|
||||
<button type="button" data-rotator-dot="{{ $loop->index }}" role="tab" aria-label="Angebot {{ $loop->iteration }}"
|
||||
aria-selected="{{ $loop->first ? 'true' : 'false' }}" class="size-2.5 rounded-full bg-line aria-selected:bg-accent"></button>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
<p class="mt-4 text-sm text-muted">Angebote werden bei der Preisberechnung automatisch berücksichtigt – Sie erhalten immer das für Sie günstigste.</p>
|
||||
</section>
|
||||
@endif
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use App\Filament\Resources\Bookings\Pages\CreateBooking;
|
||||
use App\Filament\Resources\Bookings\Pages\ListBookings;
|
||||
@@ -143,6 +144,36 @@ public function test_special_offer_with_euro_value_is_stored_in_cents(): void
|
||||
$this->assertSame([5950, ['5'], ['Winter']], [$offer->discount_value, array_map('strval', $offer->arrival_weekdays), $offer->season_names]);
|
||||
}
|
||||
|
||||
public function test_fixed_dates_package_and_gap_filler_are_created(): void
|
||||
{
|
||||
$manager = Livewire::test(SpecialOffersRelationManager::class, ['ownerRecord' => $this->property, 'pageClass' => EditProperty::class]);
|
||||
|
||||
$manager->callAction(TestAction::make(CreateAction::class)->table(), [
|
||||
'kind' => 'fixed_dates',
|
||||
'name' => 'Ostsee-Woche',
|
||||
'discount_type' => 'fixed_stay_price',
|
||||
'discount_value' => '499.00',
|
||||
'stay_from' => '2026-11-07',
|
||||
'stay_until' => '2026-11-14',
|
||||
'is_featured' => true,
|
||||
'priority' => 5,
|
||||
])->assertHasNoFormErrors();
|
||||
|
||||
$manager->callAction(TestAction::make(CreateAction::class)->table(), [
|
||||
'kind' => 'gap_filler',
|
||||
'name' => 'Kurzfristige Lücke',
|
||||
'discount_type' => 'percent',
|
||||
'discount_value' => 20,
|
||||
'max_gap_nights' => 4,
|
||||
'waives_min_stay' => true,
|
||||
])->assertHasNoFormErrors();
|
||||
|
||||
$package = $this->property->specialOffers()->where('name', 'Ostsee-Woche')->sole();
|
||||
$gap = $this->property->specialOffers()->where('name', 'Kurzfristige Lücke')->sole();
|
||||
$this->assertSame([OfferKind::FixedDates, 49900, '2026-11-07', '2026-11-14', true, 5], [$package->kind, $package->discount_value, $package->stay_from->toDateString(), $package->stay_until->toDateString(), $package->is_featured, $package->priority]);
|
||||
$this->assertSame([OfferKind::GapFiller, 4, true], [$gap->kind, $gap->max_gap_nights, $gap->waives_min_stay]);
|
||||
}
|
||||
|
||||
public function test_blocked_period_is_created(): void
|
||||
{
|
||||
Livewire::test(BlockedPeriodsRelationManager::class, ['ownerRecord' => $this->property, 'pageClass' => EditProperty::class])
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Enums\DiscountType;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Property;
|
||||
use App\Models\Season;
|
||||
use App\Models\SpecialOffer;
|
||||
use App\Pricing\AdvertisedOffer;
|
||||
use App\Pricing\OfferShowcase;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Database\Seeders\PropertySeeder;
|
||||
use Database\Seeders\SiteSeeder;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
class OfferShowcaseTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
private Property $property;
|
||||
|
||||
private CarbonImmutable $now;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->now = CarbonImmutable::parse('2026-02-01 10:00');
|
||||
$this->property = Property::factory()->create(['cleaning_fee' => 10000, 'included_guests' => 2]);
|
||||
Season::factory()->for($this->property)->create(['name' => 'Winter', 'starts_on' => '2026-01-03', 'ends_on' => '2026-06-01', 'nightly_rate' => 5000, 'min_nights' => 3]);
|
||||
}
|
||||
|
||||
public function test_only_public_offers_without_code_in_their_booking_window_are_shown(): void
|
||||
{
|
||||
$this->offer(['name' => 'Ab 3 Nächten', 'min_nights' => 3]);
|
||||
$this->offer(['name' => 'Intern', 'is_public' => false]);
|
||||
$this->offer(['name' => 'Stammgast', 'code' => 'OSTSEE']);
|
||||
$this->offer(['name' => 'Abgelaufen', 'bookable_until' => '2026-01-31 23:59']);
|
||||
$this->offer(['name' => 'Vorbei', 'stay_until' => '2026-01-20']);
|
||||
$this->offer(['name' => 'Inaktiv', 'is_active' => false]);
|
||||
|
||||
$this->assertSame(['Ab 3 Nächten'], $this->titles());
|
||||
}
|
||||
|
||||
public function test_highlighted_offers_come_first_then_priority(): void
|
||||
{
|
||||
$this->offer(['name' => 'Normal', 'priority' => 0]);
|
||||
$this->offer(['name' => 'Wichtig', 'priority' => 5]);
|
||||
$this->offer(['name' => 'Hervorgehoben', 'is_featured' => true]);
|
||||
|
||||
$this->assertSame(['Hervorgehoben', 'Wichtig', 'Normal'], $this->titles());
|
||||
$this->assertSame(['Hervorgehoben'], $this->showcase()->current($this->property, $this->now, featuredOnly: true)->map(fn (AdvertisedOffer $offer): string => $offer->title)->all());
|
||||
}
|
||||
|
||||
public function test_fixed_dates_are_advertised_with_their_price_only_while_free(): void
|
||||
{
|
||||
$this->offer([
|
||||
'name' => 'Ostsee-Woche',
|
||||
'kind' => OfferKind::FixedDates,
|
||||
'stay_from' => '2026-03-07',
|
||||
'stay_until' => '2026-03-14',
|
||||
'discount_type' => DiscountType::FixedStayPrice,
|
||||
'discount_value' => 29900,
|
||||
]);
|
||||
|
||||
$advertised = $this->showcase()->current($this->property, $this->now)->sole();
|
||||
|
||||
$this->assertSame('2026-03-07', $advertised->arrival->toDateString());
|
||||
$this->assertSame(29900 + 10000, $advertised->quote->total());
|
||||
$this->assertSame(7 * 5000 + 10000, $advertised->regularTotal());
|
||||
$this->assertStringContainsString('anreise=2026-03-07', $advertised->bookingUrl());
|
||||
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-03-10', 'ends_on' => '2026-03-12']);
|
||||
|
||||
$this->assertSame([], $this->titles());
|
||||
}
|
||||
|
||||
public function test_gap_filler_advertises_each_gap_found_in_the_calendar(): void
|
||||
{
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-05', 'ends_on' => '2026-02-10']);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-12', 'ends_on' => '2026-02-20']);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-23', 'ends_on' => '2026-03-01']);
|
||||
$this->offer(['name' => 'Lückenfüller', 'kind' => OfferKind::GapFiller, 'max_gap_nights' => 4, 'waives_min_stay' => true, 'discount_value' => 20]);
|
||||
|
||||
$gaps = $this->showcase()->current($this->property, $this->now)
|
||||
->map(fn (AdvertisedOffer $offer): string => $offer->arrival->format('d.m.').'–'.$offer->departure->format('d.m.'))
|
||||
->all();
|
||||
|
||||
$this->assertSame(['10.02.–12.02.', '20.02.–23.02.'], $gaps);
|
||||
}
|
||||
|
||||
public function test_gap_below_minimum_stay_is_not_advertised_unless_the_offer_waives_it(): void
|
||||
{
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-05', 'ends_on' => '2026-02-10']);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-12', 'ends_on' => '2026-02-20']);
|
||||
$this->offer(['name' => 'Lückenfüller', 'kind' => OfferKind::GapFiller, 'max_gap_nights' => 4, 'discount_value' => 20]);
|
||||
|
||||
$this->assertSame([], $this->titles());
|
||||
}
|
||||
|
||||
public function test_offers_section_shows_the_advertised_offers_on_the_website(): void
|
||||
{
|
||||
$this->travelTo($this->now);
|
||||
$this->property->delete();
|
||||
$this->seed([PropertySeeder::class, SiteSeeder::class]);
|
||||
SpecialOffer::factory()->for(Property::query()->sole())->create(['name' => 'Ab 3 Nächten −10 %', 'min_nights' => 3, 'discount_value' => 10]);
|
||||
|
||||
$this->withoutVite()
|
||||
->get(route('booking.create'))
|
||||
->assertOk()
|
||||
->assertSee('Ab 3 Nächten −10 %')
|
||||
->assertSee('ab 3 Nächten');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<string>
|
||||
*/
|
||||
private function titles(): array
|
||||
{
|
||||
return $this->showcase()->current($this->property, $this->now)->map(fn (AdvertisedOffer $offer): string => $offer->title)->all();
|
||||
}
|
||||
|
||||
private function showcase(): OfferShowcase
|
||||
{
|
||||
return app(OfferShowcase::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $attributes
|
||||
*/
|
||||
private function offer(array $attributes): SpecialOffer
|
||||
{
|
||||
return SpecialOffer::factory()->for($this->property)->create($attributes);
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,13 @@
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Enums\DiscountType;
|
||||
use App\Enums\OfferKind;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Property;
|
||||
use App\Models\Season;
|
||||
use App\Models\SpecialOffer;
|
||||
use App\Pricing\PriceCalculator;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\StayRequest;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
@@ -118,6 +121,59 @@ public function test_deposit_is_calculated_on_the_discounted_rent(): void
|
||||
$this->assertSame(20000 - 2000 + 10000, $quote->total());
|
||||
}
|
||||
|
||||
public function test_from_three_nights_ten_percent(): void
|
||||
{
|
||||
$this->offer(['name' => 'Ab 3 Nächten', 'min_nights' => 3, 'discount_value' => 10]);
|
||||
|
||||
$this->assertSame(0, $this->calculator->calculate($this->property, $this->stay('2026-02-10', '2026-02-12'))->discount());
|
||||
$this->assertSame(1500, $this->calculator->calculate($this->property, $this->stay('2026-02-10', '2026-02-13'))->discount());
|
||||
}
|
||||
|
||||
public function test_fixed_dates_package_applies_only_to_exactly_these_dates(): void
|
||||
{
|
||||
$this->offer([
|
||||
'name' => 'Ostsee-Woche',
|
||||
'kind' => OfferKind::FixedDates,
|
||||
'stay_from' => '2026-02-07',
|
||||
'stay_until' => '2026-02-14',
|
||||
'discount_type' => DiscountType::FixedStayPrice,
|
||||
'discount_value' => 29900,
|
||||
]);
|
||||
|
||||
$exact = $this->calculator->calculate($this->property, $this->stay('2026-02-07', '2026-02-14'));
|
||||
$shifted = $this->calculator->calculate($this->property, $this->stay('2026-02-08', '2026-02-14'));
|
||||
|
||||
$this->assertSame(7 * 5000 - 29900, $exact->discount());
|
||||
$this->assertSame(29900 + 10000, $exact->total());
|
||||
$this->assertSame(0, $shifted->discount());
|
||||
}
|
||||
|
||||
public function test_gap_filler_applies_inside_a_short_gap_and_may_waive_the_minimum_stay(): void
|
||||
{
|
||||
$this->property->seasons()->update(['min_nights' => 5]);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-01', 'ends_on' => '2026-02-10']);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-13', 'ends_on' => '2026-02-20']);
|
||||
$this->offer(['name' => 'Lückenfüller', 'kind' => OfferKind::GapFiller, 'max_gap_nights' => 4, 'waives_min_stay' => true, 'discount_value' => 20]);
|
||||
|
||||
$inGap = $this->calculator->calculate($this->property, $this->stay('2026-02-10', '2026-02-13'));
|
||||
|
||||
$this->assertSame(3000, $inGap->discount());
|
||||
$this->expectException(QuoteException::class);
|
||||
$this->calculator->calculate($this->property, $this->stay('2026-02-21', '2026-02-24'));
|
||||
}
|
||||
|
||||
public function test_gap_filler_ignores_gaps_longer_than_allowed_and_open_ended_free_periods(): void
|
||||
{
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-01', 'ends_on' => '2026-02-10']);
|
||||
BlockedPeriod::factory()->for($this->property)->create(['starts_on' => '2026-02-20', 'ends_on' => '2026-02-25']);
|
||||
$this->offer(['name' => 'Lückenfüller', 'kind' => OfferKind::GapFiller, 'max_gap_nights' => 4, 'discount_value' => 20]);
|
||||
|
||||
$longGap = $this->calculator->calculate($this->property, $this->stay('2026-02-10', '2026-02-13'));
|
||||
$openEnded = $this->calculator->calculate($this->property, $this->stay('2026-02-25', '2026-02-28'));
|
||||
|
||||
$this->assertSame([0, 0], [$longGap->discount(), $openEnded->discount()]);
|
||||
}
|
||||
|
||||
public function test_inactive_offers_are_ignored(): void
|
||||
{
|
||||
$this->offer(['is_active' => false]);
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
use App\Enums\UserRole;
|
||||
use App\Filament\Resources\Appearances\AppearanceResource;
|
||||
use App\Filament\Resources\Appearances\Pages\CreateAppearance;
|
||||
use App\Filament\Resources\Appearances\Pages\EditAppearance;
|
||||
use App\Filament\Resources\Pages\PageResource;
|
||||
use App\Filament\Resources\Pages\Pages\EditPage;
|
||||
use App\Filament\Resources\Sites\SiteResource;
|
||||
@@ -25,6 +26,8 @@
|
||||
use Database\Seeders\SiteSeeder;
|
||||
use Database\Seeders\WebsiteContentSeeder;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Livewire\Livewire;
|
||||
use PHPUnit\Framework\Attributes\DataProvider;
|
||||
@@ -211,6 +214,70 @@ public function test_content_editor_manages_pages_and_appearances(): void
|
||||
$this->assertSame('Ostern', $this->site->appearanceOn(CarbonImmutable::parse('2027-04-01'))->name);
|
||||
}
|
||||
|
||||
public function test_placed_sections_get_stable_ids_and_copies_get_new_ones(): void
|
||||
{
|
||||
$page = $this->site->pages()->where('slug', 'start')->sole();
|
||||
$ids = array_map(fn (array $section): string => $section['data']['id'], $page->sections);
|
||||
|
||||
$this->assertCount(count($page->sections), array_unique($ids));
|
||||
|
||||
$page->update(['sections' => [...$page->sections, $page->sections[0]]]);
|
||||
|
||||
$this->assertSame($ids, array_slice(array_map(fn (array $section): string => $section['data']['id'], $page->fresh()->sections), 0, count($ids)));
|
||||
$this->assertNotSame($ids[0], last($page->fresh()->sections)['data']['id']);
|
||||
}
|
||||
|
||||
public function test_section_can_be_limited_to_an_appearance(): void
|
||||
{
|
||||
$christmas = $this->site->appearances()->where('name', 'Weihnachten')->sole();
|
||||
$page = $this->site->pages()->where('slug', 'start')->sole();
|
||||
$page->update(['sections' => [...$page->sections, ['type' => 'text_image', 'data' => ['heading' => 'Adventsmarkt am Hafen', 'appearances' => [(string) $christmas->id]]]]]);
|
||||
|
||||
$this->get('/')->assertOk()->assertDontSee('Adventsmarkt am Hafen');
|
||||
|
||||
$this->travelTo(CarbonImmutable::parse('2026-12-20 10:00'));
|
||||
$this->get('/')->assertOk()->assertSee('Adventsmarkt am Hafen');
|
||||
}
|
||||
|
||||
public function test_appearance_sets_seasonal_photos_per_section(): void
|
||||
{
|
||||
Storage::fake('public');
|
||||
$summerPhoto = Photo::factory()->create(['alt_text' => 'Strand im Sommer', 'sort_order' => 1]);
|
||||
$summerPhoto->addMedia(UploadedFile::fake()->image('sommer.jpg', 1600, 1000))->toMediaCollection(Photo::COLLECTION);
|
||||
$winterPhoto = Photo::factory()->create(['alt_text' => 'Raue See im Winter', 'sort_order' => 99]);
|
||||
$winterPhoto->addMedia(UploadedFile::fake()->image('winter.jpg', 1600, 1000))->toMediaCollection(Photo::COLLECTION);
|
||||
|
||||
$page = $this->site->pages()->where('slug', 'start')->sole();
|
||||
$cta = collect($page->sections)->firstWhere('type', 'cta');
|
||||
$winter = $this->site->appearances()->where('name', 'Winter')->sole();
|
||||
$winter->update(['section_photos' => [$cta['data']['id'] => ['photo_id' => $winterPhoto->id]]]);
|
||||
|
||||
$this->get('/')->assertOk()->assertDontSee('Raue See im Winter');
|
||||
|
||||
$this->travelTo(CarbonImmutable::parse('2026-11-15 10:00'));
|
||||
$this->get('/')->assertOk()->assertSee('Raue See im Winter');
|
||||
}
|
||||
|
||||
public function test_appearance_form_lists_the_sections_with_photos(): void
|
||||
{
|
||||
$this->actingAs(User::factory()->role(UserRole::Content)->create());
|
||||
$winter = $this->site->appearances()->where('name', 'Winter')->sole();
|
||||
$photo = Photo::factory()->create(['alt_text' => 'Strand im Schnee']);
|
||||
$cta = collect($this->site->pages()->where('slug', 'start')->sole()->sections)->firstWhere('type', 'cta');
|
||||
|
||||
$this->get(AppearanceResource::getUrl('edit', ['record' => $winter]))
|
||||
->assertOk()
|
||||
->assertSee('Bilder je Baustein')
|
||||
->assertSee('Abschluss');
|
||||
|
||||
Livewire::test(EditAppearance::class, ['record' => $winter->getRouteKey()])
|
||||
->set("data.section_photos.{$cta['data']['id']}.photo_id", $photo->id)
|
||||
->call('save')
|
||||
->assertHasNoFormErrors();
|
||||
|
||||
$this->assertSame($photo->id, (int) $winter->fresh()->section_photos[$cta['data']['id']]['photo_id']);
|
||||
}
|
||||
|
||||
public function test_invalid_day_is_rejected(): void
|
||||
{
|
||||
$this->actingAs(User::factory()->create());
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Models\Site;
|
||||
use App\Themes\ThemeChecker;
|
||||
use App\Themes\ThemeRegistry;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Database\Seeders\PropertySeeder;
|
||||
use Database\Seeders\SiteSeeder;
|
||||
use Database\Seeders\WebsiteContentSeeder;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Tests\TestCase;
|
||||
|
||||
class ThemeToolingTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
private string $themesPath;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->travelTo(CarbonImmutable::parse('2026-10-22 10:00'));
|
||||
$this->seed([PropertySeeder::class, WebsiteContentSeeder::class, SiteSeeder::class]);
|
||||
$this->themesPath = storage_path('framework/testing/theme-tooling');
|
||||
File::deleteDirectory($this->themesPath);
|
||||
File::ensureDirectoryExists($this->themesPath);
|
||||
config(['themes.paths' => [$this->themesPath, resource_path('themes')]]);
|
||||
app()->forgetInstance(ThemeRegistry::class);
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
File::deleteDirectory($this->themesPath);
|
||||
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
public function test_installed_themes_fulfil_the_theme_contract(): void
|
||||
{
|
||||
config(['themes.paths' => [resource_path('themes')]]);
|
||||
app()->forgetInstance(ThemeRegistry::class);
|
||||
|
||||
$this->artisan('themes:check')->assertSuccessful();
|
||||
}
|
||||
|
||||
public function test_new_theme_is_created_next_to_the_existing_ones_and_passes_the_check(): void
|
||||
{
|
||||
$this->artisan('themes:make', ['key' => 'ostsee-nacht', '--name' => 'Ostsee-Nacht'])->assertSuccessful();
|
||||
app()->forgetInstance(ThemeRegistry::class);
|
||||
|
||||
$registry = app(ThemeRegistry::class);
|
||||
$theme = $registry->get('ostsee-nacht');
|
||||
|
||||
$this->assertSame(['ostsee-nacht', 'ostsee-licht'], array_map(fn ($manifest) => $manifest->key, $registry->chain('ostsee-nacht')));
|
||||
$this->assertArrayHasKey('ostsee-nacht', $registry->options());
|
||||
$this->assertSame(array_keys($registry->tokens('ostsee-licht')), array_keys($theme->tokens));
|
||||
$this->assertSame([], app(ThemeChecker::class)->check($theme)['errors']);
|
||||
$this->assertFileExists(resource_path('themes/ostsee-licht/theme.json'), 'the base theme stays untouched');
|
||||
|
||||
$this->artisan('themes:make', ['key' => 'ostsee-nacht'])->assertFailed();
|
||||
}
|
||||
|
||||
public function test_checker_reports_contract_violations(): void
|
||||
{
|
||||
$this->artisan('themes:make', ['key' => 'kaputt'])->assertSuccessful();
|
||||
$path = $this->themesPath.'/kaputt';
|
||||
$manifest = json_decode(File::get($path.'/theme.json'), true);
|
||||
$manifest['tokens']['muted']['default'] = '#CCCCCC';
|
||||
File::put($path.'/theme.json', json_encode($manifest));
|
||||
File::put($path.'/views/sections/booking.blade.php', '<section class="bg-blue-700">{{ $heading }}</section>');
|
||||
File::put($path.'/views/sections/text-image.blade.php', '<section></section>');
|
||||
File::put($path.'/theme.css', File::get($path.'/theme.css')."\n@import url('https://fonts.googleapis.com/css2?family=Inter');\n");
|
||||
app()->forgetInstance(ThemeRegistry::class);
|
||||
|
||||
$errors = implode("\n", app(ThemeChecker::class)->check(app(ThemeRegistry::class)->get('kaputt'))['errors']);
|
||||
|
||||
$this->assertStringContainsString('Kalender/Anfrage fehlt', $errors);
|
||||
$this->assertStringContainsString('feste Farbe „bg-blue-700“', $errors);
|
||||
$this->assertStringContainsString('unbekannter Baustein', $errors);
|
||||
$this->assertStringContainsString('fonts.googleapis', $errors);
|
||||
$this->assertStringContainsString('Kontrast muted auf ground', $errors);
|
||||
$this->artisan('themes:check', ['theme' => 'kaputt'])->assertFailed();
|
||||
}
|
||||
|
||||
public function test_contrast_follows_wcag(): void
|
||||
{
|
||||
$this->assertSame(21.0, ThemeChecker::contrast('#000000', '#FFFFFF'));
|
||||
$this->assertGreaterThan(4.5, ThemeChecker::contrast('#4E5C66', '#F6F2EA'));
|
||||
$this->assertLessThan(4.5, ThemeChecker::contrast('#999', '#FFF'));
|
||||
}
|
||||
|
||||
public function test_signed_preview_shows_the_site_with_another_theme_without_switching(): void
|
||||
{
|
||||
$this->artisan('themes:make', ['key' => 'ostsee-nacht', '--name' => 'Ostsee-Nacht'])->assertSuccessful();
|
||||
File::put($this->themesPath.'/ostsee-nacht/views/sections/facts.blade.php', '<section aria-label="{{ $sectionId }}">Eckdaten im neuen Theme</section>');
|
||||
app()->forgetInstance(ThemeRegistry::class);
|
||||
$this->withoutVite();
|
||||
|
||||
$this->get(URL::temporarySignedRoute('home', now()->addHour(), ['theme' => 'ostsee-nacht']))
|
||||
->assertOk()
|
||||
->assertSee('Eckdaten im neuen Theme')
|
||||
->assertSee('Theme „Ostsee-Nacht“')
|
||||
->assertSee('<meta name="robots" content="noindex">', false);
|
||||
|
||||
$this->get('/?theme=ostsee-nacht')->assertOk()->assertDontSee('Eckdaten im neuen Theme');
|
||||
$this->assertSame('ostsee-licht', Site::sole()->theme);
|
||||
|
||||
$this->artisan('themes:preview', ['theme' => 'ostsee-nacht'])
|
||||
->expectsOutputToContain('Die Wohnung')
|
||||
->expectsOutputToContain('Weihnachten:')
|
||||
->assertSuccessful();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user