Skip to content

Commit c9d9f40

Browse files
VoltraVoltra
authored
Backport minor non-breaking changes from 3.X
1 parent 3d0de27 commit c9d9f40

File tree

16 files changed

+574
-72
lines changed

16 files changed

+574
-72
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ trim_trailing_whitespace = false
1313

1414
[*.{yml,yaml}]
1515
indent_size = 2
16+
17+
[*.{neon,neon.dist}]
18+
indent_size = 4

‎.gitattributes‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
* text=auto eol=lf
2+
3+
*.blade.php diff=html
4+
*.css diff=css
5+
*.html diff=html
6+
*.md diff=markdown
7+
*.php diff=php
8+
19
# Path-based git attributes
210
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
311

@@ -17,3 +25,213 @@
1725
/UPGRADING.md export-ignore
1826
/phpstan.neon.dist export-ignore
1927
/phpstan-baseline.neon export-ignore
28+
/.travis.yml export-ignore
29+
/.scrutinizer.yml export-ignore
30+
31+
32+
/.idea export-ignore
33+
/.prettierrc export-ignore
34+
/.package-lock.json export-ignore
35+
/.editorconfig export-ignore
36+
/.php_cs.dist.php export-ignore
37+
/.vscode export-ignore
38+
/images export-ignore
39+
/package.json export-ignore
40+
/postcss.config.js export-ignore
41+
/phpunit.xml.dist export-ignore
42+
/pint.json export-ignore
43+
/psalm.xml export-ignore
44+
/psalm.xml.dist export-ignore
45+
/tailwind.config.js export-ignore
46+
/testbench.yaml export-ignore
47+
/UPGRADING.md export-ignore
48+
49+
50+
## GITATTRIBUTES FOR WEB PROJECTS
51+
#
52+
# These settings are for any web project.
53+
#
54+
# Details per file setting:
55+
# text These files should be normalized (i.e. convert CRLF to LF).
56+
# binary These files are binary and should be left untouched.
57+
#
58+
# Note that binary is a macro for -text -diff.
59+
######################################################################
60+
61+
# Auto detect
62+
## Handle line endings automatically for files detected as
63+
## text and leave all files detected as binary untouched.
64+
## This will handle all files NOT defined below.
65+
66+
# Source code
67+
*.js text
68+
*.mjs text
69+
*.cjs text
70+
*.json text
71+
*.ls text
72+
*.map text -diff
73+
*.sass text
74+
*.scss text diff=css
75+
*.sh text eol=lf
76+
.husky/* text eol=lf
77+
*.sql text
78+
*.ts text
79+
80+
# Docker
81+
Dockerfile text
82+
83+
# Documentation
84+
*.ipynb text eol=lf
85+
*.markdown text diff=markdown
86+
*.md text diff=markdown
87+
*.mdwn text diff=markdown
88+
*.mdown text diff=markdown
89+
*.mkd text diff=markdown
90+
*.mkdn text diff=markdown
91+
*.mdtxt text
92+
*.mdtext text
93+
*.txt text
94+
AUTHORS text
95+
CHANGELOG text
96+
CHANGES text
97+
CONTRIBUTING text
98+
COPYING text
99+
copyright text
100+
*COPYRIGHT* text
101+
INSTALL text
102+
license text
103+
LICENSE text
104+
NEWS text
105+
readme text
106+
*README* text
107+
TODO text
108+
109+
# Templates
110+
*.dot text
111+
*.ejs text
112+
*.erb text
113+
*.haml text
114+
*.handlebars text
115+
*.hbs text
116+
*.hbt text
117+
*.jade text
118+
*.latte text
119+
*.mustache text
120+
*.njk text
121+
*.phtml text
122+
*.svelte text
123+
*.tmpl text
124+
*.tpl text
125+
*.twig text
126+
*.vue text
127+
128+
# Configs
129+
*.cnf text
130+
*.conf text
131+
*.config text
132+
.editorconfig text
133+
*.env text
134+
.gitattributes text
135+
.gitconfig text
136+
.htaccess text
137+
*.lock text -diff
138+
package.json text eol=lf
139+
package-lock.json text eol=lf -diff
140+
pnpm-lock.yaml text eol=lf -diff
141+
.prettierrc text
142+
yarn.lock text -diff
143+
*.toml text
144+
*.yaml text
145+
*.yml text
146+
browserslist text
147+
Makefile text
148+
makefile text
149+
# Fixes syntax highlighting on GitHub to allow comments
150+
tsconfig.json linguist-language=JSON-with-Comments
151+
152+
# Heroku
153+
Procfile text
154+
155+
# Graphics
156+
*.ai binary
157+
*.bmp binary
158+
*.eps binary
159+
*.gif binary
160+
*.gifv binary
161+
*.ico binary
162+
*.jng binary
163+
*.jp2 binary
164+
*.jpg binary
165+
*.jpeg binary
166+
*.jpx binary
167+
*.jxr binary
168+
*.pdf binary
169+
*.png binary
170+
*.psb binary
171+
*.psd binary
172+
# SVG treated as an asset (binary) by default.
173+
*.svg text
174+
# If you want to treat it as binary,
175+
# use the following line instead.
176+
*.svgz binary
177+
*.tif binary
178+
*.tiff binary
179+
*.wbmp binary
180+
*.webp binary
181+
182+
# Audio
183+
*.kar binary
184+
*.m4a binary
185+
*.mid binary
186+
*.midi binary
187+
*.mp3 binary
188+
*.ogg binary
189+
*.ra binary
190+
191+
# Video
192+
*.3gpp binary
193+
*.3gp binary
194+
*.as binary
195+
*.asf binary
196+
*.asx binary
197+
*.avi binary
198+
*.fla binary
199+
*.flv binary
200+
*.m4v binary
201+
*.mng binary
202+
*.mov binary
203+
*.mp4 binary
204+
*.mpeg binary
205+
*.mpg binary
206+
*.ogv binary
207+
*.swc binary
208+
*.swf binary
209+
*.webm binary
210+
211+
# Archives
212+
*.7z binary
213+
*.gz binary
214+
*.jar binary
215+
*.rar binary
216+
*.tar binary
217+
*.zip binary
218+
219+
# Fonts
220+
*.ttf binary
221+
*.eot binary
222+
*.otf binary
223+
*.woff binary
224+
*.woff2 binary
225+
226+
# Executables
227+
*.exe binary
228+
*.pyc binary
229+
# Prevents massive diffs caused by vendored, minified files
230+
**/.yarn/releases/** binary
231+
**/.yarn/plugins/** binary
232+
233+
# RC files (like .babelrc or .eslintrc)
234+
*.*rc text
235+
236+
# Ignore files (like .npmignore or .gitignore)
237+
*.*ignore text

‎README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
<img alt="fabricator banner" src="https://raw.githubusercontent.com/z3d0x/filament-fabricator/2.x/art/banner.jpg" />
88
</p>
99

10-
***What is Filament Fabricator?*** Filament Fabricator is simply said a block-based page builder skeleton. Filament Fabricator takes care of the PageResource & frontend routing, so you can focus on what really matters: your [Layouts](https://filamentphp.com/plugins/z3d0x-fabricator#layouts) & [Page Blocks](https://filamentphp.com/plugins/z3d0x-fabricator#page-blocks).
10+
**_What is Filament Fabricator?_** Filament Fabricator is simply said a block-based page builder skeleton. Filament Fabricator takes care of the PageResource & frontend routing, so you can focus on what really matters: your [Layouts](https://filamentphp.com/plugins/z3d0x-fabricator#layouts) & [Page Blocks](https://filamentphp.com/plugins/z3d0x-fabricator#page-blocks).
1111

1212
## Compatibility
13-
| Fabricator | Filament | PHP |
14-
|------|----------|--------|
15-
| [1.x](https://github.com/z3d0x/filament-fabricator/tree/1.x) | ^2.0 | ^8.0 |
16-
| [2.x](https://github.com/z3d0x/filament-fabricator/tree/2.x) | ^3.0 | ^8.1 |
13+
14+
| Fabricator | Filament | PHP |
15+
| ------------------------------------------------------------ | -------- | ---- |
16+
| [1.x](https://github.com/z3d0x/filament-fabricator/tree/1.x) | ^2.0 | ^8.0 |
17+
| [2.x](https://github.com/z3d0x/filament-fabricator/tree/2.x) | ^3.0 | ^8.1 |
18+
| [3.x](https://github.com/z3d0x/filament-fabricator/tree/3.x) | ^4.0 | ^8.2 |
1719

1820
## Installation
1921

@@ -23,8 +25,8 @@ You can install the package via composer:
2325
composer require z3d0x/filament-fabricator
2426
```
2527

26-
2728
After that run the install command:
29+
2830
```bash
2931
php artisan filament-fabricator:install
3032
```
@@ -76,10 +78,10 @@ Please review [our security policy](../../security/policy) on how to report secu
7678

7779
## Credits
7880

79-
- [ZedoX](https://github.com/Z3d0X)
80-
- [Voltra](https://github.com/Voltra)
81-
- [Patrick Boivin](https://github.com/pboivin) - Filament Peek
82-
- [All Contributors](../../contributors)
81+
- [ZedoX](https://github.com/Z3d0X)
82+
- [Voltra](https://github.com/Voltra)
83+
- [Patrick Boivin](https://github.com/pboivin) - Filament Peek
84+
- [All Contributors](../../contributors)
8385

8486
## License
8587

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
}
4747
},
4848
"scripts": {
49-
"pint": "vendor/bin/pint",
50-
"test:pest": "vendor/bin/pest --parallel",
51-
"test:phpstan": "vendor/bin/phpstan analyse",
49+
"pint": "@php ./vendor/bin/pint",
50+
"test:pest": "@php ./vendor/bin/pest --parallel",
51+
"test:phpstan": "@php ./vendor/bin/phpstan analyse",
5252
"test": [
5353
"@test:pest",
5454
"@test:phpstan"

‎config/filament-fabricator.php‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,86 @@
33
// config for Z3d0X/FilamentFabricator
44
return [
55
'routing' => [
6+
/**
7+
* Whether routing should be automatically handled.
8+
* Disable if you want finer and manual control over how the routing to your pages is done.
9+
*/
610
'enabled' => true,
11+
12+
/**
13+
* The prefix to use for all pages' routes.
14+
* Leave to null if you don't want them to have a prefix.
15+
* A prefix set to '/pages' means that a page of slug 'page-1'
16+
* would be accessed through `/pages/page-1` if routing is enabled.
17+
*/
718
'prefix' => null, // /pages
819
],
920

