From 442fd96bee13ff91e2904b2c8ce3d43d65f5b61f Mon Sep 17 00:00:00 2001 From: Lara van Diemen Date: Thu, 29 Jan 2026 13:54:06 +0100 Subject: [PATCH] feat: update templates after changes in whitelabel --- README.md | 2 + docs/wp-events.md | 51 ++++++++++++++++ src/Console/EventScaffoldCommand.php | 2 + src/ScaffoldServiceProvider.php | 12 ++-- .../FacetWP/loops/events-loop.blade.php | 4 +- .../loops/knowledgebase-loop.blade.php | 4 +- .../blocks/FacetWP/loops/news-loop.blade.php | 4 +- .../FacetWP/loops/project-loop.blade.php | 6 +- .../content-single-knowledgebase.blade.php | 18 ------ .../partials/content-single-news.blade.php | 23 ------- .../partials/content-single-person.blade.php | 7 --- .../partials/content-single-project.blade.php | 53 ---------------- ...ntent-single-yard-event-schedule.blade.php | 13 ---- .../content-single-yard-event.blade.php | 26 -------- .../views/single-knowledgebase.blade.php | 24 ++++++++ stubs/resources/views/single-news.blade.php | 29 +++++++++ stubs/resources/views/single-person.blade.php | 11 ++++ .../resources/views/single-project.blade.php | 61 +++++++++++++++++++ .../single-yard-event-schedule.blade.php | 13 ++++ .../views/single-yard-event.blade.php | 33 ++++++++++ .../wp-events/blocks/event-info.blade.php | 14 ++--- 21 files changed, 252 insertions(+), 158 deletions(-) create mode 100644 docs/wp-events.md delete mode 100644 stubs/resources/views/partials/content-single-knowledgebase.blade.php delete mode 100644 stubs/resources/views/partials/content-single-news.blade.php delete mode 100644 stubs/resources/views/partials/content-single-person.blade.php delete mode 100644 stubs/resources/views/partials/content-single-project.blade.php delete mode 100644 stubs/resources/views/partials/content-single-yard-event-schedule.blade.php delete mode 100644 stubs/resources/views/partials/content-single-yard-event.blade.php create mode 100644 stubs/resources/views/single-knowledgebase.blade.php create mode 100644 stubs/resources/views/single-news.blade.php create mode 100644 stubs/resources/views/single-person.blade.php create mode 100644 stubs/resources/views/single-project.blade.php create mode 100644 stubs/resources/views/single-yard-event-schedule.blade.php create mode 100644 stubs/resources/views/single-yard-event.blade.php diff --git a/README.md b/README.md index f9abdcd..7cfd050 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ wp acorn scaffold:person wp acorn scaffold:project ``` +After scaffolding wp-events, [follow these manual steps to complete the setup](docs/wp-events.md). + ### Child Themes To create a child theme you can run the following command. This will create a child theme directory in diff --git a/docs/wp-events.md b/docs/wp-events.md new file mode 100644 index 0000000..026380b --- /dev/null +++ b/docs/wp-events.md @@ -0,0 +1,51 @@ +# WP Events + +Use the WP Acorn scaffold command to get started: + +```shell +wp acorn scaffold:wp-events +``` + +After scaffolding, follow these steps: + +## 1. Install dependencies + +```shell +composer require yard/wp-events +``` + +## 2. Run the Acorn WP-CLI command to discover this package + +```shell +wp acorn package:discover +``` + +## 3. Update the Card component + +Add the following parameters to the `__construct` method in the `Cards.php` file: + +```php +public function __construct( + // existing params... + public ?string $eventDateTime = null, + public ?string $eventLocation = null, +) { + // existing code... +} +``` + +Add the following line to the view of the Card component: + +```php + +``` + +## 4. Import css file + +Add the following import to your frontend stylesheet: + +```css +@import './blocks/add-event-to-calendar/shared'; +``` + +Everything should now be set up and ready to use! diff --git a/src/Console/EventScaffoldCommand.php b/src/Console/EventScaffoldCommand.php index 44cc04d..aa235ed 100644 --- a/src/Console/EventScaffoldCommand.php +++ b/src/Console/EventScaffoldCommand.php @@ -31,5 +31,7 @@ public function handle(): void '--provider' => 'Yard\\Brave\\Scaffold\\ScaffoldServiceProvider', '--tag' => 'wp-events', ]); + $this->info('You need to do some additional steps after running this scaffold. Please read the docs here:'); + $this->line('https://github.com/yardinternet/brave-scaffold/blob/main/docs/wp-events.md'); } } diff --git a/src/ScaffoldServiceProvider.php b/src/ScaffoldServiceProvider.php index adeaf1b..05040e6 100644 --- a/src/ScaffoldServiceProvider.php +++ b/src/ScaffoldServiceProvider.php @@ -60,7 +60,7 @@ public function bootingPackage(): void __DIR__ . '/../stubs/config/facetwp/templates/news.php' => config_path('facetwp/templates/news.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/loops/news-loop.blade.php' => resource_path('views/blocks/FacetWP/loops/news-loop.blade.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/templates/news.blade.php' => resource_path('views/blocks/FacetWP/templates/news.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-news.blade.php' => resource_path('views/partials/content-single-news.blade.php'), + __DIR__ . '/../stubs/resources/views/single-news.blade.php' => resource_path('views/single-news.blade.php'), ], 'news'); $this->publishes([ @@ -73,7 +73,7 @@ public function bootingPackage(): void __DIR__ . '/../stubs/config/facetwp/templates/knowledgebase.php' => config_path('facetwp/templates/knowledgebase.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/loops/knowledgebase-loop.blade.php' => resource_path('views/blocks/FacetWP/loops/knowledgebase-loop.blade.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/templates/knowledgebase.blade.php' => resource_path('views/blocks/FacetWP/templates/knowledgebase.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-knowledgebase.blade.php' => resource_path('views/partials/content-single-knowledgebase.blade.php'), + __DIR__ . '/../stubs/resources/views/single-knowledgebase.blade.php' => resource_path('views/single-knowledgebase.blade.php'), __DIR__ . '/../stubs/acf-json/group_66e0254a243fd.json' => base_path('acf-json/group_66e0254a243fd.json'), ], 'knowledgebase'); @@ -87,7 +87,7 @@ public function bootingPackage(): void __DIR__ . '/../stubs/resources/views/blocks/FacetWP/loops/person-loop.blade.php' => resource_path('views/blocks/FacetWP/loops/person-loop.blade.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/templates/person.blade.php' => resource_path('views/blocks/FacetWP/templates/person.blade.php'), __DIR__ . '/../stubs/resources/views/components/meta/person.blade.php' => resource_path('views/components/meta/person.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-person.blade.php' => resource_path('views/partials/content-single-person.blade.php'), + __DIR__ . '/../stubs/resources/views/single-person.blade.php' => resource_path('views/single-person.blade.php'), __DIR__ . '/../stubs/acf-json/group_66e02ff47667d.json' => base_path('acf-json/group_66e02ff47667d.json'), ], 'person'); @@ -106,7 +106,7 @@ public function bootingPackage(): void __DIR__ . '/../stubs/config/poet/taxonomy/project_type.php' => config_path('poet/taxonomy/project_type.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/loops/project-loop.blade.php' => resource_path('views/blocks/FacetWP/loops/project-loop.blade.php'), __DIR__ . '/../stubs/resources/views/blocks/FacetWP/templates/project.blade.php' => resource_path('views/blocks/FacetWP/templates/project.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-project.blade.php' => resource_path('views/partials/content-single-project.blade.php'), + __DIR__ . '/../stubs/resources/views/single-project.blade.php' => resource_path('views/single-project.blade.php'), ], 'project'); $this->publishes([ @@ -121,8 +121,8 @@ public function bootingPackage(): void __DIR__ . '/../stubs/resources/views/blocks/FacetWP/templates/events.blade.php' => resource_path('views/blocks/FacetWP/templates/events.blade.php'), __DIR__ . '/../stubs/resources/views/components/meta/event.blade.php' => resource_path('views/components/meta/event.blade.php'), __DIR__ . '/../stubs/resources/views/vendor/wp-events/blocks/event-info.blade.php' => resource_path('views/vendor/wp-events/blocks/event-info.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-yard-event-schedule.blade.php' => resource_path('views/partials/content-single-yard-event-schedule.blade.php'), - __DIR__ . '/../stubs/resources/views/partials/content-single-yard-event.blade.php' => resource_path('views/partials/content-single-yard-event.blade.php'), + __DIR__ . '/../stubs/resources/views/single-yard-event-schedule.blade.php' => resource_path('views/single-yard-event-schedule.blade.php'), + __DIR__ . '/../stubs/resources/views/single-yard-event.blade.php' => resource_path('views/partials/content-single-yard-event.blade.php'), ], 'wp-events'); } } diff --git a/stubs/resources/views/blocks/FacetWP/loops/events-loop.blade.php b/stubs/resources/views/blocks/FacetWP/loops/events-loop.blade.php index 3a1aa97..0d22875 100644 --- a/stubs/resources/views/blocks/FacetWP/loops/events-loop.blade.php +++ b/stubs/resources/views/blocks/FacetWP/loops/events-loop.blade.php @@ -1,6 +1,8 @@ +@use(App\View\Components\Card\Enums\Direction) +
@forelse ($postDataCollection as $postData) - + @empty @endforelse diff --git a/stubs/resources/views/blocks/FacetWP/loops/knowledgebase-loop.blade.php b/stubs/resources/views/blocks/FacetWP/loops/knowledgebase-loop.blade.php index fbb8fec..ef7dedd 100644 --- a/stubs/resources/views/blocks/FacetWP/loops/knowledgebase-loop.blade.php +++ b/stubs/resources/views/blocks/FacetWP/loops/knowledgebase-loop.blade.php @@ -1,6 +1,8 @@ +@use(App\View\Components\Card\Enums\Direction) +
@forelse ($postDataCollection as $postData) - + @empty @endforelse diff --git a/stubs/resources/views/blocks/FacetWP/loops/news-loop.blade.php b/stubs/resources/views/blocks/FacetWP/loops/news-loop.blade.php index 49e9f12..df6c8a6 100644 --- a/stubs/resources/views/blocks/FacetWP/loops/news-loop.blade.php +++ b/stubs/resources/views/blocks/FacetWP/loops/news-loop.blade.php @@ -1,6 +1,8 @@ +@use(App\View\Components\Card\Enums\Direction) +
@forelse ($postDataCollection as $postData) - + @empty @endforelse diff --git a/stubs/resources/views/blocks/FacetWP/loops/project-loop.blade.php b/stubs/resources/views/blocks/FacetWP/loops/project-loop.blade.php index 0a740ce..370c5a6 100644 --- a/stubs/resources/views/blocks/FacetWP/loops/project-loop.blade.php +++ b/stubs/resources/views/blocks/FacetWP/loops/project-loop.blade.php @@ -1,6 +1,8 @@ -
+@use(App\View\Components\Card\Enums\Direction) + +
@forelse ($postDataCollection as $postData) - + @empty @include('blocks.FacetWP.partials.no-results') @endforelse diff --git a/stubs/resources/views/partials/content-single-knowledgebase.blade.php b/stubs/resources/views/partials/content-single-knowledgebase.blade.php deleted file mode 100644 index a6ed9e6..0000000 --- a/stubs/resources/views/partials/content-single-knowledgebase.blade.php +++ /dev/null @@ -1,18 +0,0 @@ - - -

{!! $postData->title() !!}

- -{!! $postData->content() !!} - - - -@if ($postData->related()->isNotEmpty()) -

Bekijk ook

-
-
- @foreach ($postData->related() as $related) - - @endforeach -
-
-@endif diff --git a/stubs/resources/views/partials/content-single-news.blade.php b/stubs/resources/views/partials/content-single-news.blade.php deleted file mode 100644 index 19e5d5d..0000000 --- a/stubs/resources/views/partials/content-single-news.blade.php +++ /dev/null @@ -1,23 +0,0 @@ - - -

{!! $postData->title() !!}

- - - -{!! $postData->content() !!} - - - -@if ($postData->related()->isNotEmpty()) -

{{ __('Het laatste nieuws', 'sage') }}

-
-
- @foreach ($postData->related() as $related) - - @endforeach -
-
-@endif diff --git a/stubs/resources/views/partials/content-single-person.blade.php b/stubs/resources/views/partials/content-single-person.blade.php deleted file mode 100644 index 790aa7f..0000000 --- a/stubs/resources/views/partials/content-single-person.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - -

{!! $postData->title() !!}

- - - -{!! $postData->content() !!} diff --git a/stubs/resources/views/partials/content-single-project.blade.php b/stubs/resources/views/partials/content-single-project.blade.php deleted file mode 100644 index 9483eef..0000000 --- a/stubs/resources/views/partials/content-single-project.blade.php +++ /dev/null @@ -1,53 +0,0 @@ - - -

{!! $postData->title() !!}

- -@if ($postData->isParent() || $postData->isChild() || $postData->isInformationPost) -
- - @if ($postData->isParent()) -
{{ __('Hoofdproject', 'sage') }}
- - {{ __('Naar alle deelprojecten', 'sage') }} - - - @endif - @if ($postData->isChild() && !$postData->isInformationPost) -
- {{ __('Deelproject van', 'sage') }} - {!! $postData->parent()->title() !!} -
- @endif - @if ($postData->isInformationPost) -
- {{ __('Informatie over', 'sage') }} - {!! $postData->parent()->title() !!} -
- @endif -
-@endif - -{!! $postData->content() !!} - -
- - - -@if ($postData->isParent()) -

- {{ $postData->children()->count() > 1 ? __('Deelprojecten', 'sage') : __('Deelproject', 'sage') }}:

-
- @foreach ($postData->children() as $child) - - @endforeach -
-@endif - -@if ($postData->related()->isNotEmpty()) -

{{ $postData->related()->count() > 1 ? __('Gerelateerde projecten', 'sage') : __('Gerelateerd project', 'sage') }}

-
- @foreach ($postData->related() as $related) - - @endforeach -
-@endif diff --git a/stubs/resources/views/partials/content-single-yard-event-schedule.blade.php b/stubs/resources/views/partials/content-single-yard-event-schedule.blade.php deleted file mode 100644 index 993bd09..0000000 --- a/stubs/resources/views/partials/content-single-yard-event-schedule.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -

- {!! $postData->title() !!} -

- -

{!! $postData->excerpt !!}

- -
-
- @foreach ($postData->events() as $event) - - @endforeach -
-
diff --git a/stubs/resources/views/partials/content-single-yard-event.blade.php b/stubs/resources/views/partials/content-single-yard-event.blade.php deleted file mode 100644 index eed5022..0000000 --- a/stubs/resources/views/partials/content-single-yard-event.blade.php +++ /dev/null @@ -1,26 +0,0 @@ - - -

{!! $postData->schedule()->title !!}

-@if ($postData->hasStarted()) - - Deze activiteit is al begonnen. - -@endif -@if ($postData->hasEnded()) - - Deze activiteit heeft al plaatsgevonden. - -@endif - -{!! $postData->schedule()->content() !!} - -@if ($postData->related()->isNotEmpty()) -

{{ __('Bekijk ook deze evenementen','sage') }}

-
-
- @foreach ($postData->related() as $related) - - @endforeach -
-
-@endif diff --git a/stubs/resources/views/single-knowledgebase.blade.php b/stubs/resources/views/single-knowledgebase.blade.php new file mode 100644 index 0000000..df9045e --- /dev/null +++ b/stubs/resources/views/single-knowledgebase.blade.php @@ -0,0 +1,24 @@ + + + + +

{!! $postData->title() !!}

+ + {!! $postData->content() !!} + + + + + + @if ($postData->related()->isNotEmpty()) +

Bekijk ook

+
+
+ @foreach ($postData->related() as $related) + + @endforeach +
+
+ @endif + + diff --git a/stubs/resources/views/single-news.blade.php b/stubs/resources/views/single-news.blade.php new file mode 100644 index 0000000..3f107f0 --- /dev/null +++ b/stubs/resources/views/single-news.blade.php @@ -0,0 +1,29 @@ + + + + +

{!! $postData->title() !!}

+ + + + {!! $postData->content() !!} + + + + + + @if ($postData->related()->isNotEmpty()) +

{{ __('Het laatste nieuws', 'sage') }}

+
+
+ @foreach ($postData->related() as $related) + + @endforeach +
+
+ @endif + + diff --git a/stubs/resources/views/single-person.blade.php b/stubs/resources/views/single-person.blade.php new file mode 100644 index 0000000..74ac082 --- /dev/null +++ b/stubs/resources/views/single-person.blade.php @@ -0,0 +1,11 @@ + + + + +

{!! $postData->title() !!}

+ + + + {!! $postData->content() !!} + + diff --git a/stubs/resources/views/single-project.blade.php b/stubs/resources/views/single-project.blade.php new file mode 100644 index 0000000..a25253a --- /dev/null +++ b/stubs/resources/views/single-project.blade.php @@ -0,0 +1,61 @@ + + + + +

{!! $postData->title() !!}

+ + @if ($postData->isParent() || $postData->isChild() || $postData->isInformationPost) +
+ + @if ($postData->isParent()) +
{{ __('Hoofdproject', 'sage') }}
+ + {{ __('Naar alle deelprojecten', 'sage') }} + + + @endif + @if ($postData->isChild() && !$postData->isInformationPost) +
+ {{ __('Deelproject van', 'sage') }} + {!! $postData->parent()->title() !!} +
+ @endif + @if ($postData->isInformationPost) +
+ {{ __('Informatie over', 'sage') }} + {!! $postData->parent()->title() !!} +
+ @endif +
+ @endif + + {!! $postData->content() !!} + +
+ + + + + + @if ($postData->isParent()) +

+ {{ $postData->children()->count() > 1 ? __('Deelprojecten', 'sage') : __('Deelproject', 'sage') }}:

+
+ @foreach ($postData->children() as $child) + + @endforeach +
+ @endif + + @if ($postData->related()->isNotEmpty()) +

+ {{ $postData->related()->count() > 1 ? __('Gerelateerde projecten', 'sage') : __('Gerelateerd project', 'sage') }} +

+
+ @foreach ($postData->related() as $related) + + @endforeach +
+ @endif + + diff --git a/stubs/resources/views/single-yard-event-schedule.blade.php b/stubs/resources/views/single-yard-event-schedule.blade.php new file mode 100644 index 0000000..91513ad --- /dev/null +++ b/stubs/resources/views/single-yard-event-schedule.blade.php @@ -0,0 +1,13 @@ + +
+

{!! $postData->title() !!}

+ +

{!! $postData->excerpt !!}

+ +
+ @foreach ($postData->events() as $event) + + @endforeach +
+
+ diff --git a/stubs/resources/views/single-yard-event.blade.php b/stubs/resources/views/single-yard-event.blade.php new file mode 100644 index 0000000..5b85e40 --- /dev/null +++ b/stubs/resources/views/single-yard-event.blade.php @@ -0,0 +1,33 @@ + + + + +

{!! $postData->schedule()->title !!}

+ + @if ($postData->hasStarted()) + + Deze activiteit is al begonnen. + + @endif + @if ($postData->hasEnded()) + + Deze activiteit heeft al plaatsgevonden. + + @endif + + {!! $postData->schedule()->content() !!} + + + + @if ($postData->related()->isNotEmpty()) +

{{ __('Bekijk ook deze evenementen', 'sage') }}

+
+
+ @foreach ($postData->related() as $related) + + @endforeach +
+
+ @endif + + diff --git a/stubs/resources/views/vendor/wp-events/blocks/event-info.blade.php b/stubs/resources/views/vendor/wp-events/blocks/event-info.blade.php index 5bc71f9..16280c5 100644 --- a/stubs/resources/views/vendor/wp-events/blocks/event-info.blade.php +++ b/stubs/resources/views/vendor/wp-events/blocks/event-info.blade.php @@ -4,10 +4,10 @@ @if (!($eventData instanceof EventData)) - {{ __('Momenteel kan er (nog) geen event informatie getoond worden.','sage') }} + {{ __('Momenteel kan er (nog) geen event informatie getoond worden.', 'sage') }} @else -