Skip to content

Commit 4bc8c5f

Browse files
KatrienvhKatrienvh
authored
Merge pull request #9 from codedor/feature/FIL001-132-templates-update
Feature/fil001 132 templates update
2 parents 253f72c + 60277f5 commit 4bc8c5f

25 files changed

+281
-71
lines changed

‎README.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,21 @@ This is the contents of the published config file:
2121
```php
2222
return [
2323
'defaults' => [
24-
'inputClass' => '',
25-
'divClass' => 'col-6',
24+
'formClass' => 'd-flex flex-column gap-8',
25+
'rowClass' => 'row gy-8',
26+
'colClass' => 'col-md',
27+
'divClass' => 'form-group has-validation',
28+
'groupClass' => 'd-flex flex-column gap-8',
29+
'inputClass' => 'form-control',
30+
'inputSelectClass' => 'form-select',
31+
'labelClass' => 'form-label',
32+
'fileInputClass' => 'form-input-file',
33+
'fileInputLabelClass' => 'form-label-file',
34+
'checkInputClass' => 'form-check-input',
35+
'checkLabelClass' => 'form-check-label',
36+
'buttonClass' => 'btn btn--primary',
37+
'buttonIcon' => null,
38+
'textareaRows' => 5,
2639
]
2740
];
2841
```

‎config/livewire-forms.php

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,26 @@
22

33
return [
44
'defaults' => [
5-
'inputClass' => '',
6-
'divClass' => 'col-6',
5+
'formClass' => 'd-flex flex-column',
6+
'rowClass' => 'row',
7+
'colClass' => 'col-md',
8+
'divClass' => 'form-group has-validation',
9+
'gapClass' => 'gap-8',
10+
'gutterClass' => 'gy-8',
11+
'groupClass' => 'd-flex flex-column',
12+
'inputClass' => 'form-control',
13+
'inputSelectClass' => 'form-select',
14+
'labelClass' => 'form-label',
15+
'fileInputClass' => 'form-input-file',
16+
'fileInputLabelClass' => 'form-label-file',
17+
'checkDivClass' => 'form-check',
18+
'checkInputClass' => 'form-check-input',
19+
'checkLabelClass' => 'form-check-label',
20+
'checkGapClass' => 'gap-2',
21+
'imageClass' => 'img-fluid',
22+
'linkClass' => 'btn btn--link',
23+
'buttonClass' => 'btn btn--primary',
24+
'buttonIcon' => null,
25+
'textareaRows' => 5,
726
]
827
];

‎resources/views/components/form.blade.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<form wire:submit.prevent="submit">
1+
<form
2+
wire:submit.prevent="submit"
3+
@class([
4+
$field->formClass ?? config('livewire-forms.defaults.formClass'),
5+
$field->gapClass ?? config('livewire-forms.defaults.gapClass')
6+
])
7+
>
28
@foreach($form->fields as $field)
39
{{ optional($field)->render() }}
410
@endforeach

‎resources/views/fields/button.blade.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
<div class="{{ $field->divClass ?? 'col-6' }}">
2-
<input
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
5+
<button
36
@if ($field->action)
47
wire:click.prevent="{{ $field->action }}"
58
@endif
69
type="submit"
710
name="{{ $field->getName() }}"
8-
value="{{ $field->getName() }}"
11+
@class([$field->class ?? config('livewire-forms.defaults.buttonClass')])
912
@if ($field->dusk) dusk={{ $field->dusk }} @endif
1013
>
14+
{{ $field->getName() }}
15+
@if(config('livewire-forms.defaults.buttonIcon'))
16+
<x-dynamic-component component="{{ $field->buttonIcon ?? config('livewire-forms.defaults.buttonIcon') }}" />
17+
@endif
18+
</button>
1119
</div>

‎resources/views/fields/checkbox-group.blade.php

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<div
2+
@class([
3+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
4+
$field->colClass ?? config('livewire-forms.defaults.colClass')
5+
])
6+
>
7+
@include('livewire-forms::fields.label')
8+
9+
<div @class([
10+
'd-flex flex-column',
11+
$field->checkGapClass ?? config('livewire-forms.defaults.checkGapClass')
12+
])>
13+
@foreach ($field->options as $key => $value)
14+
<div
15+
@class([
16+
$field->checkDivClass ?? config('livewire-forms.defaults.checkDivClass'),
17+
'is-invalid' => $errors->first(($field->containsFile ? 'files.' : 'fields.') . $field->getName()),
18+
])
19+
>
20+
<input
21+
type="checkbox"
22+
@class([
23+
$field->class ?? config('livewire-forms.defaults.checkInputClass'),
24+
'is-invalid' => $errors->first(($field->containsFile ? 'files.' : 'fields.') . $field->getName()),
25+
])
26+
id="{{ $field->getName() . '.' . $loop->index }}"
27+
name="{{ $field->getName() }}"
28+
wire:model.{{ $field->getDebounce() }}="fields.{{ $field->getName() }}.{{ $key }}"
29+
>
30+
<label
31+
@class([
32+
'select-none',
33+
$field->checkOptionLabelClass ?? config('livewire-forms.defaults.checkLabelClass'),
34+
])
35+
for="{{ $field->getName() . '.' . $loop->index }}"
36+
>
37+
{{ $value }}
38+
</label>
39+
</div>
40+
@endforeach
41+
</div>
42+
43+
@include('livewire-forms::fields.gdpr')
44+
@include('livewire-forms::fields.error')
45+
</div>

