Skip to content

Commit a1bbb22

Browse files
jyrkidnjyrkidn
committed
Fix merge conflicts from master
2 parents 1e7520e + 83b665c commit a1bbb22

File tree

13 files changed

+281
-144
lines changed

13 files changed

+281
-144
lines changed

‎.github/workflows/phpstan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

‎.github/workflows/run-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

‎.github/workflows/update-changelog.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
# Fetch entire history of repository to ensure relase date can be
1616
# extracted from commit of the given tag.
@@ -34,7 +34,7 @@ jobs:
3434
compare-url-target-revision: ${{ github.event.release.target_commitish }}
3535

3636
- name: Commit updated CHANGELOG
37-
uses: stefanzweifel/git-auto-commit-action@v5
37+
uses: stefanzweifel/git-auto-commit-action@v7
3838
with:
3939
branch: ${{ github.event.release.target_commitish }}
4040
commit_message: Update CHANGELOG

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,34 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## v2.4.0 - 2025-11-20
9+
10+
### What's Changed
11+
12+
* Translate static text and add Dutch translations by @jyrkidn in https://github.com/codedor/filament-architect/pull/30
13+
* Bump actions/checkout from 4 to 5 by @dependabot[bot] in https://github.com/codedor/filament-architect/pull/34
14+
* Bump stefanzweifel/git-auto-commit-action from 5 to 7 by @dependabot[bot] in https://github.com/codedor/filament-architect/pull/36
15+
16+
**Full Changelog**: https://github.com/codedor/filament-architect/compare/v2.3.3...v2.4.0
17+
18+
## v2.3.3 - 2025-10-29
19+
20+
Fix issue introduced in v2.3.2
21+
22+
**Full Changelog**: https://github.com/codedor/filament-architect/compare/v2.3.2...v2.3.3
23+
24+
## v2.3.2 - 2025-10-27
25+
26+
**Full Changelog**: https://github.com/codedor/filament-architect/compare/v2.3.1...v2.3.2
27+
28+
## v2.3.1 - 2025-06-13
29+
30+
### What's Changed
31+
32+
* Bump dependabot/fetch-metadata from 2.3.0 to 2.4.0 by @dependabot[bot] in https://github.com/codedor/filament-architect/pull/31
33+
34+
**Full Changelog**: https://github.com/codedor/filament-architect/compare/v2.3.0...v2.3.1
35+
836
## v2.3.0 - 2025-03-26
937

1038
### What's Changed

‎resources/lang/en/admin.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
return [
4+
'start from template' => 'Start from template',
5+
'block' => 'Block',
6+
'template loaded' => 'The template has been loaded',
7+
'save as template' => 'Save as template',
8+
'save as new template' => 'Save as new template',
9+
'overwrite existing template' => 'Overwrite existing template',
10+
'template name' => 'Template name',
11+
'template name help text' => 'Make sure the name is unique and descriptive',
12+
'template to overwrite' => 'Template to overwrite',
13+
'template saved' => 'The template has been saved',
14+
'start from scratch' => 'Start from scratch',
15+
'insert block' => 'Insert block',
16+
'delete block' => 'Delete Block',
17+
'edit block' => 'Edit Block',
18+
'add block' => 'Add Block',
19+
'duplicate block' => 'Duplicate',
20+
'hide block' => 'Hide',
21+
'show block' => 'Show',
22+
'add block between' => 'Add Block Between',
23+
'preview :name' => 'Preview :Name',
24+
'working title' => 'Working Title',
25+
'working title help' => 'This is purely to help you identify the block in the list of blocks.',
26+
'submit' => 'Submit',
27+
'cancel' => 'Cancel',
28+
'button' => 'Button',
29+
'text on button' => 'Text on the button',
30+
'type' => 'Type',
31+
'link' => 'Link',
32+
'title' => 'Title',
33+
'title help' => 'Optional, will be displayed when hovering over the button',
34+
'tracking information' => 'Tracking information',
35+
'category' => 'Category',
36+
'action' => 'Action',
37+
'label' => 'Label',
38+
'non interaction' => 'Non interaction',
39+
'remove button' => 'Remove button'
40+
];

