From 791786ed3e01b10d091b9dd2a62975a2ed717e03 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 29 Oct 2026 18:53:56 +0100 Subject: [PATCH] Saisonfotos am Foto statt am Erscheinungsbild Ein Foto gehoert zu keinem (ganzjaehrig) oder mehreren Erscheinungsbildern und erscheint nur dort, vor den ganzjaehrigen Fotos. Bausteine waehlen "automatisch" oder eine eigene Auswahl; Titelbereich und Abschluss zeigen das erste passende Foto ihrer Liste. Titelbild und "Bilder je Baustein" des Erscheinungsbilds werden in die Bausteine uebernommen und entfallen dort. Co-Authored-By: Claude Opus 5.5 --- app/Filament/Forms/Components/PhotoSelect.php | 3 +- .../Appearances/Schemas/AppearanceForm.php | 79 +++--------- .../Resources/Photos/Schemas/PhotoForm.php | 21 ++++ .../Resources/Photos/Tables/PhotosTable.php | 36 ++++++ app/Http/Controllers/PageController.php | 8 +- app/Models/Appearance.php | 50 ++++++-- app/Models/Photo.php | 58 ++++++++- app/Themes/Sections/CallToActionSection.php | 11 +- app/Themes/Sections/GallerySection.php | 15 +-- app/Themes/Sections/HeroSection.php | 14 +-- app/Themes/Sections/LocationSection.php | 13 +- app/Themes/Sections/Section.php | 112 +++++++++--------- app/Themes/Sections/TextImageSection.php | 10 +- app/Themes/Theme.php | 37 ++---- ...10_29_184538_give_photos_their_seasons.php | 101 ++++++++++++++++ docs/KONZEPT.md | 4 +- docs/STATUS.md | 2 +- docs/THEMES.md | 12 +- docs/ZUSAMMENARBEIT.md | 1 + docs/architecture/webseite.md | 2 +- tests/Feature/ThemeSystemTest.php | 95 +++++++++++---- 21 files changed, 449 insertions(+), 235 deletions(-) create mode 100644 database/migrations/2026_10_29_184538_give_photos_their_seasons.php diff --git a/app/Filament/Forms/Components/PhotoSelect.php b/app/Filament/Forms/Components/PhotoSelect.php index c1f0b52..a727a38 100644 --- a/app/Filament/Forms/Components/PhotoSelect.php +++ b/app/Filament/Forms/Components/PhotoSelect.php @@ -40,7 +40,8 @@ public static function optionLabel(Photo $photo): string ? '' : ''; $hidden = $photo->is_published ? '' : ' (ausgeblendet)'; + $seasons = $photo->appearanceNames() === [] ? '' : ' · nur '.e(implode(', ', $photo->appearanceNames())).''; - return ''.$image.''.e($photo->alt_text).$hidden.''; + return ''.$image.''.e($photo->alt_text).$seasons.$hidden.''; } } diff --git a/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php b/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php index 1ed71b2..defcf01 100644 --- a/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php +++ b/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php @@ -2,21 +2,15 @@ namespace App\Filament\Resources\Appearances\Schemas; -use App\Filament\Forms\Components\PhotoSelect; use App\Models\Appearance; -use App\Models\Page; +use App\Models\Photo; use App\Models\Site; -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; @@ -45,18 +39,11 @@ 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('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).') + Section::make('Bilder') + ->description('Welche Fotos in diesem Erscheinungsbild erscheinen, legen Sie beim Foto fest: Webseite › Fotos › „Zeigen in“. Ein Foto kann zu mehreren Erscheinungsbildern gehören; Fotos ohne Angabe erscheinen ganzjährig.') ->schema([ - PhotoSelect::make('hero_photo_id') - ->label('Titelbild') - ->placeholder('Bild der Seite verwenden'), + Text::make(fn (?Appearance $record): string => self::photoSummary($record)), ]), - 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) @@ -75,57 +62,21 @@ 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[
][]. - * - * @return list + * How many photos are made for this appearance. */ - public static function sectionPhotoFields(int|string|null $siteId): array + public static function photoSummary(?Appearance $appearance): string { - $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); - } + if ($appearance === null) { + return 'Nach dem Speichern können Sie Fotos diesem Erscheinungsbild zuordnen.'; } - return $groups ?: [Text::make('Auf den Seiten gibt es noch keine Bausteine mit Bildern.')]; + $count = Photo::query()->get(['id', 'appearance_ids'])->filter(fn (Photo $photo): bool => $photo->isMadeFor($appearance))->count(); + + return match ($count) { + 0 => 'Noch keine Fotos zugeordnet – es erscheinen die ganzjährigen Fotos.', + 1 => '1 Foto ist diesem Erscheinungsbild zugeordnet.', + default => "{$count} Fotos sind diesem Erscheinungsbild zugeordnet.", + }; } /** diff --git a/app/Filament/Resources/Photos/Schemas/PhotoForm.php b/app/Filament/Resources/Photos/Schemas/PhotoForm.php index 6326622..196d36a 100644 --- a/app/Filament/Resources/Photos/Schemas/PhotoForm.php +++ b/app/Filament/Resources/Photos/Schemas/PhotoForm.php @@ -3,6 +3,7 @@ namespace App\Filament\Resources\Photos\Schemas; use App\Enums\PhotoCategory; +use App\Models\Appearance; use App\Models\Photo; use App\Models\Property; use App\Support\CurrentProperty; @@ -47,9 +48,29 @@ public static function configure(Schema $schema): Schema ->options(fn (): array => Property::query()->pluck('name', 'id')->all()) ->default(fn (): ?int => app(CurrentProperty::class)->id()) ->placeholder('– keine (z. B. Umgebung) –'), + Select::make('appearance_ids') + ->label('Zeigen in') + ->multiple() + ->options(fn (): array => Appearance::photoOptions()) + ->placeholder('ganzjährig') + ->helperText('Leer = ganzjährig. Mit Auswahl erscheint das Foto nur in diesen Erscheinungsbildern – dann vor den ganzjährigen Fotos.') + ->dehydrateStateUsing(fn (?array $state): ?array => self::appearanceIds($state)), Toggle::make('is_published') ->label('Auf der Webseite zeigen') ->default(true), ]); } + + /** + * Selected appearances as integers, null for "all year". + * + * @param array|null $state + * @return list|null + */ + public static function appearanceIds(?array $state): ?array + { + $ids = array_values(array_unique(array_map('intval', array_filter((array) $state)))); + + return $ids === [] ? null : $ids; + } } diff --git a/app/Filament/Resources/Photos/Tables/PhotosTable.php b/app/Filament/Resources/Photos/Tables/PhotosTable.php index c7b495c..758a189 100644 --- a/app/Filament/Resources/Photos/Tables/PhotosTable.php +++ b/app/Filament/Resources/Photos/Tables/PhotosTable.php @@ -3,17 +3,23 @@ namespace App\Filament\Resources\Photos\Tables; use App\Enums\PhotoCategory; +use App\Filament\Resources\Photos\Schemas\PhotoForm; +use App\Models\Appearance; use App\Models\Photo; +use Filament\Actions\BulkAction; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteAction; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; +use Filament\Forms\Components\Select; use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\Layout\Stack; use Filament\Tables\Columns\SpatieMediaLibraryImageColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Filters\SelectFilter; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; class PhotosTable { @@ -36,6 +42,12 @@ public static function configure(Table $table): Table ->searchable(), TextColumn::make('category') ->badge(), + TextColumn::make('appearance_ids') + ->label('Zeigen in') + ->state(fn (Photo $record): array => $record->appearanceNames()) + ->badge() + ->color('warning') + ->icon('heroicon-m-sun'), IconColumn::make('is_published') ->boolean() ->trueIcon('heroicon-o-eye') @@ -46,6 +58,14 @@ public static function configure(Table $table): Table SelectFilter::make('category') ->label('Kategorie') ->options(PhotoCategory::class), + SelectFilter::make('season') + ->label('Zeigen in') + ->options(fn (): array => ['all_year' => 'ganzjährig', ...Appearance::photoOptions()]) + ->query(fn (Builder $query, array $data): Builder => match (true) { + blank($data['value'] ?? null) => $query, + $data['value'] === 'all_year' => $query->where(fn (Builder $query) => $query->whereNull('appearance_ids')->orWhereJsonLength('appearance_ids', 0)), + default => $query->whereJsonContains('appearance_ids', (int) $data['value']), + }), ]) ->recordActions([ EditAction::make(), @@ -53,6 +73,22 @@ public static function configure(Table $table): Table ]) ->toolbarActions([ BulkActionGroup::make([ + BulkAction::make('seasons') + ->label('Zeigen in …') + ->icon('heroicon-o-sun') + ->schema([ + Select::make('appearance_ids') + ->label('Zeigen in') + ->multiple() + ->options(fn (): array => Appearance::photoOptions()) + ->placeholder('ganzjährig') + ->helperText('Leer = ganzjährig. Ersetzt die bisherige Zuordnung der ausgewählten Fotos.'), + ]) + ->action(function (Collection $records, array $data): void { + $records->each(fn (Photo $photo) => $photo->update(['appearance_ids' => PhotoForm::appearanceIds($data['appearance_ids'] ?? [])])); + }) + ->authorizeIndividualRecords('update') + ->deselectRecordsAfterCompletion(), DeleteBulkAction::make(), ]), ]); diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index dece92b..0a96d21 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -43,8 +43,8 @@ public function show(string $slug): View 'sections' => $this->sections->render($this->theme(), $page->sections), 'title' => $page->isHome() ? null : ($page->seo_title ?: $page->title), 'description' => $page->seo_description ?: ($page->isHome() ? Content::get('seo.home.description') : null), - 'ogImage' => $this->theme()->heroPhoto()?->url('lg') ?: null, - 'structuredData' => $page->isHome() ? $this->structuredData() : null, + 'ogImage' => $this->theme()->sharePhoto($page->sections ?? [])?->url('lg') ?: null, + 'structuredData' => $page->isHome() ? $this->structuredData($page) : null, ]); } @@ -77,7 +77,7 @@ public function robots(): Response * * @return array|null */ - private function structuredData(): ?array + private function structuredData(Page $page): ?array { $property = $this->theme()->property(); if ($property === null) { @@ -89,7 +89,7 @@ private function structuredData(): ?array '@type' => 'VacationRental', 'name' => $property->name, 'url' => route('home'), - 'image' => $this->theme()->heroPhoto()?->url('lg') ?: null, + 'image' => $this->theme()->sharePhoto($page->sections ?? [])?->url('lg') ?: null, 'address' => ['@type' => 'PostalAddress', 'streetAddress' => str($property->address)->before(',')->trim()->toString(), 'addressLocality' => 'Kühlungsborn', 'postalCode' => '18225', 'addressCountry' => 'DE'], 'containsPlace' => ['@type' => 'Accommodation', 'floorSize' => ['@type' => 'QuantitativeValue', 'value' => $property->size_sqm, 'unitCode' => 'MTK'], 'occupancy' => ['@type' => 'QuantitativeValue', 'maxValue' => $property->max_guests]], 'telephone' => config('fewo.owner.phone'), diff --git a/app/Models/Appearance.php b/app/Models/Appearance.php index 323d672..247313c 100644 --- a/app/Models/Appearance.php +++ b/app/Models/Appearance.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Models\Concerns\BelongsToTenant; +use App\Tenancy\TenantContext; use Carbon\CarbonInterface; use Database\Factories\AppearanceFactory; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -11,12 +12,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * A seasonal look of a site (e.g. summer, winter, Christmas, New Year's Eve): colour tokens, hero photo, - * photos per section, texts and banner change – the page structure does not (sections may be limited to + * A seasonal look of a site (e.g. summer, winter, Christmas, New Year's Eve): colour tokens, texts and banner + * change, photos made for it (Photo::appearance_ids) are shown – 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', 'section_photos'])] +#[Fillable(['site_id', 'name', 'starts_md', 'ends_md', 'priority', 'is_default', 'is_active', 'tokens', 'overrides'])] class Appearance extends Model { /** @use HasFactory */ @@ -48,7 +49,6 @@ protected function casts(): array 'is_active' => 'boolean', 'tokens' => 'array', 'overrides' => 'array', - 'section_photos' => 'array', ]; } @@ -61,11 +61,47 @@ public function site(): BelongsTo } /** - * @return BelongsTo + * Names by id of the landlord's appearances, loaded once per request and landlord. + * + * @return array */ - public function heroPhoto(): BelongsTo + public static function names(): array { - return $this->belongsTo(Photo::class, 'hero_photo_id'); + // once() keys its cache by the closure's bound variables, so each landlord gets its own entry. + $tenantId = app(TenantContext::class)->id(); + + return once(function (): array { + return self::query()->pluck('name', 'id')->all(); + }); + } + + /** + * Choices for "Zeigen in" at the photos, e.g. "Winter · 01.11.–31.03."; with several websites prefixed by the website. + * + * @return array + */ + public static function photoOptions(): array + { + $appearances = self::query()->with('site')->orderByDesc('is_default')->orderBy('starts_md')->orderBy('name')->get(); + $severalSites = $appearances->pluck('site_id')->unique()->count() > 1; + + return $appearances->mapWithKeys(fn (Appearance $appearance): array => [ + $appearance->id => ($severalSites ? $appearance->site?->name.': ' : '').$appearance->periodLabel(), + ])->all(); + } + + /** + * "Winter · 01.11.–31.03.", "Standard · wenn kein Zeitraum passt". + */ + public function periodLabel(): string + { + if ($this->starts_md === null || $this->ends_md === null) { + return $this->name.($this->is_default ? ' · wenn kein Zeitraum passt' : ''); + } + + $day = fn (string $monthDay): string => substr($monthDay, 3, 2).'.'.substr($monthDay, 0, 2).'.'; + + return $this->name.' · '.$day($this->starts_md).'–'.$day($this->ends_md); } public function covers(CarbonInterface $date): bool diff --git a/app/Models/Photo.php b/app/Models/Photo.php index 8f75e2f..70cc159 100644 --- a/app/Models/Photo.php +++ b/app/Models/Photo.php @@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection as EloquentCollection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -18,8 +19,10 @@ /** * A website photo. The uploaded original is kept; web sizes are generated as WebP on upload. + * A photo may belong to appearances (seasons such as summer, winter, Christmas): then it is only shown while + * one of them is in effect, and ahead of the all-year photos. Without appearances it is shown all year. */ -#[Fillable(['property_id', 'category', 'alt_text', 'caption', 'is_published', 'sort_order'])] +#[Fillable(['property_id', 'category', 'appearance_ids', 'alt_text', 'caption', 'is_published', 'sort_order'])] class Photo extends Model implements HasMedia { /** @use HasFactory */ @@ -39,6 +42,7 @@ protected function casts(): array { return [ 'category' => PhotoCategory::class, + 'appearance_ids' => 'array', 'is_published' => 'boolean', ]; } @@ -107,6 +111,58 @@ protected function forProperty(Builder $query, ?Property $property): Builder : $query->where(fn (Builder $query) => $query->where('property_id', $property->id)->orWhereNull('property_id')); } + /** + * Photos picked automatically: published, of the apartment and those without one, never plans, fitting the + * season – photos made for the appearance in effect first, then the all-year photos in their order. + * + * @return EloquentCollection + */ + public static function automatic(?Property $property, ?Appearance $appearance, ?PhotoCategory $category = null): EloquentCollection + { + return self::query()->published()->forGalleries()->forProperty($property)->with('media') + ->when($category, fn (Builder $query) => $query->where('category', $category)) + ->get() + ->filter(fn (Photo $photo): bool => $photo->fitsSeason($appearance)) + ->sortBy(fn (Photo $photo): int => $photo->isMadeFor($appearance) ? 0 : 1) + ->values(); + } + + /** + * Appearance ids as integers (the form may deliver strings). + * + * @return list + */ + public function appearanceIds(): array + { + return array_values(array_unique(array_map('intval', array_filter((array) $this->appearance_ids)))); + } + + /** + * Whether the photo may be shown while this appearance is in effect: all-year photos always, seasonal ones in their seasons. + */ + public function fitsSeason(?Appearance $appearance): bool + { + return $this->appearanceIds() === [] || $this->isMadeFor($appearance); + } + + /** + * Whether the photo was chosen for this appearance (seasonal photos come first while it is in effect). + */ + public function isMadeFor(?Appearance $appearance): bool + { + return $appearance !== null && in_array($appearance->id, $this->appearanceIds(), true); + } + + /** + * Names of the appearances the photo is made for (empty = all year). + * + * @return list + */ + public function appearanceNames(): array + { + return array_values(array_intersect_key(Appearance::names(), array_flip($this->appearanceIds()))); + } + public function url(string $size = 'md'): string { return $this->getFirstMediaUrl(self::COLLECTION, $size); diff --git a/app/Themes/Sections/CallToActionSection.php b/app/Themes/Sections/CallToActionSection.php index 3ead6c1..2e4f7d2 100644 --- a/app/Themes/Sections/CallToActionSection.php +++ b/app/Themes/Sections/CallToActionSection.php @@ -2,7 +2,6 @@ namespace App\Themes\Sections; -use App\Models\Photo; use App\Themes\Theme; use Filament\Forms\Components\Textarea; use Filament\Forms\Components\TextInput; @@ -32,23 +31,19 @@ public static function schema(): array return [ TextInput::make('title')->label('Überschrift')->required()->maxLength(160), Textarea::make('text')->label('Text')->rows(2), - static::photoSelect('photo_id', 'Hintergrundfoto'), + static::photoSelect('photo_ids', 'Hintergrundfotos', multiple: true) + ->helperText('Gezeigt wird das erste, das zum Erscheinungsbild passt. '.self::SEASON_HINT), TextInput::make('button_label')->label('Button-Text')->default('Belegung & Preise')->maxLength(60), static::pageSelect('button_page', 'Button führt zu'), ]; } - 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' => $this->seasonalPhoto($theme, $data, 'photo_id') ?? (isset($data['photo_id']) ? Photo::find($data['photo_id']) : null), + 'photo' => $this->chosenPhotos($theme, $data['photo_ids'] ?? [])->first(), 'buttonLabel' => $data['button_label'] ?? 'Belegung & Preise', 'buttonUrl' => $this->pageUrl($data['button_page'] ?? null) ?? route('booking.create'), ]; diff --git a/app/Themes/Sections/GallerySection.php b/app/Themes/Sections/GallerySection.php index b7d7b41..20c18f9 100644 --- a/app/Themes/Sections/GallerySection.php +++ b/app/Themes/Sections/GallerySection.php @@ -3,10 +3,10 @@ namespace App\Themes\Sections; use App\Enums\PhotoCategory; -use App\Models\Photo; use App\Themes\Theme; use Filament\Forms\Components\Select; use Filament\Forms\Components\TextInput; +use Filament\Schemas\Components\Utilities\Get; /** * Photo gallery of one category (or all), opened in a lightbox. @@ -32,26 +32,19 @@ public static function schema(): array { return [ TextInput::make('heading')->label('Überschrift')->maxLength(120), - Select::make('category')->label('Bilder')->options(['all' => 'Alle', ...collect(PhotoCategory::forGalleries())->mapWithKeys(fn (PhotoCategory $category): array => [$category->value => $category->getLabel()])->all()])->default('all'), + ...static::photoSourceFields('Automatisch nach Kategorie'), + Select::make('category')->label('Kategorie')->visible(fn (Get $get): bool => $get('photo_source') !== 'selection')->options(['all' => 'Alle', ...collect(PhotoCategory::forGalleries())->mapWithKeys(fn (PhotoCategory $category): array => [$category->value => $category->getLabel()])->all()])->default('all'), TextInput::make('limit')->label('Anzahl (leer = alle)')->integer()->minValue(1), ]; } - 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' => $this->withSeasonalPhotos($theme, $data, 'photo_ids', Photo::query()->published()->forGalleries()->forProperty($theme->property())->with('media') - ->when($category, fn ($query) => $query->where('category', $category)) - ->when(filled($data['limit'] ?? null), fn ($query) => $query->limit((int) $data['limit'])) - ->get()), + 'photos' => $this->sourcedPhotos($theme, $data, $category, filled($data['limit'] ?? null) ? (int) $data['limit'] : null), ]; } } diff --git a/app/Themes/Sections/HeroSection.php b/app/Themes/Sections/HeroSection.php index 7d9e597..80a5782 100644 --- a/app/Themes/Sections/HeroSection.php +++ b/app/Themes/Sections/HeroSection.php @@ -2,7 +2,6 @@ namespace App\Themes\Sections; -use App\Models\Photo; use App\Pricing\OfferShowcase; use App\Themes\Theme; use Filament\Forms\Components\Textarea; @@ -35,7 +34,8 @@ public static function schema(): array TextInput::make('eyebrow')->label('Kleine Überschrift')->maxLength(100), TextInput::make('title')->label('Überschrift')->helperText('*Wort* wird hervorgehoben (kursiv).')->required()->maxLength(160), Textarea::make('text')->label('Text')->rows(2)->maxLength(400), - static::photoSelect('photo_id', 'Foto (wenn das Erscheinungsbild keins vorgibt)'), + static::photoSelect('photo_ids', 'Fotos', multiple: true) + ->helperText('Gezeigt wird das erste Foto, das zum Erscheinungsbild passt; leer = automatisch ein Foto der Wohnung. '.self::SEASON_HINT), Toggle::make('show_search')->label('Verfügbarkeitssuche anzeigen')->default(true), Toggle::make('show_offer') ->label('Hervorgehobenes Sonderangebot im Titelbereich zeigen') @@ -44,16 +44,8 @@ public static function schema(): array ]; } - 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()->forGalleries()->when($theme->property(), fn ($query, $property) => $query->whereBelongsTo($property))->first() ?? Photo::query()->published()->forGalleries()->first(); $featuredOffer = ($data['show_offer'] ?? true) && $theme->property() ? app(OfferShowcase::class)->current($theme->property(), limit: 1, featuredOnly: true)->first() : null; @@ -62,7 +54,7 @@ public function data(Theme $theme, array $data): array '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' => $this->seasonalPhoto($theme, $data, 'photo_id') ?? $theme->heroPhoto($fallback), + 'photo' => $this->chosenPhotos($theme, $data['photo_ids'] ?? [])->first() ?? $this->automaticPhotos($theme, limit: 1)->first(), 'featuredOffer' => $featuredOffer, 'showSearch' => (bool) ($data['show_search'] ?? true), 'property' => $theme->property(), diff --git a/app/Themes/Sections/LocationSection.php b/app/Themes/Sections/LocationSection.php index 4b64e3f..051dab6 100644 --- a/app/Themes/Sections/LocationSection.php +++ b/app/Themes/Sections/LocationSection.php @@ -3,11 +3,12 @@ namespace App\Themes\Sections; use App\Enums\PhotoCategory; -use App\Models\Photo; use App\Themes\Theme; use Filament\Forms\Components\RichEditor; use Filament\Forms\Components\TextInput; use Filament\Forms\Components\Toggle; +use Filament\Schemas\Components\Group; +use Filament\Schemas\Components\Utilities\Get; /** * Location: text, photos of the area and a map link (no embedded third-party map, so no consent needed). @@ -35,15 +36,11 @@ public static function schema(): array TextInput::make('eyebrow')->label('Kleine Überschrift')->maxLength(100), TextInput::make('heading')->label('Überschrift')->required()->maxLength(160), RichEditor::make('text')->label('Text')->toolbarButtons([['bold', 'italic', 'link'], ['bulletList']]), - Toggle::make('show_photos')->label('Bilder der Umgebung zeigen')->default(true), + Toggle::make('show_photos')->label('Bilder zeigen')->default(true)->live(), + Group::make(static::photoSourceFields('Automatisch: Fotos der Umgebung'))->visible(fn (Get $get): bool => (bool) $get('show_photos')), ]; } - 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; @@ -55,7 +52,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) - ? $this->withSeasonalPhotos($theme, $data, 'photo_ids', Photo::query()->published()->with('media')->where('category', PhotoCategory::Area)->limit(6)->get()) + ? $this->sourcedPhotos($theme, $data, PhotoCategory::Area, 6) : collect(), ]; } diff --git a/app/Themes/Sections/Section.php b/app/Themes/Sections/Section.php index 11d0300..cbdd31e 100644 --- a/app/Themes/Sections/Section.php +++ b/app/Themes/Sections/Section.php @@ -2,13 +2,16 @@ namespace App\Themes\Sections; +use App\Enums\PhotoCategory; use App\Filament\Forms\Components\PhotoSelect; use App\Models\Page; use App\Models\Photo; use App\Themes\Theme; +use Filament\Forms\Components\Radio; use Filament\Forms\Components\RichEditor\RichContentRenderer; use Filament\Forms\Components\Select; use Filament\Schemas\Components\Component; +use Filament\Schemas\Components\Utilities\Get; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\HtmlString; @@ -18,14 +21,8 @@ */ 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'; + /** How photos follow the seasons – shown below every photo choice. */ + public const SEASON_HINT = 'Fotos mit Saison (Webseite › Fotos › „Zeigen in“) erscheinen nur in ihrem Erscheinungsbild, alle anderen ganzjährig.'; abstract public static function key(): string; @@ -49,16 +46,6 @@ public static function schema(): array return []; } - /** - * Photo places an appearance can fill with seasonal photos ("Bilder je Baustein"). - * - * @return array - */ - public static function photoSlots(): array - { - return []; - } - /** * Short text identifying a placed section in admin lists, e.g. its heading. * @@ -108,52 +95,63 @@ protected function photos(?array $ids): Collection } /** - * The seasonal photo the active appearance sets for a single slot of this placed section. + * Chosen photos in the editor's order: published and fitting the season in effect. * - * @param array $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 $data - * @return Collection|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 $data - * @param Collection $automatic + * @param list|null $ids * @return Collection */ - protected function withSeasonalPhotos(Theme $theme, array $data, string $slot, Collection $automatic): Collection + protected function chosenPhotos(Theme $theme, ?array $ids): Collection { - $seasonal = $this->seasonalPhotos($theme, $data, $slot); - if ($seasonal === null) { - return $automatic; + return $this->photos($ids)->filter(fn (Photo $photo): bool => $photo->fitsSeason($theme->appearance))->values(); + } + + /** + * Photos picked automatically for the section's apartment and the season (Photo::automatic). + * + * @return Collection + */ + protected function automaticPhotos(Theme $theme, ?PhotoCategory $category = null, ?int $limit = null): Collection + { + $photos = Photo::automatic($theme->property(), $theme->appearance, $category); + + return $limit !== null ? $photos->take($limit)->values() : $photos; + } + + /** + * Photos of a section that offers "automatisch" or "eigene Auswahl" (fields from photoSourceFields()). + * + * @param array $data + * @return Collection + */ + protected function sourcedPhotos(Theme $theme, array $data, ?PhotoCategory $category = null, ?int $limit = null): Collection + { + if (($data['photo_source'] ?? 'auto') === 'selection') { + $photos = $this->chosenPhotos($theme, $data['photo_ids'] ?? []); + + return $limit !== null ? $photos->take($limit)->values() : $photos; } - if ($theme->sectionPhotoMode($data['id'] ?? null) === 'prepend') { - return $seasonal->merge($automatic)->unique('id')->values(); - } + return $this->automaticPhotos($theme, $category, $limit); + } - return $seasonal; + /** + * "Automatisch" or "Eigene Auswahl" plus the selection field, shown only for a selection. + * + * @return list + */ + protected static function photoSourceFields(string $automaticLabel): array + { + return [ + Radio::make('photo_source') + ->label('Bilder') + ->options(['auto' => $automaticLabel, 'selection' => 'Eigene Auswahl']) + ->default('auto') + ->inline() + ->live(), + static::photoSelect('photo_ids', 'Ausgewählte Bilder', multiple: true) + ->helperText(self::SEASON_HINT) + ->visible(fn (Get $get): bool => $get('photo_source') === 'selection'), + ]; } protected function pageUrl(?string $slug): ?string diff --git a/app/Themes/Sections/TextImageSection.php b/app/Themes/Sections/TextImageSection.php index a5600ee..2fb2120 100644 --- a/app/Themes/Sections/TextImageSection.php +++ b/app/Themes/Sections/TextImageSection.php @@ -33,25 +33,21 @@ public static function schema(): array TextInput::make('eyebrow')->label('Kleine Überschrift')->maxLength(100), TextInput::make('heading')->label('Überschrift')->required()->maxLength(160), RichEditor::make('text')->label('Text')->toolbarButtons([['bold', 'italic', 'link'], ['bulletList', 'orderedList']]), - static::photoSelect('photo_ids', 'Bilder (bis zu 3)', multiple: true)->maxItems(3), + static::photoSelect('photo_ids', 'Bilder', multiple: true)->maxItems(9) + ->helperText('Gezeigt werden die ersten drei, die zum Erscheinungsbild passen. '.self::SEASON_HINT), Select::make('image_position')->label('Bilder')->options(['right' => 'rechts', 'left' => 'links'])->default('right'), TextInput::make('link_label')->label('Link-Text')->maxLength(80), static::pageSelect('link_page', 'Link zur Seite'), ]; } - 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->seasonalPhotos($theme, $data, 'photo_ids') ?? $this->photos($data['photo_ids'] ?? []), + 'photos' => $this->chosenPhotos($theme, $data['photo_ids'] ?? [])->take(3)->values(), 'imagePosition' => $data['image_position'] ?? 'right', 'linkLabel' => $data['link_label'] ?? null, 'linkUrl' => $this->pageUrl($data['link_page'] ?? null), diff --git a/app/Themes/Theme.php b/app/Themes/Theme.php index acc66c2..20c30b6 100644 --- a/app/Themes/Theme.php +++ b/app/Themes/Theme.php @@ -95,35 +95,24 @@ public function text(string $key, ?string $fallback = null): ?string return $this->appearance?->override($key) ?? $fallback; } - 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"). + * Picture for link previews (social media, messengers) and search engines: the first photo of the page's + * title area that fits the season, else an automatic photo of the apartment. * - * @return list + * @param list> $sections the page's placed sections */ - public function sectionPhotoIds(?string $sectionId, string $slot): array + public function sharePhoto(array $sections = []): ?Photo { - if (blank($sectionId) || $this->appearance === null) { - return []; - } + $chosen = collect($sections) + ->filter(fn (array $section): bool => ($section['type'] ?? null) === 'hero') + ->flatMap(fn (array $section): array => (array) ($section['data']['photo_ids'] ?? [])) + ->map(fn ($id): int => (int) $id) + ->all(); + $photos = Photo::query()->published()->whereKey($chosen)->with('media')->get()->keyBy('id'); + $first = collect($chosen)->map(fn (int $id): ?Photo => $photos->get($id)) + ->first(fn (?Photo $photo): bool => $photo?->fitsSeason($this->appearance) ?? false); - $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'; + return $first ?? Photo::automatic($this->property(), $this->appearance)->first(); } public function appearanceKey(): string diff --git a/database/migrations/2026_10_29_184538_give_photos_their_seasons.php b/database/migrations/2026_10_29_184538_give_photos_their_seasons.php new file mode 100644 index 0000000..238ad70 --- /dev/null +++ b/database/migrations/2026_10_29_184538_give_photos_their_seasons.php @@ -0,0 +1,101 @@ +json('appearance_ids')->nullable()->after('category'); + }); + + $pages = DB::table('pages')->get(['id', 'site_id', 'sections']) + ->map(fn (object $page): object => (object) ['id' => $page->id, 'site_id' => $page->site_id, 'sections' => json_decode((string) $page->sections, true) ?: []]); + $tags = []; + + foreach (DB::table('appearances')->get() as $appearance) { + $sitePages = $pages->where('site_id', $appearance->site_id); + $seasonal = ! $appearance->is_default; + + if ($appearance->hero_photo_id !== null) { + if ($seasonal) { + $tags[$appearance->hero_photo_id][] = $appearance->id; + } + foreach ($sitePages as $page) { + foreach ($page->sections as $index => $section) { + if (($section['type'] ?? null) === 'hero') { + $page->sections[$index]['data']['photo_ids'] = $this->prepend([$appearance->hero_photo_id], $section['data']['photo_ids'] ?? []); + } + } + } + } + + foreach (json_decode((string) $appearance->section_photos, true) ?: [] as $sectionId => $slots) { + $ids = collect($slots)->except('mode')->flatten()->filter()->map(fn ($id): int => (int) $id)->all(); + foreach ($seasonal ? $ids : [] as $id) { + $tags[$id][] = $appearance->id; + } + + foreach ($sitePages as $page) { + foreach ($page->sections as $index => $section) { + if (($section['data']['id'] ?? null) === $sectionId && in_array($section['type'] ?? null, ['hero', 'cta', 'text_image'], true)) { + $page->sections[$index]['data']['photo_ids'] = $this->prepend($ids, $section['data']['photo_ids'] ?? []); + } + } + } + } + } + + foreach ($pages as $page) { + foreach ($page->sections as $index => $section) { + if (in_array($section['type'] ?? null, ['hero', 'cta'], true) && array_key_exists('photo_id', $section['data'] ?? [])) { + $legacy = $section['data']['photo_id']; + unset($page->sections[$index]['data']['photo_id']); + $page->sections[$index]['data']['photo_ids'] = array_values(array_unique([...($page->sections[$index]['data']['photo_ids'] ?? []), ...array_filter([(int) $legacy])])); + } + } + DB::table('pages')->where('id', $page->id)->update(['sections' => json_encode($page->sections)]); + } + + foreach ($tags as $photoId => $appearanceIds) { + DB::table('photos')->where('id', $photoId)->update(['appearance_ids' => json_encode(array_values(array_unique($appearanceIds)))]); + } + + Schema::table('appearances', function (Blueprint $table) { + $table->dropConstrainedForeignId('hero_photo_id'); + $table->dropColumn('section_photos'); + }); + } + + public function down(): void + { + Schema::table('appearances', function (Blueprint $table) { + $table->foreignId('hero_photo_id')->nullable()->constrained('photos')->nullOnDelete(); + $table->json('section_photos')->nullable()->after('hero_photo_id'); + }); + + Schema::table('photos', function (Blueprint $table) { + $table->dropColumn('appearance_ids'); + }); + } + + /** + * @param list $first + * @param list $rest + * @return list + */ + private function prepend(array $first, array $rest): array + { + return array_values(array_unique(array_map('intval', [...$first, ...$rest]))); + } +}; diff --git a/docs/KONZEPT.md b/docs/KONZEPT.md index 4f5b939..891a71f 100644 --- a/docs/KONZEPT.md +++ b/docs/KONZEPT.md @@ -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 (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). +- **Saisonale Erscheinungsbilder:** wechseln Fotos (seit 29.10.2026 am Foto festgelegt: „Zeigen in“ mehreren Erscheinungsbildern, leer = ganzjährig), 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. @@ -181,7 +181,7 @@ ## 10. Umsetzungsphasen 1. **Fundament:** Laravel + Filament, Datenmodell, Saisons/Preise, Preisberechnung (mit Tests). ✅ 2. **Kalender & Anfrage:** Belegung, Anfrageformular, Vorreservierung mit Haltezeit, Sonderangebote (Rabattaktion, fester Termin, Lückenfüller), Mindestaufenthalt mit Ausnahmen, Sperrzeiten, Buchungsverwaltung. ✅ 3. **Buchungsworkflow:** Buchungsweg 1 Anfrage → Angebot → Annahme durch den Gast (§6a), Mietvertrag-PDF, Zahlungsfristen & Erinnerungen, Anreiseinfos. ✅ (Mietbedingungen/Storno/Angebotstexte noch als Muster) -4. **Webseite:** Theme-System, Bausteine, Erscheinungsbilder (Bilder je Baustein, saisonale Bausteine), Seiten, SEO, Markengrafiken ✅ · neues Design-Theme in eigener Session (docs/ZUSAMMENARBEIT.md, docs/THEME-ERSTELLUNG.md). +4. **Webseite:** Theme-System, Bausteine, Erscheinungsbilder (Saisonfotos, saisonale Bausteine), Seiten, SEO, Markengrafiken ✅ · neues Design-Theme in eigener Session (docs/ZUSAMMENARBEIT.md, docs/THEME-ERSTELLUNG.md). 5. **Connectoren:** iCal-Import/-Export, Sync-Log, Konfliktwarnung, Portal-E-Mails. ✅ (echte Portal-Mails zur Feinabstimmung des Parsers fehlen) 6. **Go-Live:** Strato-Deployment und Testbetrieb ✅ · offen: Cronjob, Produktion, Umleitungen, Rechtstexte, echte Testbuchungen (Stand: docs/STATUS.md). diff --git a/docs/STATUS.md b/docs/STATUS.md index d88350e..33c8786 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -89,7 +89,7 @@ ## 1. Fertig (umgesetzt, getestet, auf stommer.info) **Webseite** - **Theme-System:** Basis-Theme „Ostsee-Licht“, 15 Bausteine, Seiten-Baukasten. - **Erscheinungsbilder** für Standard, Sommer, Winter, Weihnachten und Silvester: - - Bilder je Baustein, Bausteine nur in bestimmten Erscheinungsbildern, + - Saisonfotos (am Foto: „Zeigen in“), Bausteine nur in bestimmten Erscheinungsbildern, - Vorschau-Links, Bildauswahl mit Vorschaubild. - **Markengrafiken** im Theme: Logo, Favicon, Symbole, Wellenband, Illustration. *(`public/brand`, `partials/brand`)* - **Theme-Werkzeuge:** `themes:make`, `themes:check`, `themes:preview`; Anleitung in THEME-ERSTELLUNG.md. diff --git a/docs/THEMES.md b/docs/THEMES.md index 45b4d76..3d2e428 100644 --- a/docs/THEMES.md +++ b/docs/THEMES.md @@ -28,7 +28,7 @@ ## 1. Überblick | **Theme** | `resources/themes//` | 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.` | -| **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`) | +| **Erscheinungsbild** (Appearance) | `appearances`, Admin › Webseite › Erscheinungsbilder | Jährlicher Zeitraum + Priorität; ersetzt Farben (Tokens), ausgewählte Texte, Banner; **Fotos gehören zu Erscheinungsbildern** (`photos.appearance_ids`, mehrere möglich, leer = ganzjährig) – **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`. @@ -85,8 +85,7 @@ ## 4. Was Layout und Vorlagen zur Verfügung haben | `$theme->isPreview` | Vorschau-Modus (Layout setzt `noindex` und zeigt einen Hinweis) | | `$theme->appearanceKey()` | z. B. `weihnachten` – steht als `data-appearance` am ``; 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->sharePhoto($sections)` | Vorschaubild beim Teilen und für Suchmaschinen: erstes zur Saison passendes Titelbild der Seite, sonst ein automatisches Foto der Wohnung | | `$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 | @@ -120,15 +119,16 @@ ## 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[][]`, bei Sammlungen zusätzlich `mode`). Alle Bildauswahlen nutzen `App\Filament\Forms\Components\PhotoSelect` (Vorschaubild + Beschreibung, nach Kategorie gruppiert). +**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). **Bilder in Bausteinen** (Basisklasse): `chosenPhotos()` = ausgewählte Fotos in ihrer Reihenfolge, nur veröffentlichte und zur Saison passende; `automaticPhotos()` = `Photo::automatic()` (Fotos der Wohnung des Bausteins und solche ohne Wohnung, nie Kategorie „Grundriss & Pläne“, zur Saison passend, Saisonfotos zuerst); `photoSourceFields()`/`sourcedPhotos()` = Wahl „automatisch“ oder „eigene Auswahl“ (`data.photo_source`, `data.photo_ids`). Titelbereich und Abschluss halten eine Liste `photo_ids`, gezeigt wird das erste passende Foto. Ein Foto gehört zu keinem (= ganzjährig) oder mehreren Erscheinungsbildern; dann erscheint es nur dort und vor den ganzjährigen. 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/.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, **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. +- Felder: Name, Zeitraum `TT.MM.`–`TT.MM.` (jährlich, darf über Silvester laufen), Priorität, Standard, aktiv, 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`. +- **Fotos:** nicht mehr am Erscheinungsbild, sondern am Foto (Webseite › Fotos › „Zeigen in“, auch als Sammelaktion). Das Erscheinungsbild zeigt nur, wie viele Fotos ihm zugeordnet sind. Umstellung 29.10.2026: Titelbild und „Bilder je Baustein“ wurden in die Bausteine übernommen (Migration `give_photos_their_seasons`). +- **Vorschau:** Admin › Erscheinungsbilder › „Vorschau“ = signierter Link (24 h), `noindex` – zeigt auch die Saisonfotos. - Ohne Erscheinungsbild-Banner wird der neueste aktive Hinweis (Admin › Hinweis-Banner) gezeigt. ## 7. Assets, Schriften, Build diff --git a/docs/ZUSAMMENARBEIT.md b/docs/ZUSAMMENARBEIT.md index e305a1c..125d2bc 100644 --- a/docs/ZUSAMMENARBEIT.md +++ b/docs/ZUSAMMENARBEIT.md @@ -84,6 +84,7 @@ ## 6. Änderungsprotokoll Vorlagen-Vertrag | Datum | Änderung | Betrifft | |---|---|---| +| 29.10.2026 | **Fotos und Saisons:** Variablen der Vorlagen unverändert (`$photo`, `$photos`). Entfallen: `$theme->heroPhoto()`, `sectionPhotoIds()`, `sectionPhotoMode()`, `Section::photoSlots()` und die Saison-Helfer `seasonalPhoto(s)`/`withSeasonalPhotos`; neu `$theme->sharePhoto($sections)`, `chosenPhotos()`, `automaticPhotos()`, `sourcedPhotos()`. Titelbereich/Abschluss: `data.photo_ids` statt `photo_id`. Neue Fotokategorie `plan` erscheint nie automatisch. | nur Bausteinklassen; Vorlagen nicht betroffen | | 26.10.2026 | **Mandantenabschluss:** Beide Themes beziehen Logo und Favicon ausschließlich aus der Website-Marke; ohne Marke bleibt die Darstellung neutral. Dekoration und Bild-Platzhalter kommen aus Bildwelt-Plätzen. `partials/brand` bleibt als kompatible Platz-Zuordnung erhalten; Seebads `partials/motif` nutzt die Bildwelt-API. Bestehende Stommer-Marken werden vor Aktivierung ausdrücklich für diese Website importiert. | layouts/app, partials/brand, partials/logo, partials/motif, partials/image, header | | 22.10.2026 | `theme-base.css` (Schriften, Token-Mapping, Basis-Klassen) von `theme.css` getrennt – Child-Themes importieren `theme-base.css` | theme.css | | 22.10.2026 | Markengrafiken: `@include('theme::partials.brand', ['name' => 'mark', 'class' => '…'])` (mark, logo, wave-divider, icon-apartment/-sea/-terrace/-location); Farben über `--brand-navy/-teal/-wave/-sun` (navy = Textfarbe) | header, footer, facts, location, image | diff --git a/docs/architecture/webseite.md b/docs/architecture/webseite.md index 388712c..e9fcc3a 100644 --- a/docs/architecture/webseite.md +++ b/docs/architecture/webseite.md @@ -43,7 +43,7 @@ ### Gestaltung, Marke und Saisons Eine Website wählt ein installiertes Theme. Vorhanden sind „Ostsee-Licht“ und „Seebad“. Der Vermieter kann das Theme auswählen, aber keine ausführbaren Gestaltungspakete hochladen. Vorschau-Links ermöglichen die Sichtung einer Gestaltung vor der Aktivierung. -Erscheinungsbilder ändern saisonal Fotos, Bilder je Baustein, Texte, Farben und Banner. Der Seitenaufbau bleibt davon grundsätzlich unabhängig. Einzelne Bausteine können auf bestimmte Erscheinungsbilder begrenzt werden. Zeiträume können jährlich wiederkehren; Prioritäten und ein Standard regeln die Auswahl. Vorbereitet sind unter anderem Sommer, Winter, Weihnachten und Silvester. +Erscheinungsbilder ändern saisonal Texte, Farben und Banner. Fotos gehören zu einem, mehreren oder keinem Erscheinungsbild (dann ganzjährig); passende Saisonfotos erscheinen zuerst, fremde gar nicht. Grundrisse und Pläne haben eine eigene Kategorie, die keine Galerie zeigt. Der Seitenaufbau bleibt davon grundsätzlich unabhängig. Einzelne Bausteine können auf bestimmte Erscheinungsbilder begrenzt werden. Zeiträume können jährlich wiederkehren; Prioritäten und ein Standard regeln die Auswahl. Vorbereitet sind unter anderem Sommer, Winter, Weihnachten und Silvester. Zur Website gehören Logo, Favicon und eine eigene Grafik für E-Mails beziehungsweise Vertragsunterlagen. Eine Bildwelt liefert passende Dekoration unabhängig vom Theme; eine Wohnung kann eine andere Bildwelt als ihre Website wählen. Damit können etwa eine Ostsee- und eine Bergwohnung unter derselben Grundgestaltung erscheinen. diff --git a/tests/Feature/ThemeSystemTest.php b/tests/Feature/ThemeSystemTest.php index 2597a3d..ac6b523 100644 --- a/tests/Feature/ThemeSystemTest.php +++ b/tests/Feature/ThemeSystemTest.php @@ -6,9 +6,10 @@ 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\Photos\Pages\EditPhoto; +use App\Filament\Resources\Photos\Pages\ListPhotos; use App\Filament\Resources\Sites\SiteResource; use App\Models\Appearance; use App\Models\Page; @@ -27,6 +28,7 @@ use Database\Seeders\WebsiteContentSeeder; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\URL; use Livewire\Livewire; @@ -239,43 +241,92 @@ public function test_section_can_be_limited_to_an_appearance(): void $this->get('/')->assertOk()->assertSee('Adventsmarkt am Hafen'); } - public function test_appearance_sets_seasonal_photos_per_section(): void + public function test_seasonal_photos_appear_only_in_their_appearances_and_come_first(): 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]]]); + $christmas = $this->site->appearances()->where('name', 'Weihnachten')->sole(); + $allYear = $this->photoWithFile(['alt_text' => 'Garten im Licht', 'sort_order' => 1]); + $snow = $this->photoWithFile(['alt_text' => 'Raue See im Winter', 'sort_order' => 99, 'appearance_ids' => [$winter->id, $christmas->id]]); + $page = $this->site->pages()->where('slug', 'start')->sole(); + $page->update(['sections' => collect($page->sections)->map(fn (array $section): array => $section['type'] === 'cta' + ? [...$section, 'data' => [...$section['data'], 'photo_ids' => [$snow->id, $allYear->id]]] + : $section)->all()]); + $apartmentGallery = fn () => $this->get('/wohnung')->assertOk(); - $this->get('/')->assertOk()->assertDontSee('Raue See im Winter'); + $this->get('/')->assertOk()->assertSee('Garten im Licht')->assertDontSee('Raue See im Winter'); + $apartmentGallery()->assertDontSee('Raue See im Winter'); $this->travelTo(CarbonImmutable::parse('2026-11-15 10:00')); + $this->get('/')->assertOk()->assertSee('Raue See im Winter')->assertDontSee('Garten im Licht'); + $apartmentGallery()->assertSeeInOrder(['Raue See im Winter', 'Garten im Licht']); + + $this->travelTo(CarbonImmutable::parse('2026-12-20 10:00')); $this->get('/')->assertOk()->assertSee('Raue See im Winter'); } - public function test_appearance_form_lists_the_sections_with_photos(): void + public function test_photo_belongs_to_several_appearances_and_the_appearance_counts_its_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'); + $christmas = $this->site->appearances()->where('name', 'Weihnachten')->sole(); + Storage::fake('public'); + $photo = $this->photoWithFile(['alt_text' => 'Strand im Schnee']); - $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) + Livewire::test(EditPhoto::class, ['record' => $photo->getRouteKey()]) + ->fillForm(['appearance_ids' => [(string) $winter->id, (string) $christmas->id]]) ->call('save') ->assertHasNoFormErrors(); - $this->assertSame($photo->id, (int) $winter->fresh()->section_photos[$cta['data']['id']]['photo_id']); + $this->assertSame([$winter->id, $christmas->id], $photo->fresh()->appearance_ids); + $this->assertSame(['Winter', 'Weihnachten'], $photo->fresh()->appearanceNames()); + $this->get(AppearanceResource::getUrl('edit', ['record' => $winter])) + ->assertOk() + ->assertSee('1 Foto ist diesem Erscheinungsbild zugeordnet.') + ->assertDontSee('Bilder je Baustein'); + + Livewire::test(ListPhotos::class) + ->callTableBulkAction('seasons', [$photo], ['appearance_ids' => []]) + ->assertHasNoTableBulkActionErrors(); + $this->assertNull($photo->fresh()->appearance_ids); + } + + public function test_appearance_photos_move_to_the_photos_and_sections(): void + { + $migration = require database_path('migrations/2026_10_29_184538_give_photos_their_seasons.php'); + $migration->down(); + $standard = $this->site->appearances()->where('is_default', true)->sole(); + $winter = $this->site->appearances()->where('name', 'Winter')->sole(); + $title = Photo::factory()->create(); + $snow = Photo::factory()->create(); + $closing = Photo::factory()->create(); + $page = $this->site->pages()->where('slug', 'start')->sole(); + $cta = collect($page->sections)->firstWhere('type', 'cta'); + $page->update(['sections' => collect($page->sections)->map(fn (array $section): array => $section['type'] === 'cta' + ? [...$section, 'data' => [...$section['data'], 'photo_id' => $closing->id]] + : $section)->all()]); + DB::table('appearances')->where('id', $standard->id)->update(['hero_photo_id' => $title->id]); + DB::table('appearances')->where('id', $winter->id)->update(['section_photos' => json_encode([$cta['data']['id'] => ['photo_id' => $snow->id]])]); + + $migration->up(); + + $sections = collect($page->fresh()->sections); + $this->assertSame([$title->id], $sections->firstWhere('type', 'hero')['data']['photo_ids']); + $this->assertSame([$snow->id, $closing->id], $sections->firstWhere('type', 'cta')['data']['photo_ids']); + $this->assertArrayNotHasKey('photo_id', $sections->firstWhere('type', 'cta')['data']); + $this->assertNull($title->fresh()->appearance_ids); + $this->assertSame([$winter->id], $snow->fresh()->appearance_ids); + } + + /** + * @param array $attributes + */ + private function photoWithFile(array $attributes): Photo + { + $photo = Photo::factory()->create($attributes); + $photo->addMedia(UploadedFile::fake()->image('foto.jpg', 1600, 1000))->toMediaCollection(Photo::COLLECTION); + + return $photo; } public function test_invalid_day_is_rejected(): void