‎resources/views/fields/checkbox.blade.php

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
2-
<input
3-
@include('livewire-forms::fields.binding')
4-
id="{{ $field->getName() }}"
5-
type="checkbox"
6-
class="{{ $field->class ?? config('livewire-forms.defaults.inputClass') }}"
7-
name="{{ $field->getName() }}"
8-
@if ($field->dusk) dusk={{ $field->dusk }} @endif
9-
>
1+
<div
2+
@class([
3+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
4+
$field->colClass ?? config('livewire-forms.defaults.colClass')
5+
])
6+
>
7+
<div @class([$field->checkDivClass ?? config('livewire-forms.defaults.checkDivClass')])>
8+
<input
9+
@include('livewire-forms::fields.binding')
10+
id="{{ $field->getName() }}"
11+
type="checkbox"
12+
@class([
13+
$field->class ?? config('livewire-forms.defaults.checkInputClass'),
14+
'is-invalid' => $errors->has('fields.' . $field->getName()),
15+
])
16+
name="{{ $field->getName() }}"
17+
@if ($field->dusk) dusk={{ $field->dusk }} @endif
18+
>
1019

11-
@include('livewire-forms::fields.label')
20+
<label
21+
@class([
22+
$field->checkLabelClass ?? config('livewire-forms.defaults.checkLabelClass')
23+
])
24+
for="{{ $field->getName() }}"
25+
>
26+
{!! $field->getLabel() !!}
27+
</label>
28+
</div>
1229

1330
@include('livewire-forms::fields.gdpr')
1431

‎resources/views/fields/date.blade.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
@include('livewire-forms::fields.label')
36

47
<input
58
@include('livewire-forms::fields.binding')
69
id="{{ $field->getName() }}"
710
type="date"
8-
class="{{ $field->class }}"
11+
@class([
12+
$field->class ?? config('livewire-forms.defaults.inputClass'),
13+
'is-invalid' => $errors->has('fields.' . $field->getName()),
14+
])
915
name="{{ $field->getName() }}"
10-
placeholder="{{ $field->getLabel() }}"
1116
@if($field->readOnly) disabled @endif
1217
value="{{ $field->getValue() }}"
1318
@if ($field->dusk) dusk={{ $field->dusk }} @endif

‎resources/views/fields/error.blade.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
@error(($field->containsFile ? 'files.' : 'fields.') . $field->getName())
2-
<span class="form-error">{{ $message }}</span>
2+
<span class="invalid-feedback">
3+
{{ $message }}
4+
</span>
35
@enderror

‎resources/views/fields/file.blade.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
@include('livewire-forms::fields.label')
36

47
<input
58
type="file"
6-
class="{{ $field->class }}"
9+
@class([
10+
$field->class ?? config('livewire-forms.defaults.inputClass'),
11+
'is-invalid' => $errors->has('fields.' . $field->getName()),
12+
])
713
id="{{ $field->getName() }}"
814
name="{{ $field->getName() }}"
915
placeholder="{{ $field->getLabel() }}"

‎resources/views/fields/group.blade.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1-
@foreach ($field->getNestedFields() as $_field)
2-
{{ $_field->render() }}
3-
@endforeach
1+
<fieldset
2+
@class([
3+
$field->groupClass ?? config('livewire-forms.defaults.groupClass'),
4+
$field->colClass ?? config('livewire-forms.defaults.colClass'),
5+
$field->gapClass ?? config('livewire-forms.defaults.gapClass')
6+
])
7+
>
8+
@if($field->legendTitle)
9+
<legend>{{ $field->legendTitle }}</legend>
10+
@endif
11+
12+
@foreach ($field->getNestedFields() as $_field)
13+
{{ $_field->render() }}
14+
@endforeach
15+
</fieldset>
16+
i

‎resources/views/fields/image.blade.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
@include('livewire-forms::fields.label')
36