‎resources/lang/nl/admin.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
return [
4+
'start from template' => 'Begin van uit een template',
5+
'block' => 'Blok',
6+
'template loaded' => 'De template is geladen',
7+
'save as template' => 'Opslaan als template',
8+
'save as new template' => 'Opslaan als nieuwe template',
9+
'overwrite existing template' => 'Bestaande template overschrijven',
10+
'template name' => 'Templatenaam',
11+
'template name help text' => 'Zorg dat de naam uniek en beschrijvend is',
12+
'template to overwrite' => 'Template om te overschrijven',
13+
'template saved' => 'De template is opgeslagen',
14+
'start from scratch' => 'Begin vanaf nul',
15+
'insert block' => 'Blok toevoegen',
16+
'delete block' => 'Blok verwijderen',
17+
'edit block' => 'Blok bewerken',
18+
'add block' => 'Blok toevoegen',
19+
'duplicate block' => 'Dupliceren',
20+
'hide block' => 'Verbergen',
21+
'show block' => 'Tonen',
22+
'add block between' => 'Blok tussenvoegen',
23+
'preview :name' => 'Preview :Name',
24+
'working title' => 'Werktitel',
25+
'working title help' => 'Dit is puur om u te helpen het blok in de lijst met blokken te identificeren.',
26+
'submit' => 'Opslaan',
27+
'cancel' => 'Annuleren',
28+
'button' => 'Knop',
29+
'text on button' => 'Tekst op de knop',
30+
'type' => 'Type',
31+
'link' => 'Link',
32+
'title' => 'Titel',
33+
'title help' => 'Optioneel, wordt getoond bij het over de knop gaan',
34+
'tracking information' => 'Tracking informatie',
35+
'category' => 'Categorie',
36+
'action' => 'Actie',
37+
'label' => 'Label',
38+
'non interaction' => 'Geen interactie',
39+
'remove button' => 'Verwijder knop'
40+
];

‎resources/lang/nl/width-options.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
return [
4+
'full width' => 'Volledige breedte',
5+
'container' => 'Container',
6+
'text container' => 'Tekst container',
7+
];

‎resources/views/architect-input.blade.php‎

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:state-path="$getStatePath()"
1717
:arguments="['row' => -1]"
1818
:shown="count($state) === 0"
19-
:label="count($state) === 0 ? 'Start from scratch' : 'Insert block'"
19+
:label="count($state) === 0 ? __('filament-architect::admin.start from scratch') : __('filament-architect::admin.insert block')"
2020
:aligned="count($state) === 0 ? 'left' : 'center'"
2121
>
2222
@if (count($state) === 0 && $getHasTemplates())
@@ -34,73 +34,76 @@ class="w-full flex flex-col gap-2"
3434
>
3535
@foreach ($state ?? [] as $rowKey => $row)
3636
<div
37-
class="w-full flex gap-2 px-2 items-center"
37+
class="@container"
3838
x-sortable-item="{{ $rowKey }}"
3939
>
40-
<div class="grow flex flex-col gap-2">
41-
<div class="grow flex gap-2 items-center">
42-
<div class="flex flex-col gap-2">
43-
@if (count($row) < $getMaxFieldsPerRow())
44-
<x-filament-architect::icon-button
45-
:action="$getAction('addBlockBetween')"
46-
:state-path="$getStatePath()"
47-
:arguments="['row' => $rowKey, 'insertAfter' => 0]"
48-
/>
49-
@endif
40+
<div class="w-full flex gap-2 @sm:px-2 items-center">
41+
<div class="grow flex flex-col gap-2">
42+
<div class="grow flex gap-2 items-center">
43+
<div class="flex flex-col gap-2">
44+
@if (count($row) < $getMaxFieldsPerRow())
45+
<x-filament-architect::icon-button
46+
:action="$getAction('addBlockBetween')"
47+
:state-path="$getStatePath()"
48+
:arguments="['row' => $rowKey, 'insertAfter' => 0]"
49+
/>
50+
@endif
5051

