Skip to content

Commit

Permalink
Merge pull request #38 from lara-zeus/assets
Browse files Browse the repository at this point in the history
improvements and core update
  • Loading branch information
atmonshi authored May 28, 2023
2 parents bbd2f94 + 5887244 commit 3a9e305
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 23 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2
19 changes: 19 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Path-based git attributes
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

# Ignore all test and documentation with "export-ignore".
/.github export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/phpunit.xml.dist export-ignore
/art export-ignore
/docs export-ignore
/tests export-ignore
/.editorconfig export-ignore
/.php_cs.dist.php export-ignore
/psalm.xml export-ignore
/psalm.xml.dist export-ignore
/testbench.yaml export-ignore
/UPGRADING.md export-ignore
/phpstan.neon.dist export-ignore
/phpstan-baseline.neon export-ignore
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions resources/views/themes/zeus/fill-forms.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@

@if(!empty($zeusForm->details))
<div class="m-4">
<x-zeus::box>
<x-filament::card>
{!! nl2br($zeusForm->details) !!}
</x-zeus::box>
</x-filament::card>
</div>
@endif

Expand Down
4 changes: 2 additions & 2 deletions resources/views/themes/zeus/list-forms.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-2">
@foreach($categories as $category)
<x-zeus::box>
<x-filament::card>
@if($category->logo !== null)
<img alt="{{ $category->name }} {{ __('Logo') }}" class="w-full h-32 object-center object-cover mb-4" src="{{ $category->logo_url }}"/>
@endif
Expand All @@ -28,7 +28,7 @@
</cite>
</a>
@endforeach
</x-zeus::box>
</x-filament::card>
@endforeach
</div>

Expand Down
6 changes: 3 additions & 3 deletions resources/views/themes/zeus/submitted.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<h2>{{ __('form submitted successfully') }}</h2>
</x-slot>
<x-slot name="breadcrumb"></x-slot>
<div class="max-w-4xl mx-auto">
<x-zeus::box class="mx-4">
<div class="max-w-4xl mx-auto px-4">
<x-filament::card>
@if(isset($form->options['confirmationMessage']) && !empty($form->options['confirmationMessage']))
{!! $form->options['confirmationMessage'] !!}
@else
Expand All @@ -13,6 +13,6 @@
</span>
<br>
@endif
</x-zeus::box>
</x-filament::card>
</div>
</div>
2 changes: 0 additions & 2 deletions src/Filament/Resources/FormResource/Schemata.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ public static function getTabsSchema(): array
->label(__('Form Details'))
->helperText(__('a highlighted section above the form, to show some instructions or more details')),
RichEditor::make('options.confirmation-message')
//->hint(__('Translatable'))
//->hintIcon('heroicon-s-translate')
->label(__('Confirmation Message'))
->helperText(__('optional, show a massage whenever any one submit a new entery')),
]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ protected function getViewData(): array
if (request()->filled('form_id')) {
$form = $form->where('form_id', request('form_id'));
}
$form = $form->paginate(1);

return [
'rows' => $form,
'rows' => $form->paginate(1),
];
}
}

0 comments on commit 3a9e305

Please sign in to comment.