47
@if($field->getValue())
58
<img
6-
class="{{ $field->class ?? 'img-fluid' }}"
9+
class="{{ $field->class ?? config('livewire-forms.defaults.imageClass') }}"
710
src="{{ isset($files_[$field->getName()]) ? $files_[$field->getName()]->temporaryUrl() : $field->getValue() }}"
811
alt="{{ $field->altText ?? optional($field->getValue())->name }}"
912
id="{{ $field->getName() }}"

‎resources/views/fields/label.blade.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<label
22
for="{{ $field->getName() }}"
3-
class="{{ $field->labelClass }} {{ ($field->getValue() ? 'changed' : '') }}"
3+
@class([
4+
$field->labelClass ?? config('livewire-forms.defaults.labelClass'),
5+
$field->getValue() ? 'changed' : ''
6+
])
47
>
58
{{ $field->getLabel() }}
69
</label>

‎resources/views/fields/link.blade.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
<a
36
href="{{ $field->getValue() }}"
4-
class="{{ $field->class }}"
7+
class="{{ $field->class ?? config('livewire-forms.defaults.linkClass') }}"
58
title="{{ $field->getName() }}"
69
@if ($field->target) target="{{ $field->target }}" @endif
710
@if ($field->dusk) dusk={{ $field->dusk }} @endif

‎resources/views/fields/multi-file.blade.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
@include('livewire-forms::fields.label')
36

47
<input
58
type="file"
6-
class="{{ $field->class }}"
9+
@class([
10+
$field->class ?? config('livewire-forms.defaults.inputClass'),
11+
'is-invalid' => $errors->has('fields.' . $field->getName()),
12+
])
713
id="{{ $field->getName() }}"
814
name="{{ $field->getName() }}[]"
915
placeholder="{{ $field->getLabel() }}"

‎resources/views/fields/multi-select.blade.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
<div class="{{ $field->divClass ?? config('livewire-forms.defaults.divClass') }}">
1+
<div @class([
2+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
3+
$field->colClass ?? config('livewire-forms.defaults.colClass')])
4+
>
25
@include('livewire-forms::fields.label')
36

47
<select
58
@include('livewire-forms::fields.binding')
69
id="{{ $field->getName() }}"
7-
class="{{ $field->class }}"
10+
@class([
11+
$field->class ?? config('livewire-forms.defaults.inputSelectClass'),
12+
'is-invalid' => $errors->has('fields.' . $field->getName()),
13+
])
814
name="{{ $field->getName() }}[]"
915
@if($field->readOnly) disabled @endif
1016
multiple

‎resources/views/fields/radio-group.blade.php

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<div
2+
@class([
3+
$field->divClass ?? config('livewire-forms.defaults.divClass'),
4+
$field->colClass ?? config('livewire-forms.defaults.colClass')
5+
])
6+
>
7+
@include('livewire-forms::fields.label')
8+
9+
<div @class([
10+
'd-flex flex-column',
11+
$field->checkGapClass ?? config('livewire-forms.defaults.checkGapClass')
12+
])>
13+
@foreach ($field->options as $key => $value)
14+
<div
15+
@class([
16+
$field->checkDivClass ?? config('livewire-forms.defaults.checkDivClass')
17+
])
18+
>
19+
<input
20+
@include('livewire-forms::fields.binding')
21+
type="radio"
22+
@class([
23+
$field->class ?? config('livewire-forms.defaults.checkInputClass'),
24+
'is-invalid' => $errors->has('fields.' . $field->getName()),
25+
])
26+
id="{{ $field->getName() . '.' . $loop->index }}"
27+
name="{{ $field->getName() }}"
28+
value="{{ $field->useValueAsKeys ? $value : $key }}"
29+
@if ($field->dusk) dusk={{ $field->dusk }} @endif
30+
>
31+
<label
32+
@class([config('livewire-forms.defaults.checkLabelClass')])
33+
for="{{ $field->getName() . '.' . $loop->index }}"
34+
>
35+
{{ $value }}
36+
</label>
37+
</div>
38+
@endforeach
39+
</div>
40+
41+
@include('livewire-forms::fields.gdpr')
42+
@include('livewire-forms::fields.error')
43+
</div>

‎resources/views/fields/radio.blade.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎resources/views/fields/row.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<div class="{{ $field->divClass ?? 'row' }}">
1+
<div
2+
@class([
3+
$field->rowClass ?? config('livewire-forms.defaults.rowClass'),
4+
$field->gutterClass ?? config('livewire-forms.defaults.gutterClass')
5+
])
6+
>
27
@foreach ($field->getNestedFields() as $_field)
38
{{ $_field->render() }}
49
@endforeach

0 commit comments

Comments
 (0)