51-
@if (count($state) > 1)
52-
<x-filament::icon-button
53-
color="gray"
54-
icon="heroicon-o-arrows-up-down"
55-
class="border-2 dark:bg-white/5 dark:hover:bg-white/10 dark:border-gray-700 cursor-move m-0"
56-
:size="Size::Small"
57-
:icon-size="IconSize::Small"
58-
x-sortable-handle
59-
/>
60-
@endif
61-
</div>
52+
@if (count($state) > 1)
53+
<x-filament::icon-button
54+
color="gray"
55+
icon="heroicon-o-arrows-up-down"
56+
class="border-2 dark:bg-white/5 dark:hover:bg-white/10 dark:border-gray-700 cursor-move m-0"
57+
:size="ActionSize::Small"
58+
:icon-size="IconSize::Small"
59+
x-sortable-handle
60+
/>
61+
@endif
62+
</div>
6263

63-
<div
64-
class="grow w-full grid gap-2 grid-cols-12"
65-
x-sortable
66-
x-on:end.stop="$wire.callSchemaComponentMethod(@js($key), 'reorderColumn', {
67-
newKeys: $event.target.sortable.toArray(),
68-
row: '{{ $rowKey }}',
69-
})"
70-
>
71-
@foreach ($row as $uuid => $block)
72-
<x-filament-architect::input-row
73-
:uuid="$uuid"
74-
:row="$row"
75-
:row-key="$rowKey"
76-
:block="$block"
77-
:blocks="$getBlocks()"
78-
:locales="$locales"
79-
:state-path="$statePath"
80-
:get-action="$getAction"
81-
:can-add-fields="count($row) < $getMaxFieldsPerRow()"
82-
:has-duplicate-action="$getHasDuplicateAction()"
83-
:loop="$loop"
84-
:has-shown-button="$getHasShownButton()"
85-
/>
86-
@endforeach
64+
<div
65+
class="grow w-full grid gap-2 grid-cols-12"
66+
x-sortable
67+
x-on:end.stop="$wire.callSchemaComponentMethod(@js($key), 'reorder-column', {
68+
newKeys: $event.target.sortable.toArray(),
69+
row: '{{ $rowKey }}',
70+
})"
71+
>
72+
@foreach ($row as $uuid => $block)
73+
<x-filament-architect::input-row
74+
:uuid="$uuid"
75+
:row="$row"
76+
:row-key="$rowKey"
77+
:block="$block"
78+
:blocks="$getBlocks()"
79+
:locales="$locales"
80+
:state-path="$statePath"
81+
:get-action="$getAction"
82+
:can-add-fields="count($row) < $getMaxFieldsPerRow()"
83+
:has-duplicate-action="$getHasDuplicateAction()"
84+
:loop="$loop"
85+
:has-shown-button="$getHasShownButton()"
86+
/>
87+
@endforeach
88+
</div>
8789
</div>
88-
</div>
8990

90-
<x-filament-architect::add-row-button
91-
:action="$getAction('addBlock')"
92-
:state-path="$getStatePath()"
93-
:arguments="['row' => $rowKey]"
94-
:shown="$loop->last"
95-
>
96-
@if ($loop->last && $getHasPreview())
97-
{{ $getAction('architectPreview') }}
98-
@endif
91+
<x-filament-architect::add-row-button
92+
:action="$getAction('addBlock')"
93+
:state-path="$getStatePath()"
94+
:arguments="['row' => $rowKey]"
95+
:shown="$loop->last"
96+
@class(['h-0' => ! $loop->last])
97+
>
98+
@if ($loop->last && $getHasPreview())
99+
{{ $getAction('architectPreview') }}
100+
@endif
99101

100-
@if ($loop->last && $getHasTemplates())
101-
{{ $getAction('saveAsTemplate') }}
102-
@endif
103-
</x-filament-architect::add-row-button>
102+
@if ($loop->last && $getHasTemplates())
103+
{{ $getAction('saveAsTemplate') }}
104+
@endif
105+
</x-filament-architect::add-row-button>
106+
</div>
104107
</div>
105108
</div>
106109
@endforeach

