Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/filament-architect.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
\Codedor\FilamentArchitect\Filament\Architect\MediaTextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SliderBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SpacerBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TableBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoTextBlock::class,
Expand Down
2 changes: 0 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ return [
\Codedor\FilamentArchitect\Filament\Architect\MediaTextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SliderBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SpacerBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TableBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoTextBlock::class,
Expand Down Expand Up @@ -167,7 +166,6 @@ Default value:
\Codedor\FilamentArchitect\Filament\Architect\MediaTextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SliderBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\SpacerBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TableBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\TextBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoBlock::class,
\Codedor\FilamentArchitect\Filament\Architect\VideoTextBlock::class,
Expand Down
21 changes: 19 additions & 2 deletions resources/views/architect/button-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
@dump($buttons)
@dump($alignment)
@php
$alignmentClass = [
'left' => 'text-start',
'center' => 'text-center',
'right' => 'text-end'
][$alignment];
@endphp

@if ($buttons && count($buttons))
<div
@class(['container', $alignmentClass])
>
<div class="d-inline-flex flex-wrap gap-4">
@foreach ($buttons as $button)
<x-general.button :button="$button" />
@endforeach
</div>
</div>
@endif
23 changes: 22 additions & 1 deletion resources/views/architect/cards-block.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
@dump($cards)
<div class="content-padding">
<div class="container">
<div class="row">
@foreach ($cards as $card)
<div
@class([
'col-md-6',
'col-lg-4' => count($cards) > 2
])
>
<x-card
:item="$card"
:title="$card['title']"
:intro="$card['description']"
:image="$card['image']"
:route="$card['button'] ? lroute($card['button']['link']) : null"
/>
</div>
@endforeach
</div>
</div>
</div>
8 changes: 6 additions & 2 deletions resources/views/architect/cta-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
@dump($title)
@dump($button)
<section class="content-padding">
<div class="container text-center">
<h2>{{ $title }}</h2>
<x-general.button :button="$button" />
</div>
</section>
6 changes: 5 additions & 1 deletion resources/views/architect/embed-block.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
@dump($embed)
<div class="content-padding">
<div class="container">
{!! $embed !!}
</div>
</div>
30 changes: 28 additions & 2 deletions resources/views/architect/media-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,28 @@
@dump($width)
@dump($images)
<div class="content-padding">
@if($width !== 'full_width')
<div class="container">
@endif
<div class="row justify-content-center">
<div @class([
'col-12',
'col-lg-10' => $width === 'text_container',
])>
<div class="row">
@foreach($images as $image)
<div @class([
'col-md-6 col-lg-' . 12 / count($images),
])>
@if ($image['type'] === 'video')
<x-general.video :video="$image" />
@else
<x-filament-media-library::picture :$image :alt="$image->alt" />
@endif
</div>
@endforeach
</div>
</div>
</div>
@if($width !== 'full')
</div>
@endif
</div>
24 changes: 21 additions & 3 deletions resources/views/architect/media-text-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
@dump($alignment)
@dump($image)
@dump($description)
<div class="content-padding">
<div class="container">
<div
@class([
'row',
'flex-lg-row-reverse' => $alignment === 'right'
])
>
<div class="col-lg-6">
@if ($image['type'] === 'video')
<x-general.video :video="$image" />
@else
<x-filament-media-library::picture :$image :alt="$image->alt" />
@endif
</div>
<div class="col-lg-6">
{!! $description !!}
</div>
</div>
</div>
</div>
18 changes: 17 additions & 1 deletion resources/views/architect/slider-block.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
@dump($images)
<div class="content-padding">
<div class="container">
@if (count($images))
<x-general.slider>
@foreach ($images as $image)
<div class="splide__slide">
<x-filament-media-library::picture
:$image
:alt="$image->alt"
:lazyload
/>
</div>
@endforeach
</x-general.slider>
@endif
</div>
</div>
2 changes: 1 addition & 1 deletion resources/views/architect/spacer-block.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@dump($height)
<div style="height: {{ $height }}px;"></div>
1 change: 0 additions & 1 deletion resources/views/architect/table-block.blade.php

This file was deleted.

15 changes: 13 additions & 2 deletions resources/views/architect/text-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
@dump($columns)
@dump($textColumns)
<div class="content-padding">
<div class="container">
<div class="row">
@foreach ($textColumns as $text)
<div @class([
'wysiwyg col-lg-' . 12 / $columns,
])>
{!! $text !!}
</div>
@endforeach
</div>
</div>
</div>
6 changes: 5 additions & 1 deletion resources/views/architect/video-block.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
@dump($video)
<div class="content-padding">
<div class="container">
<x-general.video :$video />
</div>
</div>
20 changes: 17 additions & 3 deletions resources/views/architect/video-text-block.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
@dump($alignment)
@dump($video)
@dump($description)
<div class="content-padding">
<div class="container">
<div
@class([
'row',
'flex-lg-row-reverse' => $alignment === 'right'
])
>
<div class="col-lg-6">
<x-general.video :$video />
</div>
<div class="col-lg-6">
{!! $description !!}
</div>
</div>
</div>
</div>
13 changes: 9 additions & 4 deletions resources/views/components/button-field.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<div>
<input wire:model="{{ $getStatePath() }}" type="hidden" />
<div class="flex flex-col items-start">
<x-dynamic-component
:component="$getFieldWrapperView()"
:field="$field"
>
<input wire:model="{{ $getStatePath() }}" type="hidden" />

{{ $getAction('addButton') }}
{{ $getAction('removeButton') }}
{{ $getAction('addButton') }}
{{ $getAction('removeButton') }}
</x-dynamic-component>
</div>
6 changes: 5 additions & 1 deletion src/Filament/Architect/ButtonBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ public function schema(): array
'left' => 'Left',
'center' => 'Center',
'right' => 'Right',
]),
])
->inline()
->inlineLabel(false)
->default('left')
->formatStateUsing(fn (mixed $state) => $state ?? 'left'),