1021
'layouts' => [
22+
/**
23+
* The base namespace for all your
24+
* filament-fabricator page layouts
25+
*/
1126
'namespace' => 'App\\Filament\\Fabricator\\Layouts',
27+
28+
/**
29+
* The path to your layouts (folder or glob)
30+
* This is used when auto-registering them
31+
*/
1232
'path' => app_path('Filament/Fabricator/Layouts'),
33+
34+
/**
35+
* A list of layout classes you want to manually register
36+
* in addition to those that are auto-registered
37+
*/
1338
'register' => [
1439
//
1540
],
1641
],
1742

1843
'page-blocks' => [
44+
/**
45+
* The base namespace for all your filament-fabricator page blocks
46+
*/
1947
'namespace' => 'App\\Filament\\Fabricator\\PageBlocks',
48+
49+
/**
50+
* The path to your blocks (folder or glob)
51+
* This is used when auto-registering them
52+
*/
2053
'path' => app_path('Filament/Fabricator/PageBlocks'),
54+
55+
/**
56+
* A list of block classes you want to manually register
57+
* in addition to those that are auto-registered
58+
*/
2159
'register' => [
2260
//
2361
],
2462
],
2563

64+
/**
65+
* The middleware(s) to apply to your pages when routing is enabled
66+
*/
2667
'middleware' => [
2768
'web',
2869
],
2970

71+
/**
72+
* The page model to be used by the package.
73+
* Replace this if you ever extend it
74+
*/
3075
'page-model' => \Z3d0X\FilamentFabricator\Models\Page::class,
3176

77+
/**
78+
* The page filament resource to be used by the package.
79+
* Replace this if you ever extend it
80+
*/
3281
'page-resource' => \Z3d0X\FilamentFabricator\Resources\PageResource::class,
3382

83+
/**
84+
* Whether you want to have a view page as part of your PageResource
85+
*/
3486
'enable-view-page' => false,
3587

3688
/**
@@ -47,7 +99,7 @@
4799
*/
48100
'hook-to-commands' => true,
49101

50-
/*
102+
/**
51103
* This is the name of the table that will be created by the migration and
52104
* used by the above page-model shipped with this package.
53105
*/

0 commit comments

Comments
 (0)