‎resources/views/components/add-row-button.blade.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
'statePath',
44
'arguments' => [],
55
'shown' => false,
6-
'label' => 'Insert block',
6+
'label' => __('filament-architect::admin.insert block'),
77
'aligned' => 'center',
8+
'class' => null,
89
])
910

1011
<div @class([
11-
'z-10 mx-auto w-4/5 h-0' => ($aligned === 'center'),
12+
'z-10 mx-auto w-4/5' => ($aligned === 'center'),
13+
$class,
1214
])>
1315
<div @class([
14-
'flex gap-4' => ($aligned === 'left'),
15-
'flex justify-center z-10 w-full h-8 -mt-4 gap-4' => ($aligned === 'center'),
16+
'flex flex-wrap',
17+
'gap-4' => ($aligned === 'left'),
18+
'justify-center z-10 w-full -mt-4 gap-4' => ($aligned === 'center'),
1619
'opacity-0 hover:opacity-100 transition-all' => ! $shown,
1720
])>
1821
<x-filament-architect::icon-button

‎resources/views/components/input-row.blade.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class="w-full flex gap-2 items-center"
1414
style="grid-column: span {{ $block['width'] ?? 12 }};"
1515
>
1616
<div @class([
17-
'relative grow bg-gray-50 dark:bg-gray-800 p-4 rounded-lg
17+
'relative grow bg-gray-50 dark:bg-gray-800 p-2 rounded-lg
1818
border dark:border-gray-700 justify-between flex gap-2
19-
group',
19+
group @sm:p-4',
2020
'bg-gray-50/50 dark:bg-gray-800/50 border-gray-200/50
2121
dark:border-gray-700/50' => ! $shown
2222
])>
@@ -72,7 +72,7 @@ class="dark:bg-gray-800/100 dark:hover:bg-gray-700/100 dark:text-gray-100 dark:h
7272
'uuid' => $uuid,
7373
'row' => $rowKey,
7474
]"
75-
tooltip="Duplicate"
75+
:tooltip="__('filament-architect::admin.duplicate block')"
7676
/>
7777
@endif
7878

@@ -85,7 +85,7 @@ class="dark:bg-gray-800/100 dark:hover:bg-gray-700/100 dark:text-gray-100 dark:h
8585
'uuid' => $uuid,
8686
'row' => $rowKey,
8787
]"
88-
tooltip="{{ $shown ? 'Hide' : 'Show' }}"
88+
tooltip="{{ $shown ? __('filament-architect::admin.hide block') : __('filament-architect::admin.show block') }}"
8989
/>
9090
@endif
9191

@@ -100,7 +100,7 @@ class="dark:bg-gray-800/100 dark:hover:bg-gray-700/100 dark:text-gray-100 dark:h
100100
'blockClassName' => $blockClassName,
101101
'locales' => $locales,
102102
]"
103-
tooltip="Edit"
103+
:tooltip="__('filament-architect::admin.edit block')"
104104
/>
105105

106106
<x-filament-architect::icon-button
@@ -112,18 +112,18 @@ class="dark:bg-gray-800/100 dark:hover:bg-gray-700/100 dark:text-custom-500 dark
112112
'uuid' => $uuid,
113113
'row' => $rowKey,
114114
]"
115-
tooltip="Delete"
115+
:tooltip="__('filament-architect::admin.delete block')"
116116
/>
117117
</div>
118118
</div>
119119

120-
<div class="flex flex-col gap-2">
121-
@if ($canAddFields)
120+
@if ($canAddFields)
121+
<div class="flex flex-col gap-2">
122122
<x-filament-architect::icon-button
123123
:action="$getAction('addBlockBetween')"
124124
:state-path="$statePath"
125125
:arguments="['row' => $rowKey, 'insertAfter' => $uuid]"
126126
/>
127-
@endif
128-
</div>
127+
</div>
128+
@endif
129129
</div>

0 commit comments

Comments
 (0)