Repeater::make('buttons')
->schema([ButtonComponent::make('button')])
Expand Down
9 changes: 9 additions & 0 deletions src/Filament/Architect/MediaBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@ public function schema(): array
return [
Radio::make('width')
->visible((bool) ArchitectConfig::getWidthOptionsEnum())
->inline()
->inlineLabel(false)
->required()
->formatStateUsing(function ($state) {
if (! $state) {
return ArchitectConfig::getWidthOptionsEnum()::cases()[0] ?? null;
}

return $state;
})
->options(function (Get $get) {
$enum = ArchitectConfig::getWidthOptionsEnum();

Expand Down
10 changes: 6 additions & 4 deletions src/Filament/Architect/MediaTextBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Codedor\MediaLibrary\Filament\AttachmentInput;
use Codedor\MediaLibrary\Models\Attachment;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\Section;
use FilamentTiptapEditor\TiptapEditor;
use Illuminate\View\View;

Expand All @@ -30,14 +31,15 @@ public function schema(): array
->options([
'left' => 'Left',
'right' => 'Right',
]),
])
->inline()
->inlineLabel(false)
->default('left')
->formatStateUsing(fn (mixed $state) => $state ?? 'left'),

AttachmentInput::make('image')
->allowedFormats(ArchitectFormats::get())
->required(),

TiptapEditor::make('description')
->label('Text to display'),
];
}
}
25 changes: 0 additions & 25 deletions src/Filament/Architect/TableBlock.php

This file was deleted.

5 changes: 4 additions & 1 deletion src/Filament/Architect/TextBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class TextBlock extends BaseBlock
{
protected ?string $name = 'Text columns block';
protected ?string $name = 'Text block';

public function render(array $data): ?View
{
Expand All @@ -30,10 +30,13 @@ public function schema(): array
TextInput::make('columns')
->numeric()
->reactive()
->default(1)
->minValue(1)
->maxValue(3)
->formatStateUsing(fn (mixed $state) => $state ?? 1)
->extraInputAttributes(['min' => 1, 'max' => 3]),


Grid::make(1)->schema(function (Get $get) {
return collect()
->pad($get('columns') ?? 1, null)
Expand Down
8 changes: 5 additions & 3 deletions src/Filament/Architect/VideoTextBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ public function schema(): array
->options([
'left' => 'Left',
'right' => 'Right',
]),

OEmbed::make('video'),
])
->inline()
->inlineLabel(false),

TiptapEditor::make('description')
->label('Text')
->required(),

OEmbed::make('video'),
];
}
}
2 changes: 0 additions & 2 deletions tests/Feature/Filament/Architect/MediaTextBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@
->toBeInstanceOf(\Filament\Forms\Components\Radio::class),
fn ($field) => $field
->toBeInstanceOf(\Codedor\MediaLibrary\Filament\AttachmentInput::class),
fn ($field) => $field
->toBeInstanceOf(\FilamentTiptapEditor\TiptapEditor::class),
);
});
16 changes: 0 additions & 16 deletions tests/Feature/Filament/Architect/TableBlockTest.php

This file was deleted.

4 changes: 2 additions & 2 deletions tests/Feature/Filament/Architect/VideoTextBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
->schema()->sequence(
fn ($field) => $field
->toBeInstanceOf(\Filament\Forms\Components\Radio::class),
fn ($field) => $field
->toBeInstanceOf(\Filament\Forms\Components\Fieldset::class),
fn ($field) => $field
->toBeInstanceOf(\FilamentTiptapEditor\TiptapEditor::class),
fn ($field) => $field
->toBeInstanceOf(\Filament\Forms\Components\Fieldset::class),
);
});