Merge pull request #95 from musimana/feature/AddBlocksToHomepage

feat: Add AppBlocks to the Homepage
musimana · Jun 2, 2024 · b623d68 · b623d68
2 parents 6a99201 + 52ddf73
commit b623d68
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources\Views\Public\Content;
 
+use App\Http\Resources\Views\Public\Blocks\BlocksResource;
 use App\Http\Resources\Views\Public\Summaries\PageSummaryResource;
 use App\Interfaces\Resources\Items\ConstantItemInterface;
 use App\Models\Page;
@@ -19,6 +20,7 @@ public function getItem(): array
         $items = Page::query()->isNotHomepage()->whereNot('slug', 'about')->get();
 
         return [
+            'blocks' => $page?->blocks ? (new BlocksResource)->getItems($page->blocks) : [],
             'bodytext' => $page?->getContent() ?? '',
             'heading' => $page?->getTitle() ?? config('app.name'),
             'items' => $items

diff --git a/resources/js/Pages/Public/Partials/ContentHomepage.vue b/resources/js/Pages/Public/Partials/ContentHomepage.vue
@@ -1,4 +1,5 @@
 <script setup>
+import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
 import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
 import AppSectionHtml from '@/Components/Sections/AppSectionHtml.vue'
 import BlockIndexPanels from '@/Components/Blocks/BlockIndexPanels.vue'
@@ -14,7 +15,12 @@ import BlockIndexPanels from '@/Components/Blocks/BlockIndexPanels.vue'
   />
 
   <BlockIndexPanels
+    v-if="$page.props.content?.items.length"
     :items="$page.props.content.items ?? []"
     title="Features"
   />
+
+  <AppBlocks
+    v-if="$page.props.content.blocks ?? []"
+  />
 </template>
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
@@ -14,14 +14,19 @@
 test('getItem returns ok without a Page Model', function () {
     $actual = (new HomepageContentResource)->getItem();
 
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toBeEmpty();
+
     expect($actual['items'])
         ->toBeArray()
         ->toBeEmpty();
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(5)
         ->toMatchArray([
+            'blocks' => [],
             'bodytext' => '',
             'heading' => config('app.name'),
             'items' => [],
@@ -38,14 +43,19 @@
 
     $actual = (new HomepageContentResource)->getItem();
 
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toBeEmpty();
+
     expect($actual['items'])
         ->toBeArray()
         ->toBeEmpty();
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(5)
         ->toMatchArray([
+            'blocks' => [],
             'bodytext' => $page->content,
             'heading' => $page->title,
             'items' => [],