From 4014d4857aa0fde9fa7b70497a37f1f02d45e17d Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:53:58 +0100
Subject: [PATCH 001/111] Update articles CSS rules for HTML quote elements

---
 resources/css/components/articles.css | 37 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/resources/css/components/articles.css b/resources/css/components/articles.css
index ce2cd2c1..e1ed1f5b 100644
--- a/resources/css/components/articles.css
+++ b/resources/css/components/articles.css
@@ -58,11 +58,40 @@ section.app-article p code {
 }
 
 section.app-article ul li i,
-section.app-article p i
-{
+section.app-article p i {
   @apply
     font-semibold
-    text-gray-900
-    dark:text-gray-100
     tracking-wide;
 }
+
+section.app-article blockquote,
+section.app-article q {
+  @apply
+    w-full
+    text-lg
+    text-gray-800
+    dark:text-gray-200
+    mb-8
+    border-l-4
+    border-gray-900
+    dark:border-gray-300
+    px-4
+    py-2
+    bg-gray-200
+    dark:bg-gray-800;
+}
+
+section.app-article blockquote p,
+section.app-article q p {
+  @apply
+    mb-0;
+}
+
+section.app-article blockquote p i,
+section.app-article blockquote ul li i,
+section.app-article q p i,
+section.app-article q ul li i {
+  @apply
+    font-normal
+    tracking-widest;
+}

From 54c2ef7a6b33aa9c64532672ce943341893aa5c1 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:54:50 +0100
Subject: [PATCH 002/111] Move about page seed quote mark-up to the WYSIWYG
 block

---
 storage/app/seeds/pages.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 76957498..757b3f99 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -76,9 +76,6 @@
         'slug' => 'about',
         'title' => 'About',
         'subtitle' => config('app.name'),
-        'content' => '
-            <p class="text-lg text-gray-800 dark:text-gray-200 tracking-widest mb-8 border-l-4 border-gray-900 dark:border-gray-300 p-2 bg-gray-200 dark:bg-gray-800"><em>"Laravel Breeze variant with Vue, Inertia & Tailwind"</em></p>
-        ',
         'meta_title' => 'About',
         'meta_description' => config('metadata.description'),
         'template' => WebpageTemplate::PUBLIC_CONTENT->value,
@@ -87,6 +84,11 @@
                 'type' => BlockType::WYSIWYG->value,
                 'data' => json_encode([
                     'html' => '
+                        <blockquote>
+                            <p>
+                                <i>“Laravel Breeze variant with Vue, Inertia &amp; Tailwind”&nbsp;</i>
+                            </p>
+                        </blockquote>
                         <p>
                             Bassform is a light-weight template for scaffolding
                             <a href="https://laravel.com/" target="_blank" rel="noopener noreferrer"><i>Laravel</i></a> apps,

From 0e585e987a36b4de5d8cedf0c0e2350e069aea98 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:56:07 +0100
Subject: [PATCH 003/111] Update InputWysiwyg component wrapper element &
 styling

---
 resources/js/Components/Forms/Inputs/InputWysiwyg.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
index c42214db..0082f99f 100644
--- a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
+++ b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
@@ -86,12 +86,12 @@ Editor
 </script>
 
 <template>
-  <div class="bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100 border-gray-500 focus:border-gray-100 focus:ring-gray-100 rounded-md shadow-sm dark:shadow-none">
+  <section class="app-article bg-gray-100 dark:bg-gray-900 border-gray-500 focus:border-gray-100 focus:ring-gray-100 rounded-md shadow-sm dark:shadow-none">
     <CKEditor.component
       :editor="Editor"
       v-model="model"
     ></CKEditor.component>
-  </div>
+  </section>
 </template>
 
 <style>

From bdf4dd380b17f6db2347973008e0529ce9bcdf6f Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 02:02:06 +0100
Subject: [PATCH 004/111] Add PRIVACY_POLICY case to BlockType enum

---
 app/Enums/Blocks/BlockType.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/Enums/Blocks/BlockType.php b/app/Enums/Blocks/BlockType.php
index dbccfa20..18193f83 100644
--- a/app/Enums/Blocks/BlockType.php
+++ b/app/Enums/Blocks/BlockType.php
@@ -11,6 +11,7 @@ enum BlockType: string
     /* List of the content blocks available to the application. */
     case HEADER_LOGO = 'header-logo';
     case PANEL_LINKS = 'panel-links';
+    case PRIVACY_POLICY = 'privacy-policy';
     case SECTION_DIVIDER = 'section-divider';
     case STACK = 'stack';
     case TABS = 'tabs';
@@ -25,6 +26,9 @@ enum BlockType: string
     public function staticData(): array
     {
         return match ($this) {
+            self::PRIVACY_POLICY => [
+                'html' => view('partials.body.privacy')->render(),
+            ],
             self::STACK => [
                 'html' => view('partials.static-blocks.stack', [
                     'laravel_version' => (new LaravelVersionFormatterResource)->getValue(),
@@ -41,6 +45,7 @@ public function staticData(): array
      *
      * @return array{
      *  label: string,
+     *  description: string,
      *  inputs: array<int, array<string, string>>,
      *  inputsRepeatable: array<int, array<string, string>>,
      * }
@@ -66,6 +71,11 @@ public function schema(): array
                     FormInputType::TEXT->schema('Panel URL', 'url'),
                 ],
             ],
+            self::PRIVACY_POLICY => [
+                'label' => 'Privacy Policy',
+                'description' => 'Privacy policy for the ' . config('app.name')
+                    . ' website, which covers how this app handles your data.',
+            ],
             self::SECTION_DIVIDER => [
                 'label' => 'Section Divider',
             ],
@@ -90,6 +100,7 @@ public function schema(): array
 
         return [
             'label' => $block_schema['label'] ?? '{unknown}',
+            'description' => $block_schema['description'] ?? '',
             'inputs' => $block_schema['inputs'] ?? [],
             'inputsRepeatable' => $block_schema['inputsRepeatable'] ?? [],
         ];

From 9ac06f8bc0e734f37e018f8587ae84037a31dfbc Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:16:24 +0100
Subject: [PATCH 005/111] Add PRIVACY_POLICY case to ExampleBlock test enum

---
 tests/Enums/ExampleBlock.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Enums/ExampleBlock.php b/tests/Enums/ExampleBlock.php
index df259653..efd57b0b 100644
--- a/tests/Enums/ExampleBlock.php
+++ b/tests/Enums/ExampleBlock.php
@@ -10,6 +10,7 @@ enum ExampleBlock: string
     /* List of the example content blocks available for tests. */
     case HEADER_LOGO = 'header-logo';
     case PANEL_LINKS = 'panel-links';
+    case PRIVACY_POLICY = 'privacy-policy';
     case SECTION_DIVIDER = 'section-divider';
     case STACK = 'stack';
     case TABS = 'tabs';
@@ -43,6 +44,7 @@ public function exampleData(): ?array
                     ],
                 ],
             ],
+            self::PRIVACY_POLICY => null,
             self::SECTION_DIVIDER => null,
             self::STACK => null,
             self::TABS => [

From dccd3d78c936b5126fb0e19604bf7e0c0c391e1b Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 18:38:35 +0100
Subject: [PATCH 006/111] Create PrivacyPolicyContentResource with unit tests

---
 .../Content/PrivacyPolicyContentResource.php  | 91 +++++++++++++++++++
 .../PrivacyPolicyContentResourceTest.php      | 47 ++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
 create mode 100644 tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php

diff --git a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
new file mode 100644
index 00000000..959dcc55
--- /dev/null
+++ b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Http\Resources\Views\Public\Content;
+
+use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageTemplate;
+use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
+use App\Models\Block;
+use App\Models\Page;
+
+final class PrivacyPolicyContentResource implements ConstantItemInterface
+{
+    /** Instantiate the resource. */
+    public function __construct(
+        protected Page $page = new Page,
+    ) {
+        if (!$this->page->id) {
+            $this->page = Page::query()
+                ->where('slug', 'privacy')
+                ->with('blocks')
+                ->first()
+                ?? new Page;
+        }
+
+        if (!$this->getTemplate()) {
+            $this->setDefaultModel();
+        }
+    }
+
+    /**
+     * Get the content array for the site's privacy page.
+     *
+     * @return array{
+     *  blocks: array<int, array{
+     *      type: string,
+     *      data: array<string, array<int, string>|string>,
+     *  }>,
+     *  bodytext: string,
+     *  heading: string,
+     *  subheading: string,
+     * }
+     */
+    public function getItem(): array
+    {
+        return (new PageContentResource($this->page))->getItem();
+    }
+
+    /**
+     * Get the meta-data array for the site's privacy page.
+     *
+     * @return array{canonical: string, description: string, title: string}
+     */
+    public function getMetaData(): array
+    {
+        return (new PageMetadataResource)->getItem($this->page);
+    }
+
+    /** Get the template for the resource. */
+    public function getTemplate(): ?WebpageTemplate
+    {
+        return $this->page->getTemplate();
+    }
+
+    /** Set the resource's page to the default privacy page model. */
+    public function setDefaultModel(): void
+    {
+        $this->page = new Page([
+            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
+            'slug' => 'privacy',
+            'title' => 'Privacy Policy',
+            'meta_title' => 'Privacy Policy',
+            'meta_description' => 'Privacy policy for the ' . config('app.name') . ' website, which covers how this app handles your data.',
+        ]);
+
+        $this->page->blocks = collect([
+            new Block([
+                'type' => BlockType::SECTION_DIVIDER->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+            ]),
+            new Block([
+                'type' => BlockType::PRIVACY_POLICY->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+            ]),
+        ]);
+
+        $page = Page::factory()->privacyPage()->make();
+    }
+}
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
new file mode 100644
index 00000000..37b17ce4
--- /dev/null
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
@@ -0,0 +1,47 @@
+<?php
+
+use App\Http\Resources\Views\Public\Content\PrivacyPolicyContentResource;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
+use App\Models\Page;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+arch('it implements the expected interface')
+    ->expect(PrivacyPolicyContentResource::class)
+    ->toImplement(ConstantItemInterface::class);
+
+test('getItem returns ok without a Page Model', function () {
+    $actual = (new PrivacyPolicyContentResource)->getItem();
+
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toHaveCount(2);
+
+    expect($actual)
+        ->toHaveCamelCaseKeys()
+        ->toHaveCount(4);
+});
+
+test('getItem returns ok with a Page Model', function () {
+    $page = Page::factory()->create([
+        'title' => 'Privacy Policy',
+        'slug' => 'privacy',
+    ]);
+
+    $actual = (new PrivacyPolicyContentResource($page))->getItem();
+
+    expect($actual['blocks'])
+        ->toBeArray()
+        ->toBeEmpty();
+
+    expect($actual)
+        ->toHaveCamelCaseKeys()
+        ->toHaveCount(4)
+        ->toMatchArray([
+            'blocks' => [],
+            'bodytext' => $page->content,
+            'heading' => $page->title,
+            'subheading' => $page->subtitle,
+        ]);
+});

From 886e562b9bd1406e8e49b8a85c9cabe55c1f571d Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:27:02 +0100
Subject: [PATCH 007/111] Refactor PrivacyPolicyController to use
 PrivacyPolicyContentResource

---
 .../Public/PrivacyPolicyController.php        | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Public/PrivacyPolicyController.php b/app/Http/Controllers/Public/PrivacyPolicyController.php
index b2fab4e4..faf07fc9 100644
--- a/app/Http/Controllers/Public/PrivacyPolicyController.php
+++ b/app/Http/Controllers/Public/PrivacyPolicyController.php
@@ -2,26 +2,31 @@
 
 namespace App\Http\Controllers\Public;
 
-use App\Enums\Webpages\WebpageTemplate;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\Views\Public\Content\PageContentResource;
-use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
-use App\Models\Page;
+use App\Http\Resources\Views\Public\Content\PrivacyPolicyContentResource;
 use App\Repositories\Views\PublicViewRepository;
 use Inertia\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 final class PrivacyPolicyController extends Controller
 {
-    /** Display the public privacy policy page. */
+    /**
+     * Display the public privacy policy page.
+     *
+     * @throws HttpException
+     */
     public function __invoke(): Response
     {
-        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->privacyPage()->make();
-        $template = $page?->template ?? WebpageTemplate::PUBLIC_CONTENT->value;
+        $content_resource = new PrivacyPolicyContentResource;
+
+        if (!$template = $content_resource->getTemplate()) {
+            abort(404);
+        }
 
         return (new PublicViewRepository)->getViewDetails(
-            $template,
-            (new PageContentResource($page))->getItem(),
-            (new PageMetadataResource)->getItem($page)
+            $template->value,
+            $content_resource->getItem(),
+            $content_resource->getMetaData()
         );
     }
 }

From a3435dae8d25090ad69194e7f0ac21e9671f45af Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:28:21 +0100
Subject: [PATCH 008/111] Update PageFactory privacyPage method attributes

---
 database/factories/PageFactory.php                | 4 ++--
 tests/Unit/Database/Factories/PageFactoryTest.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index b8cf2e79..42505f69 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\Enums\Blocks\BlockType;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Traits\FakesDatabaseValues;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -95,9 +96,8 @@ public function privacyPage(): static
             'slug' => 'privacy',
             'title' => 'Privacy Policy',
             'subtitle' => config('app.name'),
-            'content' => view('partials.body.privacy')->render(),
             'meta_title' => 'Privacy Policy',
-            'meta_description' => 'Privacy policy for the ' . config('app.name') . ' website, which covers how this app handles your data.',
+            'meta_description' => BlockType::PRIVACY_POLICY->schema()['description'],
         ]));
     }
 }
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index 64b01463..4aef533c 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -55,7 +55,6 @@
     ->title->toEqual('Privacy Policy')
     ->slug->toEqual('privacy')
     ->subtitle->toBeString()
-    ->content->toBeString()
     ->meta_title->toEqual('Privacy Policy')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)

From ac65715abfc60fda448a18cb2b0684c2e8914ae8 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:29:18 +0100
Subject: [PATCH 009/111] Update PrivacyPolicyControllerTest to use PageFactory
 privacyPage method

---
 .../Http/Controllers/Public/PrivacyPolicyControllerTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php b/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
index 5022e617..b2ae21cd 100644
--- a/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/PrivacyPolicyControllerTest.php
@@ -37,7 +37,7 @@
 });
 
 it('can render the privacy page view with a Page model', function () {
-    $page = Page::factory()->create(['slug' => 'privacy']);
+    $page = Page::factory()->privacyPage()->create();
     $route = route('privacy');
     $actual = $this->get($route);
     $session = session()->all();

From 57d2913ff039b7d6c06f083a1648ea852a3e6981 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:55:36 +0100
Subject: [PATCH 010/111] Update testPrivacyPageContentWithPageModel to use
 PageFactory privacyPage method

---
 tests/Browser/TestContent/Guest/PrivacyPageTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Browser/TestContent/Guest/PrivacyPageTest.php b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
index f089a9b3..19ec0112 100644
--- a/tests/Browser/TestContent/Guest/PrivacyPageTest.php
+++ b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
@@ -29,7 +29,7 @@ public function testPrivacyPageContentWithoutPageModel(): void
     public function testPrivacyPageContentWithPageModel(): void
     {
         (new PageSeeder)->run();
-        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->create(['slug' => 'privacy']);
+        $page = Page::where('slug', 'privacy')->first() ?? Page::factory()->privacyPage()->create();
         Assert::assertEquals(Page::where('slug', 'privacy')->count(), 1);
 
         $this->browse(fn (Browser $browser) => $browser

From 665d3a48560c807bae7595afe5582dbb60b8b9a1 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:54:41 +0100
Subject: [PATCH 011/111] Fix PrivacyPageTest DocBlock typos

---
 tests/Browser/TestContent/Guest/PrivacyPageTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Browser/TestContent/Guest/PrivacyPageTest.php b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
index 19ec0112..3d79038d 100644
--- a/tests/Browser/TestContent/Guest/PrivacyPageTest.php
+++ b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
@@ -14,7 +14,7 @@ final class PrivacyPageTest extends DuskTestCase
 {
     use DatabaseTruncation;
 
-    /** Test the about page renders & behaves correctly. */
+    /** Test the privacy page renders & behaves correctly. */
     public function testPrivacyPageContentWithoutPageModel(): void
     {
         $page = Page::factory()->privacyPage()->make();
@@ -25,7 +25,7 @@ public function testPrivacyPageContentWithoutPageModel(): void
         );
     }
 
-    /** Test the about page renders & behaves correctly with a page model. */
+    /** Test the privacy page renders & behaves correctly with a page model. */
     public function testPrivacyPageContentWithPageModel(): void
     {
         (new PageSeeder)->run();

From 190fa0aa4e20b1f3af34e5cf84cfa64e75b809fc Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 03:01:11 +0100
Subject: [PATCH 012/111] Add PHPStan exception for
 PrivacyPolicyContentResource

---
 phpstan.dist.neon | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 21083b3b..7d088842 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -24,6 +24,10 @@ parameters:
             message: '#Property App\\Models\\Page::\$blocks is not writable\.#'
             path: app/Http/Resources/Views/Public/Content/HomepageContentResource.php
             count: 1
+        - # Works despite error, may break if strict types enforced
+            message: '#Property App\\Models\\Page::\$blocks is not writable\.#'
+            path: app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
+            count: 1
         - # From the way the methods are inherited by Pest
             message: '#Access to an undefined property Pest\\Mixins\\Expectation#'
             path: tests

From caac6142c12808f69b3cc2e7072dc098493ae169 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:40:05 +0100
Subject: [PATCH 013/111] Create articles.small-print CSS

---
 resources/css/app.css                         |  1 +
 .../css/components/articles.small-print.css   | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 resources/css/components/articles.small-print.css

diff --git a/resources/css/app.css b/resources/css/app.css
index 484f8724..bb173e38 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -2,6 +2,7 @@
 
 @import "tailwindcss/components";
 @import "./components/articles";
+@import "./components/articles.small-print";
 @import "./components/buttons";
 
 @import "tailwindcss/utilities";
diff --git a/resources/css/components/articles.small-print.css b/resources/css/components/articles.small-print.css
new file mode 100644
index 00000000..2df0681c
--- /dev/null
+++ b/resources/css/components/articles.small-print.css
@@ -0,0 +1,27 @@
+section.app-article h3.text-small-print {
+  @apply
+    w-full
+    mt-4
+    mb-2
+    px-4
+    font-semibold
+    text-xs
+    uppercase
+    tracking-widest;
+}
+
+section.app-article p.text-small-print,
+section.app-article table.text-small-print,
+section.app-article ul.text-small-print {
+  @apply
+    text-sm
+    text-gray-800
+    dark:text-gray-200
+    px-4
+    pb-4;
+}
+
+section.app-article ul.text-small-print li {
+  @apply
+    ml-4;
+}

From 2b2e4845f47ce8b227af5e42439089ac1eeaf69c Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:48:21 +0100
Subject: [PATCH 014/111] Add table element rules to articles CSS

---
 resources/css/components/articles.css | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/resources/css/components/articles.css b/resources/css/components/articles.css
index e1ed1f5b..7b405dbf 100644
--- a/resources/css/components/articles.css
+++ b/resources/css/components/articles.css
@@ -95,3 +95,35 @@ section.app-article q ul li i {
     font-normal
     tracking-widest;
 }
+
+section.app-article table {
+  @apply
+    table-auto
+    mb-12
+    mx-8;
+}
+
+section.app-article thead {
+  @apply
+    mb-2
+    border-b
+    border-gray-900
+    pb-2
+    dark:border-gray-100;
+}
+
+section.app-article tbody {
+  @apply
+    mt-2;
+}
+
+section.app-article tr {
+  @apply
+    text-left;
+}
+
+section.app-article td,
+section.app-article th {
+  @apply
+    p-2;
+}

From ffff0f61a7e2cfd5d0a4cc61ebd75f822cdc597c Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:49:04 +0100
Subject: [PATCH 015/111] Update articles CSS section & paragraph element
 styling

---
 resources/css/components/articles.css        | 8 +++++++-
 resources/js/Components/Blocks/AppBlocks.vue | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/css/components/articles.css b/resources/css/components/articles.css
index 7b405dbf..d10359cb 100644
--- a/resources/css/components/articles.css
+++ b/resources/css/components/articles.css
@@ -1,6 +1,12 @@
+section.app-article {
+  @apply
+    leading-relaxed;
+}
+
 section.app-article p {
   @apply
-    mb-4;
+    mb-4
+    text-justify;
 }
 
 section.app-article p a {
diff --git a/resources/js/Components/Blocks/AppBlocks.vue b/resources/js/Components/Blocks/AppBlocks.vue
index c6fe3ba0..055ba761 100644
--- a/resources/js/Components/Blocks/AppBlocks.vue
+++ b/resources/js/Components/Blocks/AppBlocks.vue
@@ -32,7 +32,7 @@ import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
     <AppSectionHtml
       v-else
       :html="block.data.html"
-      class="app-article px-4 pb-8 leading-relaxed"
+      class="app-article px-4 pb-8"
       :id="'section-' + index"
     ></AppSectionHtml>
   </div>

From 35852c29c37725c378efe456f967b92b0738f7ae Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 13:51:23 +0100
Subject: [PATCH 016/111] Add 'Small Print' preset & underline styling options
 to InputWysiwyg

---
 .../Components/Forms/Inputs/InputWysiwyg.vue  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
index 0082f99f..1546384a 100644
--- a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
+++ b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
@@ -7,13 +7,16 @@ import {
   Bold,
   Italic,
   BlockQuote,
+  GeneralHtmlSupport,
   Heading,
   Link,
   List,
   Paragraph,
+  Style,
   Table,
   TableToolbar,
   TextTransformation,
+  Underline,
 } from 'ckeditor5'
 import 'ckeditor5/ckeditor5.css'
 
@@ -29,13 +32,16 @@ class Editor extends ClassicEditor {
     Bold,
     Italic,
     BlockQuote,
+    GeneralHtmlSupport,
     Heading,
     Link,
     List,
     Paragraph,
+    Style,
     Table,
     TableToolbar,
     TextTransformation,
+    Underline,
   ]
 
   static defaultConfig = {
@@ -45,9 +51,11 @@ class Editor extends ClassicEditor {
         'redo',
         '|',
         'heading',
+        'style',
         '|',
         'bold',
         'italic',
+        'underline',
         '|',
         'link',
         'insertTable',
@@ -57,6 +65,30 @@ class Editor extends ClassicEditor {
         'numberedList',
       ],
     },
+    style: {
+      definitions: [
+        {
+          name: 'Heading 3 - Small Print',
+          element: 'h3',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'Paragraph - Small Print',
+          element: 'p',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'Table - Small Print',
+          element: 'table',
+          classes: ['text-small-print'],
+        },
+        {
+          name: 'List (Points) - Small Print',
+          element: 'ul',
+          classes: ['text-small-print'],
+        },
+      ],
+    },
     link: {
       decorators: {
         openInNewTab: {

From 2d10dfa64a16376368e541dbf40db7c8c7a7ad65 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sat, 13 Jul 2024 23:11:02 +0100
Subject: [PATCH 017/111] Create privacy policy intro static-block template

---
 .../views/partials/static-blocks/privacy/intro.blade.php | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/intro.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/intro.blade.php b/resources/views/partials/static-blocks/privacy/intro.blade.php
new file mode 100644
index 00000000..913e843c
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/intro.blade.php
@@ -0,0 +1,9 @@
+<p class="text-small-print">
+    This privacy policy (“policy”) will help you understand how {{ config('app.name') }} (“our”, “us”, “we”)
+    uses and protects the data you provide to us when you visit and use
+    <a href="{{ route('home') }}"><u>{{ substr(route('home'), strpos(route('home'), '://') + 3) }}</u></a>
+    (“app”, “website”).
+    The policy also applies when you access our products or services, and applies when you correspond with us in person,
+    by letter, by phone, email or any other means.
+    We keep this policy under regular review and publish any updates on this web page.
+</p>

From 7aabe326ca7e2e3ffa4f2e8cd171dd13a087bb45 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sat, 13 Jul 2024 23:55:23 +0100
Subject: [PATCH 018/111] Create privacy policy data-we-may-collect
 static-block template

---
 .../privacy/data-we-may-collect.blade.php     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php b/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php
new file mode 100644
index 00000000..07231b61
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/data-we-may-collect.blade.php
@@ -0,0 +1,44 @@
+<h3 class="text-small-print">
+    DATA WE MAY COLLECT
+</h3>
+
+<p class="text-small-print">
+    We may collect, use, store and/or transfer data depending on the product or service you are accessing,
+    the different kinds of personal data are grouped together as follows:
+</p>
+
+<ul class="text-small-print">
+    <li>
+        <strong>Identity Data</strong> – which includes your name, username or similar identifier, marital status, title, date of birth and gender.
+    </li>
+
+    <li>
+        <strong>Profile Data</strong> - which includes your username and password for any accounts set up to access our services or provide feedback responses.
+    </li>
+
+    <li>
+        <strong>Contact Data</strong> – which includes telephone numbers, and physical and digital addresses.
+    </li>
+
+    <li>
+        <strong>Usage Data</strong> – which includes information about how you use our site, products and services.
+    </li>
+
+    <li>
+        <strong>Marketing and Communications Data</strong> – which includes your preferences in receiving marketing from us and our third parties
+        and your communication preferences.
+    </li>
+
+    <li>
+        <strong>Technical Data</strong> – includes internet protocol (IP) address, your login data, browser type and version, time zone setting and location,
+        browser plug-in types and versions, operating system and platform and other technology on the devices you use to access the site.
+    </li>
+
+    <li>
+        <strong>Financial Data</strong> – which includes your bank account and payment card details.
+    </li>
+
+    <li>
+        <strong>Transaction Data</strong> – includes details about payments to and from you and other details of products and services you have purchased from us.
+    </li>
+</ul>

From ec4328e74c6e35bd9ad5b719a6679996e19dafa4 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:10:09 +0100
Subject: [PATCH 019/111] Create privacy policy how-we-collect-your-data
 static-block template

---
 .../how-we-collect-your-data.blade.php        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php
new file mode 100644
index 00000000..4fd1cf26
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-collect-your-data.blade.php
@@ -0,0 +1,21 @@
+<h3 class="text-small-print">
+    HOW WE COLLECT YOUR DATA
+</h3>
+
+<p class="text-small-print">You directly provide us with most of the data we collect. We collect data and process data when you:</p>
+
+<ul class="text-small-print">
+    <li>Interact with the website.</li>
+    <li>Make a request for our products/services.</li>
+    <li>Requesting marketing communication to be sent to you or others you are acting on behalf of.</li>
+    <li>Voluntarily complete a customer survey or provide feedback on any of our message boards or via email.</li>
+    <li>Correspond with us online or by any other method.</li>
+</ul>
+
+<p class="text-small-print">We may also receive your data indirectly from the following sources:</p>
+
+<ul class="text-small-print">
+    <li>Third parties or publicly available sources – personal data about you may be received through various third parties and public sources
+        such as analytics providers, advertising networks and/or search information providers based inside the European Economic Area (EEA).</li>
+    <li>Contact, Financial and Transaction Data (if applicable) from providers of technical, payment and delivery services inside the EEA.</li>
+</ul>

From 1060209087e152e6b3c1c072fbfccc421e335804 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:15:45 +0100
Subject: [PATCH 020/111] Create privacy policy how-we-use-your-data
 static-block template

---
 .../privacy/how-we-use-your-data.blade.php    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php
new file mode 100644
index 00000000..1935e59f
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-use-your-data.blade.php
@@ -0,0 +1,28 @@
+<h3 class="text-small-print">
+    HOW WE USE YOUR DATA
+</h3>
+
+<p class="text-small-print">
+    We may use your data for the following reasons:
+</p>
+
+<ul class="text-small-print">
+    <li><strong>Consent</strong> - you have given clear consent for us to process your personal data for a specific purpose.</li>
+    <li><strong>Contract</strong> - processing is necessary for a contract we have with you, or because you have asked us to take specific steps
+        before entering into a contract.</li>
+    <li><strong>Legal obligation</strong> - it is necessary for us to comply with a legal or regulatory obligation (not including contractual obligations).</li>
+    <li><strong>Vital interests</strong> - processing is necessary to protect someone’s life.</li>
+    <li>
+        <strong>Legitimate interests</strong> - processing is necessary for our legitimate interests (for example to administer and maintain our website(s))
+        or the legitimate interests of a third party unless there is a good reason to protect your personal data which overrides those legitimate interests.
+        We make sure we consider and balance any potential impact on you (both positive and negative) and your rights before we process your personal data
+        for our legitimate interests. We do not use your personal data for activities where our interests are overridden by the impact on you
+        (unless we have your consent or are otherwise required or permitted to by law). We rely on the following interests when processing your personal data:
+
+        <ul>
+            <li>To manage our business and comply with our obligations to our customers, staff and suppliers.</li>
+            <li>To protect our proprietary and commercially sensitive information.</li>
+            <li>To administer and maintain our websites.</li>
+        </ul>
+    </li>
+</ul>

From 70f085c8eac68aed1ebd8093830c4c5cc24f3aa0 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:26:22 +0100
Subject: [PATCH 021/111] Create privacy policy how-we-store-your-data
 static-block template

---
 .../privacy/how-we-store-your-data.blade.php         | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php b/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php
new file mode 100644
index 00000000..829a49f1
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-we-store-your-data.blade.php
@@ -0,0 +1,12 @@
+<h3 class="text-small-print">
+    How We Store Your Data
+</h3>
+
+<p class="text-small-print">
+    Keeping your data secure is important to us,
+    we therefore have in place appropriate security measure to prevent unauthorised access,
+    accidental loss, alteration or disclosure.
+    In addition to this we limit access to your personal data to those employees, agents,
+    contractors and other third parties who have a business need to know,
+    in accordance with this policy and subject to a duty of confidentiality.
+</p>

From f23acb53d04b3eb9efe105a1c59707105e901c0d Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:27:16 +0100
Subject: [PATCH 022/111] Create privacy policy retention static-block template

---
 .../static-blocks/privacy/retention.blade.php        | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/retention.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/retention.blade.php b/resources/views/partials/static-blocks/privacy/retention.blade.php
new file mode 100644
index 00000000..cb3d5437
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/retention.blade.php
@@ -0,0 +1,12 @@
+<h3 class="text-small-print">
+    RETENTION
+</h3>
+
+<p class="text-small-print">
+    Your personal data will only be retained for as long as necessary to fulfil the purposes we collected it for,
+    including for the purposes of satisfying any legal, accounting, or reporting requirements.
+    To determine the appropriate retention period for personal data, we consider the amount, nature, and sensitivity of the personal data,
+    the potential risk of harm from unauthorised use or disclosure of your personal data,
+    the purposes for which we process your personal data and whether we can achieve those purposes through other means,
+    and the applicable legal requirements.
+</p>

From 0f53255a77b8bd7ee05e46b546b825aa1831d478 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:27:41 +0100
Subject: [PATCH 023/111] Create privacy policy marketing static-block template

---
 .../static-blocks/privacy/marketing.blade.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/marketing.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/marketing.blade.php b/resources/views/partials/static-blocks/privacy/marketing.blade.php
new file mode 100644
index 00000000..508c1487
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/marketing.blade.php
@@ -0,0 +1,13 @@
+<h3 class="text-small-print">
+    MARKETING
+</h3>
+
+<p class="text-small-print">
+    We would like to send you information about products and services we think you might like.
+</p>
+
+<p class="text-small-print">
+    If you have agreed to receive marketing, you may always opt out at a later date.
+    You can ask us to stop sending you marketing messages at any time by contacting us
+    using the website's contact form or by any other means.
+</p>

From 58f3e46d5aa446f5a090fdc02c37991ea233afca Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:28:38 +0100
Subject: [PATCH 024/111] Create privacy policy cookies static-block template

---
 .../static-blocks/privacy/cookies.blade.php   | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/cookies.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/cookies.blade.php b/resources/views/partials/static-blocks/privacy/cookies.blade.php
new file mode 100644
index 00000000..264769cc
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/cookies.blade.php
@@ -0,0 +1,48 @@
+<h3 class="text-small-print">
+    COOKIES
+</h3>
+
+<p class="text-small-print">
+    This site uses necessary first-party cookies for anti-forgery to prevent attacks.
+    If you consent to us storing an acknowledgement of this on your device,
+    by selecting 'Remember my choice' when accepting the app's cookie notification form,
+    then we will also store a first-party cookie to record this consent on your device.
+</p>
+
+<table class="text-small-print">
+    <thead>
+        <tr>
+            <th>Cookie</th>
+            <th>Common Name</th>
+            <th>Purpose</th>
+            <th>Storage Conditions</th>
+            <th>Expiry</th>
+        </tr>
+    </thead>
+
+    <tbody>
+        <tr>
+            <td>{{ Str::slug(config('app.name'), '_') . '_session' }}</td>
+            <td><strong>Session Token</strong></td>
+            <td>Identifier to help preserve client-side state</td>
+            <td><em>On use of the website</em></td>
+            <td>{{ config('session.lifetime') }} minutes after last use of the website</td>
+        </tr>
+
+        <tr>
+            <td>XSRF-TOKEN</td>
+            <td><strong>XSRF Token</strong></td>
+            <td>Identifier to help prevent cross-site request forgery</td>
+            <td><em>On use of the website</em></td>
+            <td>{{ config('session.lifetime') }} minutes after last use of the website</td>
+        </tr>
+
+        <tr>
+            <td>consent-storage-granted</td>
+            <td><strong>Storage Consent Token</strong></td>
+            <td>Identifier to record consent for storing cookies on this device</td>
+            <td><em>On indication of consent</em></td>
+            <td>365 x 24 hours from the time the relevant consent was indicated, or until this policy changes, whichever is sooner</td>
+        </tr>
+    </tbody>
+</table>

From 3f03e61f048ac84dfb7dcd956fc46448d09b0bf8 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:29:22 +0100
Subject: [PATCH 025/111] Create privacy policy your-data-protection-rights
 static-block template

---
 .../your-data-protection-rights.blade.php     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php b/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php
new file mode 100644
index 00000000..eaf3bdd4
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/your-data-protection-rights.blade.php
@@ -0,0 +1,45 @@
+<h3 class="text-small-print">
+    YOUR DATA PROTECTION RIGHTS
+</h3>
+
+<p class="text-small-print">
+    We would like to make sure you are fully aware of all of your data protection rights.
+    Everyone is entitled to the following:
+</p>
+
+<ul class="text-small-print">
+    <li>
+        <strong>The right to access</strong> – you have the right to request we for copies of your personal data.
+        We may charge you a small fee for this service.
+    </li>
+
+    <li>
+        <strong>The right to rectification</strong> – you have the right to request that we correct any information you believe is inaccurate.
+        You also have the right to request we to complete the information you believe is incomplete.
+    </li>
+
+    <li>
+        <strong>The right to erasure</strong> – you have the right to request that we erase your personal data, under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to restrict processing</strong> – you have the right to request that we restrict the processing of your personal data,
+        under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to object to processing</strong> – you have the right to object to we’s processing of your personal data,
+        under certain conditions.
+    </li>
+
+    <li>
+        <strong>The right to data portability</strong> – you have the right to request that we transfer the data that we have collected
+        to another organization, or directly to you, under certain conditions.
+    </li>
+</ul>
+
+<p class="text-small-print">
+    We aim to respond to all legitimate requests within one month, however, on occasions it may take longer than a month if your request
+    is particularly complex or you have made a number of requests.
+    In this case, we will notify you and keep you updated throughout the process.
+</p>

From 94da68d79f17e615d91a31fab43825724fff59dc Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:33:24 +0100
Subject: [PATCH 026/111] Create privacy policy how-to-contact-us static-block
 template

---
 .../static-blocks/privacy/how-to-contact-us.blade.php    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php b/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php
new file mode 100644
index 00000000..6addaf5f
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/how-to-contact-us.blade.php
@@ -0,0 +1,9 @@
+<h3 class="text-small-print">
+    HOW TO CONTACT US
+</h3>
+
+<p class="text-small-print">
+    If you have any questions about our privacy policy, the data we hold on you,
+    or you would like to exercise one of your data protection rights,
+    please contact us using the contact form on this website.
+</p>

From 8cc56b30c3182e63ab0c63fe20dcf7592830eba1 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:34:00 +0100
Subject: [PATCH 027/111] Create privacy policy ico-complaints static-block
 template

---
 .../static-blocks/privacy/ico-complaints.blade.php  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 resources/views/partials/static-blocks/privacy/ico-complaints.blade.php

diff --git a/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php b/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php
new file mode 100644
index 00000000..a7bbb11d
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy/ico-complaints.blade.php
@@ -0,0 +1,13 @@
+<h3 class="text-small-print">
+    ICO COMPLAINTS
+</h3>
+
+<p class="text-small-print">
+    If you are unhappy with how we are processing your personal data, you have the right to complain to the Information Commissioner's Office (ICO).
+    The Information Commissioner can be contacted at:
+    <a
+        href="https://ico.org.uk/make-a-complaint/"
+        target="_blank"
+        rel="noopener noreferrer"
+    ><u>ico.org.uk/make-a-complaint</u></a>.
+</p>

From 944783d19a38d7b6314f4733c0af922f4c6b4a7f Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 00:38:53 +0100
Subject: [PATCH 028/111] Replace privacy page template with version that uses
 the new templates

---
 app/Enums/Blocks/BlockType.php                |   2 +-
 .../views/partials/body/privacy.blade.php     | 199 ------------------
 .../partials/static-blocks/privacy.blade.php  |  11 +
 3 files changed, 12 insertions(+), 200 deletions(-)
 delete mode 100644 resources/views/partials/body/privacy.blade.php
 create mode 100644 resources/views/partials/static-blocks/privacy.blade.php

diff --git a/app/Enums/Blocks/BlockType.php b/app/Enums/Blocks/BlockType.php
index 18193f83..a81e9933 100644
--- a/app/Enums/Blocks/BlockType.php
+++ b/app/Enums/Blocks/BlockType.php
@@ -27,7 +27,7 @@ public function staticData(): array
     {
         return match ($this) {
             self::PRIVACY_POLICY => [
-                'html' => view('partials.body.privacy')->render(),
+                'html' => view('partials.static-blocks.privacy')->render(),
             ],
             self::STACK => [
                 'html' => view('partials.static-blocks.stack', [
diff --git a/resources/views/partials/body/privacy.blade.php b/resources/views/partials/body/privacy.blade.php
deleted file mode 100644
index d2239736..00000000
--- a/resources/views/partials/body/privacy.blade.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<hr class="my-8 border-gray-900 dark:border-gray-100" />
-
-<p class="pb-4 text-justify">
-    This privacy policy (“policy”) will help you understand how {{ config('metadata.author') }} (“our”, “us”, “we”) uses and protects the data you provide to us when you visit and use <a href="{{ route('home') }}" title="{{ config('app.name') }}" class="underline">{{ substr(route('home'), strpos(route('home'), '://') + 3) }}</a> (“app”, “service”, “website”).
-    The policy also applies when you correspond with us in person, by letter, by phone, email or any other means.
-    We reserve the right to change this policy at any time by publishing updates to this page.
-    We are committed to protecting your data, please read the following carefully to understand how we will treat it.
-</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Information We May Collect
-</h3>
-
-<p class="pb-4 text-justify">Personal data (as defined in the GDPR), or personal information, is any information about an individual from which that person can be then identified. It does not include data where the identity has been removed or has been replaced with artificial identifies or pseudonyms (Anonymous or Pseudonymised Data). When visiting our Sites, accessing our Services, Products or corresponding with us in person, by phone, email or any other method you may provide us with information that would be classed as personal data about you and others you are acting on behalf of. We may collect, use, store and/or transfer data depending on the product, services or site you are accessing, the different kinds of personal data are grouped together as follows;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Identity Data</strong> – which includes your first name, surname, username or similar identifier, marital status, title, date of birth and gender.</li>
-    <li class="ml-4"><strong>Contact Data</strong> – which includes your billing address delivery address, home address, email address and telephone numbers.</li>
-    <li class="ml-4"><strong>Financial Data</strong> – which includes your bank account and payment card details.</li>
-    <li class="ml-4"><strong>Transaction Data</strong> – includes details about payments to and from you and other details of products and services you have purchased from us.</li>
-    <li class="ml-4"><strong>Technical Data</strong> – includes internet protocol (IP) address, your login data, browser type and version, time zone setting and location, browser plug-in types and versions, operating system and platform and other technology on the devices you use to access the Sites.</li>
-    <li class="ml-4"><strong>Profile Data</strong> - which includes your username and password for any accounts set up to access our products and services, purchases or orders made by you, feedback responses.</li>
-    <li class="ml-4"><strong>Usage Data</strong> – which includes information about how you use our Sites, products and services.</li>
-    <li class="ml-4"><strong>Marketing and Communications Data</strong> – which includes your preferences in receiving marketing from us and our third parties and your communication preferences.</li>
-</ul>
-
-<p class="pb-4 text-justify">We may collect Special Categories of your Personal Data if required as part of the services or products you are using. Where we are required to collect personal data by law, or under the terms of a contract we hold with you and you fail to provide this data when requested, we may not be able to perform the contract we have or are entering with you. (for example, to provide you with web development services). In this case, it may be a requirement for us to cancel the service or product you have asked us to provide, should this happen we will notify you accordingly.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Keeping your Data Secure
-</h3>
-
-<p class="pb-4 text-justify">Keeping your data secure is important to us, therefore, we have in place appropriate security measure to prevent unauthorised access, accidental loss, alteration or disclosure. We ensure that our computers and devices are fully updated with virus software and personal protection measures. In addition to this we limit access to your personal data to those employees, agents, contractors and other third parties who have a business need to know and therefore will only process your personal data on our instructions in accordance with this policy and are subject to a duty of confidentiality.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    How we collect your Data
-</h3>
-
-<p class="pb-4 text-justify">We use different methods to collect data from and about you through;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Direct Interactions</strong> – You may give us any of the categories of data identified above by filling in forms on our Sites or by corresponding with us in person, by phone, email or any other method. This includes personal data you provide when you:
-        <ul class="pb-4">
-            <li class="ml-4">- Register to use our Sites;</li>
-            <li class="ml-4">- Make a request for our products/services;</li>
-            <li class="ml-4">- Requesting marketing communication to be sent to you or others you are acting on behalf of;</li>
-            <li class="ml-8"><em>or</em></li>
-            <li class="ml-4">- Providing feedback;</li>
-            <li class="ml-4">- Third parties or publicly available sources – personal data about you may be received through various third parties and public sources such as analytics providers, advertising networks and/or search information providers based inside the European Economic Area (EEA);</li>
-            <li class="ml-4">- Contact, Financial and Transaction Data (if applicable) from providers of technical, payment and delivery services inside the EEA.</li>
-        </ul>
-    </li>
-</ul>
-
-<h3 id="cookies" class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Cookies
-</h3>
-
-<p class="pb-4 text-justify">
-    This site uses necessary first-party cookies for anti-forgery to prevent attacks.
-    If you consent to us storing an acknowledgement of this on your device, by selecting 'Remember my choice' when accepting the app's cookie notification form,
-    then we will also store a first-party cookie to record this consent on your device.
-</p>
-
-<table class="table-auto mt-4 mb-12 mx-4">
-    <thead class="mb-2 border-b border-gray-900 pb-2 dark:border-gray-100">
-        <tr class="text-left">
-            <th class="p-2">Cookie</th>
-            <th class="p-2">Common Name</th>
-            <th class="p-2">Purpose</th>
-            <th class="p-2">Storage Conditions</th>
-            <th class="pt-2 px-2 pb-4">Expiry</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr class="text-left">
-            <td class="pt-4 px-2 pb-2"><code>{{ Str::slug(config('app.name'), '_') . '_session' }}</code></td>
-            <td class="p-2"><strong>Session Token</strong></td>
-            <td class="p-2">Identifier to help preserve client-side state</td>
-            <td class="p-2"><em>On use of the website</em></td>
-            <td class="p-2">{{ config('session.lifetime') }} minutes after last use of the website</td>
-        </tr>
-        <tr class="text-left">
-            <td class="p-2"><code>XSRF-TOKEN</code></td>
-            <td class="p-2"><strong>XSRF Token</strong></td>
-            <td class="p-2">Identifier to help prevent cross-site request forgery</td>
-            <td class="p-2"><em>On use of the website</em></td>
-            <td class="p-2">{{ config('session.lifetime') }} minutes after last use of the website</td>
-        </tr>
-        <tr class="text-left">
-            <td class="p-2"><code>consent-storage-granted</code></td>
-            <td class="p-2"><strong>Storage Consent Token</strong></td>
-            <td class="p-2">Identifier to record consent for storing cookies on this device</td>
-            <td class="p-2"><em>On indication of consent</em></td>
-            <td class="p-2">365 x 24 hours from the time the relevant consent was indicated, or until this policy changes, whichever is sooner</td>
-        </tr>
-    </tbody>
-</table>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Why we will use your Data
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will be processed in accordance with Article 6 of the General Data Protection Regulation (GDPR) which states that there must be a lawful basis for processing personal data. Each lawful basis is set out below, and at least one must apply whenever personal data is processed.</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>Consent</strong>: you have given clear consent for us to process your personal data for a specific purpose</li>
-    <li class="ml-4"><strong>Contract</strong>: processing is necessary for a contract we have with you, or because you have asked us to take specific steps before entering into a contract</li>
-    <li class="ml-4"><strong>Legal obligation</strong>: it is necessary for us to comply with a legal or regulatory obligation (not including contractual obligations)</li>
-    <li class="ml-4"><strong>Vital interests</strong>: processing is necessary to protect someone’s life</li>
-    <li class="ml-4">
-        <strong>Legitimate interests</strong>: processing is necessary for our legitimate interests (for example to administer and maintain our website(s)) or the legitimate interests of a third party unless there is a good reason to protect your personal data which overrides those legitimate interests. We make sure we consider and balance any potential impact on you (both positive and negative) and your rights before we process your personal data for our legitimate interests. We do not use your personal data for activities where our interests are overridden by the impact on you (unless we have your consent or are otherwise required or permitted to by law). We rely on the following interests when processing your personal data:
-        <ul class="pb-4">
-            <li class="ml-8">- To manage our business and comply with our obligations to our patients, staff and suppliers.</li>
-            <li class="ml-8">- To protect our proprietary and commercially sensitive information.</li>
-            <li class="ml-8">- To administer and maintain our websites.</li>
-        </ul>
-    </li>
-</ul>
-
-<p class="pb-4 text-justify">Your personal data may be processed on more than one lawful ground this will depend on the specific purpose for which we are using your data. Generally, we will not rely on consent as a legal basis for processing your personal data. However, where we do ask for your consent, we will do so in order to comply with the principle that any processing must be lawful, fair and transparent.</p>
-<p class="pb-4 text-justify">For more information on the types of lawful basis that we will rely on to process your personal data can be found on the <a href="https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/lawful-basis-for-processing/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) website" class="underline">Information Commissioner’s Office (ICO) website</a>.</p>
-<p class="pb-4 text-justify">There may be a requirement to process your personal data on more than one lawful basis, depending on the specific purpose for which we are using your data. If you need details about the specific legal grounds, we are relying on to process your personal data then please contact us. (Contact Details listed below).</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Disclosing your Personal Data
-</h3>
-
-<p class="pb-4 text-justify">In order to provide you with our services/products it may be a requirement to share your personal data with the parties listed below. We require all third parties to respect the security of your personal data and to treat it in accordance with the law and our instructions, when they are processing personal data on our behalf. We do not allow our third-party service providers to use your personal data for their own purposes.</p>
-
-<ul class="pb-4">
-    <li class="ml-4">- Third parties who you authorise to provide services/products to you;</li>
-    <li class="ml-4">- Sub-contractors for the performance of any contract(s) we enter into with you or them;</li>
-    <li class="ml-4">- Healthcare professionals during the course of the services that both we and they provide to you;</li>
-    <li class="ml-4">- Service providers acting as processors who provide IT and system administration services.</li>
-    <li class="ml-4">- Professional advisers including lawyers, bankers, auditors and insurers based who provide consultancy, banking, legal, insurance and accounting services.</li>
-</ul>
-
-<p class="pb-4 text-justify">We do not transfer your personal data outside of the EEA if within the EEA or within the country of origin if outside the EEA.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Change of Purpose
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will only be used for the purpose it was originally collected, unless we reasonably consider that we need to use it for another reason and that reason is compatible with the original purpose. For an explanation as to how the processing for the new purpose is compatible with the original purpose, please contact us.</p>
-<p class="pb-4 text-justify">If we need to use your personal data for an unrelated purpose, we will notify you and we will explain the legal basis which allows us to do so.</p>
-<p class="pb-4 text-justify">Please note that we may process your personal data without your knowledge or consent, in compliance with the above rules, where this is required or permitted by law.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Marketing
-</h3>
-
-<p class="pb-4 text-justify">You will be provided with choices regarding certain personal data uses, particularly around marketing and advertising. We may use your Identity, Contact, Technical, Usage and Profile Data to form a view on what we think may be a need or a want, or what may be of interest to you. This is how we determined which products, services and offers may be relevant for you (we call this marketing).</p>
-<p class="pb-4 text-justify">You will receive marketing communications from us if you have requested information from us or purchased products or services from us and, in each case, you have not opted out of receiving that marketing. We will always obtain your consent prior to sharing your personal data with any other company for marketing purposes.</p>
-<p class="pb-4 text-justify">You can ask us or third parties to stop sending you marketing messages at any time by logging into the Site and checking or unchecking relevant boxes to adjust your marketing preferences or by following the opt-out links on any marketing message sent to you or by contacting us at any time.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Retention
-</h3>
-
-<p class="pb-4 text-justify">Your personal data will only be retained for as long as necessary to fulfil the purposes we collected it for, including for the purposes of satisfying any legal, accounting, or reporting requirements. To determine the appropriate retention period for personal data, we consider the amount, nature, and sensitivity of the personal data, the potential risk of harm from unauthorised use or disclosure of your personal data, the purposes for which we process your personal data and whether we can achieve those purposes through other means, and the applicable legal requirements.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Your Legal Rights
-</h3>
-
-<p class="pb-4 text-justify">Under certain circumstances, you have rights under data protection laws in relation to your personal data. For further information please click on the link below to access the ICO website to find out more about <a href="https://ico.org.uk/your-data-matters/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) website" class="underline">these rights</a>;</p>
-
-<ul class="pb-4">
-    <li class="ml-4"><strong>The right to be informed</strong></li>
-    <li class="ml-4"><strong>The right of access</strong></li>
-    <li class="ml-4"><strong>The right to get your data corrected</strong></li>
-    <li class="ml-4"><strong>The right to erasure</strong></li>
-    <li class="ml-4"><strong>The right to restrict processing</strong></li>
-    <li class="ml-4"><strong>The right to data portability</strong></li>
-    <li class="ml-4"><strong>The right to object</strong></li>
-    <li class="ml-4"><strong>Rights in relation to automated decision making and profiling</strong></li>
-</ul>
-
-<p class="pb-4 text-justify">To exercise any of the rights set our above, please contact us;</p>
-<p class="pb-4 text-justify">If you are unhappy with how we are processing your personal data, you have the right to complaint to ICO. The Information Commissioner can be contacted at: <a href="https://ico.org.uk/make-a-complaint/" target="_blank" rel="noopener noreferrer" title="Visit the Information Commissioner’s Office (ICO) complaints page" class="underline">ico.org.uk/make-a-complaint</a>.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Fees
-</h3>
-
-<p class="pb-4 text-justify">No fees are required to access your personal data (or to exercise any of the other rights), however, we may charge a reasonable fee if your request is clearly unfounded, repetitive or excessive. Alternatively, we may refuse to comply with your request in these circumstances.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    What we may need from you
-</h3>
-
-<p class="pb-4 text-justify">We may need to request specific information form you to help confirm your identity and ensure your right to access your personal data (or to exercise any of your other rights). This is a security measure to ensure that personal data is not disclosed to any person who has no right to receive it. We may also contact you to ask you for further information in relation to your request to speed up our response.</p>
-
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">
-    Time Limits
-</h3>
-
-<p class="pb-4 text-justify">It is our policy to respond to all legitimate requests within one month, however, on occasions it may take longer than a month if your request is particularly complex or you have made a number of requests. In this case, we will notify you and keep you updated throughout the process.</p>
diff --git a/resources/views/partials/static-blocks/privacy.blade.php b/resources/views/partials/static-blocks/privacy.blade.php
new file mode 100644
index 00000000..030836cb
--- /dev/null
+++ b/resources/views/partials/static-blocks/privacy.blade.php
@@ -0,0 +1,11 @@
+@include('partials.static-blocks.privacy.intro')
+@include('partials.static-blocks.privacy.data-we-may-collect')
+@include('partials.static-blocks.privacy.how-we-collect-your-data')
+@include('partials.static-blocks.privacy.how-we-use-your-data')
+@include('partials.static-blocks.privacy.how-we-store-your-data')
+@include('partials.static-blocks.privacy.retention')
+@include('partials.static-blocks.privacy.marketing')
+@include('partials.static-blocks.privacy.cookies')
+@include('partials.static-blocks.privacy.your-data-protection-rights')
+@include('partials.static-blocks.privacy.how-to-contact-us')
+@include('partials.static-blocks.privacy.ico-complaints')

From dad5f65cc7f28fb3263d3e050cee53eadb812363 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 02:33:21 +0100
Subject: [PATCH 029/111] Create articles.page-title CSS

---
 resources/css/app.css                            |  1 +
 resources/css/components/articles.page-title.css | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 resources/css/components/articles.page-title.css

diff --git a/resources/css/app.css b/resources/css/app.css
index bb173e38..fabdfb17 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -2,6 +2,7 @@
 
 @import "tailwindcss/components";
 @import "./components/articles";
+@import "./components/articles.page-title";
 @import "./components/articles.small-print";
 @import "./components/buttons";
 
diff --git a/resources/css/components/articles.page-title.css b/resources/css/components/articles.page-title.css
new file mode 100644
index 00000000..70c9c8ce
--- /dev/null
+++ b/resources/css/components/articles.page-title.css
@@ -0,0 +1,16 @@
+section.app-article h2.text-page-title {
+  @apply
+    font-semibold
+    uppercase
+    tracking-widest;
+}
+
+section.app-article p.text-page-subtitle {
+  @apply
+    pt-2
+    font-semibold
+    italic
+    text-xs
+    uppercase
+    tracking-widest;
+}

From d285221877f0e03b93ba08fa5af72ff4f202adb7 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 02:35:17 +0100
Subject: [PATCH 030/111] Add page title styling to InputWysiwyg component

---
 resources/js/Components/Forms/Inputs/InputWysiwyg.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
index 1546384a..43bec348 100644
--- a/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
+++ b/resources/js/Components/Forms/Inputs/InputWysiwyg.vue
@@ -67,6 +67,11 @@ class Editor extends ClassicEditor {
     },
     style: {
       definitions: [
+        {
+          name: 'Heading 2 - Page Title',
+          element: 'h2',
+          classes: ['text-page-title'],
+        },
         {
           name: 'Heading 3 - Small Print',
           element: 'h3',
@@ -77,6 +82,11 @@ class Editor extends ClassicEditor {
           element: 'p',
           classes: ['text-small-print'],
         },
+        {
+          name: 'Paragraph - Page Subtitle',
+          element: 'p',
+          classes: ['text-page-subtitle'],
+        },
         {
           name: 'Table - Small Print',
           element: 'table',

From a1b75b8ba50cfb6d4e36ca83d57e132bdc2edde8 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:04:25 +0100
Subject: [PATCH 031/111] Update PublicContent page component to use
 LayoutGuest instead of LayoutDefault

---
 resources/js/Pages/Public/PublicContent.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/Pages/Public/PublicContent.vue b/resources/js/Pages/Public/PublicContent.vue
index 1f8806cc..95de27a0 100644
--- a/resources/js/Pages/Public/PublicContent.vue
+++ b/resources/js/Pages/Public/PublicContent.vue
@@ -1,6 +1,6 @@
 <script setup>
 import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 
 defineProps({
   content: {
@@ -15,7 +15,7 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
     <AppBlocks />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>

From f7a1f448980055a0e83a41616cbdfceabcade9dd Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:07:22 +0100
Subject: [PATCH 032/111] Update PublicContentControls page component to use
 LayoutGuest instead of LayoutDefault

---
 resources/js/Pages/Public/PublicContentControls.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/Pages/Public/PublicContentControls.vue b/resources/js/Pages/Public/PublicContentControls.vue
index eeae6a51..cdb3b9c5 100644
--- a/resources/js/Pages/Public/PublicContentControls.vue
+++ b/resources/js/Pages/Public/PublicContentControls.vue
@@ -1,5 +1,5 @@
 <script setup>
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentControls from '@/Pages/Public/Partials/ContentControls.vue'
 
 defineProps({
@@ -15,7 +15,7 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
     <ContentControls />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>

From 2f89bdf3e1bb91e2c27d75674152481a2cbae6ea Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:08:08 +0100
Subject: [PATCH 033/111] Add AppBlocks to PublicContentControls page component

---
 resources/js/Pages/Public/PublicContentControls.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/Pages/Public/PublicContentControls.vue b/resources/js/Pages/Public/PublicContentControls.vue
index cdb3b9c5..4ba7335d 100644
--- a/resources/js/Pages/Public/PublicContentControls.vue
+++ b/resources/js/Pages/Public/PublicContentControls.vue
@@ -1,4 +1,5 @@
 <script setup>
+import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
 import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentControls from '@/Pages/Public/Partials/ContentControls.vue'
 
@@ -16,6 +17,8 @@ defineProps({
 
 <template>
   <LayoutGuest>
+    <AppBlocks />
+
     <ContentControls />
   </LayoutGuest>
 </template>

From 365602005e057a91a463e1d469754075664d76fb Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:10:38 +0100
Subject: [PATCH 034/111] Update PublicContentForms page component to use
 LayoutGuest instead of LayoutDefault

---
 resources/js/Pages/Public/PublicContentForms.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/Pages/Public/PublicContentForms.vue b/resources/js/Pages/Public/PublicContentForms.vue
index 75a071dd..7e223605 100644
--- a/resources/js/Pages/Public/PublicContentForms.vue
+++ b/resources/js/Pages/Public/PublicContentForms.vue
@@ -1,5 +1,5 @@
 <script setup>
-import LayoutDefault from '@/Layouts/LayoutDefault.vue'
+import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentForms from '@/Pages/Public/Partials/ContentForms.vue'
 
 defineProps({
@@ -15,7 +15,7 @@ defineProps({
 </script>
 
 <template>
-  <LayoutDefault>
+  <LayoutGuest>
     <ContentForms />
-  </LayoutDefault>
+  </LayoutGuest>
 </template>

From d2075cd37bc54f846ec95043a989459ee8384161 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:11:34 +0100
Subject: [PATCH 035/111] Add AppBlocks to PublicContentForms page component

---
 resources/js/Pages/Public/PublicContentForms.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/Pages/Public/PublicContentForms.vue b/resources/js/Pages/Public/PublicContentForms.vue
index 7e223605..1343469f 100644
--- a/resources/js/Pages/Public/PublicContentForms.vue
+++ b/resources/js/Pages/Public/PublicContentForms.vue
@@ -1,4 +1,5 @@
 <script setup>
+import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
 import LayoutGuest from '@/Layouts/LayoutGuest.vue'
 import ContentForms from '@/Pages/Public/Partials/ContentForms.vue'
 
@@ -16,6 +17,8 @@ defineProps({
 
 <template>
   <LayoutGuest>
+    <AppBlocks />
+
     <ContentForms />
   </LayoutGuest>
 </template>

From fd2825a221dbc5de90c90f08a6d277480f9befb8 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Wed, 10 Jul 2024 00:28:05 +0100
Subject: [PATCH 036/111] Remove unused LayoutDefault

---
 resources/js/Layouts/LayoutDefault.vue | 27 --------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 resources/js/Layouts/LayoutDefault.vue

diff --git a/resources/js/Layouts/LayoutDefault.vue b/resources/js/Layouts/LayoutDefault.vue
deleted file mode 100644
index a9a4df07..00000000
--- a/resources/js/Layouts/LayoutDefault.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script setup>
-import AppSectionHtml from '@/Components/Sections/AppSectionHtml.vue'
-import LayoutGuest from '@/Layouts/LayoutGuest.vue'
-</script>
-
-<template>
-  <LayoutGuest>
-    <template #pageHeader>
-      <h2 class="font-semibold text-md text-gray-900 dark:text-gray-100 uppercase tracking-widest">{{ $page.props.content.heading }}</h2>
-
-      <p
-        v-if="$page.props.content.subheading !== ''"
-        class="pt-2 font-semibold text-xs text-gray-900 dark:text-gray-100 uppercase tracking-widest"
-      >
-        <em>{{ $page.props.content.subheading }}</em>
-      </p>
-    </template>
-
-    <AppSectionHtml
-      v-if="$page.props.content.bodytext !== ''"
-      :html="$page.props.content.bodytext"
-      :id="$page.props.content.heading.replace(' ', '-').toLowerCase()"
-    />
-
-    <slot />
-  </LayoutGuest>
-</template>

From 46d3c581ca8fe924d40460120e1f9dc89fefc781 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:13:47 +0100
Subject: [PATCH 037/111] Add WYSIWYG page headers to page seeds

---
 storage/app/seeds/pages.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 757b3f99..5fcd8989 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -84,6 +84,8 @@
                 'type' => BlockType::WYSIWYG->value,
                 'data' => json_encode([
                     'html' => '
+                        <h2 class="text-page-title">ABOUT</h2>
+                        <p class="text-page-subtitle">' . config('app.name') . '</p>
                         <blockquote>
                             <p>
                                 <i>“Laravel Breeze variant with Vue, Inertia &amp; Tailwind”&nbsp;</i>
@@ -120,6 +122,16 @@
         'meta_description' => $description_controls,
         'template' => WebpageTemplate::PUBLIC_CONTENT_CONTROLS->value,
         'blocks' => [
+            [
+                'type' => BlockType::WYSIWYG->value,
+                'data' => json_encode([
+                    'html' => '
+                        <h2 class="text-page-title">CONTROLS</h2>
+                        <p class="text-page-subtitle">The UI control components that come with the template are demonstrated below</p>
+                    ',
+                ])
+            ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
         ],
     ],
 
@@ -130,6 +142,18 @@
         'meta_title' => 'Forms',
         'meta_description' => $description_forms,
         'template' => WebpageTemplate::PUBLIC_CONTENT_FORMS->value,
+        'blocks' => [
+            [
+                'type' => BlockType::WYSIWYG->value,
+                'data' => json_encode([
+                    'html' => '
+                        <h2 class="text-page-title">FORMS</h2>
+                        <p class="text-page-subtitle">The UI form & input components that come with the template are demonstrated below</p>
+                    ',
+                ])
+            ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
+        ],
     ],
 
 ];

From 551be014558cbe014ce13dec984fe38866f9dae0 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:14:23 +0100
Subject: [PATCH 038/111] Remove unused subtitles from page seeds

---
 storage/app/seeds/pages.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 5fcd8989..7cf18490 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -75,7 +75,6 @@
     [
         'slug' => 'about',
         'title' => 'About',
-        'subtitle' => config('app.name'),
         'meta_title' => 'About',
         'meta_description' => config('metadata.description'),
         'template' => WebpageTemplate::PUBLIC_CONTENT->value,
@@ -117,7 +116,6 @@
     [
         'slug' => 'controls',
         'title' => 'Controls',
-        'subtitle' => 'The UI control components that come with the template are demonstrated below.',
         'meta_title' => 'Controls',
         'meta_description' => $description_controls,
         'template' => WebpageTemplate::PUBLIC_CONTENT_CONTROLS->value,
@@ -138,7 +136,6 @@
     [
         'slug' => 'forms',
         'title' => 'Forms',
-        'subtitle' => 'The UI form & input components that come with the template are demonstrated below.',
         'meta_title' => 'Forms',
         'meta_description' => $description_forms,
         'template' => WebpageTemplate::PUBLIC_CONTENT_FORMS->value,

From 917540088f00b03614cedcc1061c652b6a84e16b Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:16:03 +0100
Subject: [PATCH 039/111] Add SECTION_DIVIDER block to homepage seed

---
 storage/app/seeds/pages.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 7cf18490..0bf71550 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -51,6 +51,7 @@
                     ',
                 ]),
             ],
+            ['type' => BlockType::SECTION_DIVIDER->value],
             [
                 'type' => BlockType::PANEL_LINKS->value,
                 'data' => json_encode([

From a03ca0125e8d392a9a50d73e1e8e9a545322ecc4 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:18:06 +0100
Subject: [PATCH 040/111] Add WYSIWYG block to PrivacyPolicyContentResource
 default page model

---
 .../Public/Content/PrivacyPolicyContentResource.php   | 11 +++++++++++
 .../Content/PrivacyPolicyContentResourceTest.php      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
index 959dcc55..0f1f28b3 100644
--- a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
@@ -74,11 +74,22 @@ public function setDefaultModel(): void
         ]);
 
         $this->page->blocks = collect([
+            new Block([
+                'type' => BlockType::WYSIWYG->value,
+                'parent_type' => Page::class,
+                'parent_id' => $this->page->id,
+                'data' => json_encode([
+                    'html' => '<h2 class="text-page-title">PRIVACY POLICY</h2>
+                        <p class="text-page-subtitle">' . config('app.name') . '</p>',
+                ]),
+            ]),
+
             new Block([
                 'type' => BlockType::SECTION_DIVIDER->value,
                 'parent_type' => Page::class,
                 'parent_id' => $this->page->id,
             ]),
+
             new Block([
                 'type' => BlockType::PRIVACY_POLICY->value,
                 'parent_type' => Page::class,
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
index 37b17ce4..5f9a3d51 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
@@ -16,7 +16,7 @@
 
     expect($actual['blocks'])
         ->toBeArray()
-        ->toHaveCount(2);
+        ->toHaveCount(3);
 
     expect($actual)
         ->toHaveCamelCaseKeys()

From 4e0465f2eef9428ee7a14e97384dfe1bde9a1177 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:20:17 +0100
Subject: [PATCH 041/111] Increase article blockquote top margin

---
 resources/css/components/articles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/components/articles.css b/resources/css/components/articles.css
index d10359cb..9ba8ef97 100644
--- a/resources/css/components/articles.css
+++ b/resources/css/components/articles.css
@@ -77,7 +77,7 @@ section.app-article q {
     text-lg
     text-gray-800
     dark:text-gray-200
-    mb-8
+    my-8
     border-l-4
     border-gray-900
     dark:border-gray-300

From 3262a4b098a34917b60faa5557c1033f80f9a62a Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:24:02 +0100
Subject: [PATCH 042/111] Increase stack block template top margin

---
 resources/views/partials/static-blocks/stack.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/static-blocks/stack.blade.php b/resources/views/partials/static-blocks/stack.blade.php
index 295acdc2..0749118f 100644
--- a/resources/views/partials/static-blocks/stack.blade.php
+++ b/resources/views/partials/static-blocks/stack.blade.php
@@ -1,4 +1,4 @@
-<h3 class="w-full mb-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">Stack</h3>
+<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">Stack</h3>
 
 <p class="mb-4">Running on PHP v{{ $php_version }}</p>
 

From 0f2879e016c1deb0d50343911394a632a3aba1b3 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:27:06 +0100
Subject: [PATCH 043/111] Decrease AppBlock component AppSectionHtml bottom
 margin

---
 resources/js/Components/Blocks/AppBlocks.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Components/Blocks/AppBlocks.vue b/resources/js/Components/Blocks/AppBlocks.vue
index 055ba761..e7088978 100644
--- a/resources/js/Components/Blocks/AppBlocks.vue
+++ b/resources/js/Components/Blocks/AppBlocks.vue
@@ -32,7 +32,7 @@ import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
     <AppSectionHtml
       v-else
       :html="block.data.html"
-      class="app-article px-4 pb-8"
+      class="app-article px-4"
       :id="'section-' + index"
     ></AppSectionHtml>
   </div>

From 6c162d452589b9d35d74469a6ff55a77cabf2640 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:31:13 +0100
Subject: [PATCH 044/111] Increase ContentControls page partial component
 x-axis margins

---
 resources/js/Pages/Public/Partials/ContentControls.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/Public/Partials/ContentControls.vue b/resources/js/Pages/Public/Partials/ContentControls.vue
index 816fa1f5..63d8d9e6 100644
--- a/resources/js/Pages/Public/Partials/ContentControls.vue
+++ b/resources/js/Pages/Public/Partials/ContentControls.vue
@@ -10,14 +10,14 @@ import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
   <h3 class="w-full pt-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Tab Component</h3>
 
   <TabControls
-    class="pt-4"
+    class="pt-4 px-4"
     :tabs="['Pop-ups', 'Buttons']"
   />
 
   <AppSectionDivider margin="min" />
 
   <TabBody
-    class="px-4 bg-white dark:bg-gray-900"
+    class="mx-4 px-4 bg-white dark:bg-gray-900"
     :tab="0"
   >
     <ControlsTabPopUps />

From 751957c365b3aba014b3a32fedb557ebbca4d4dd Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:31:55 +0100
Subject: [PATCH 045/111] Increase ContentForms page partial component x-axis
 margins

---
 resources/js/Pages/Public/Partials/ContentForms.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/Public/Partials/ContentForms.vue b/resources/js/Pages/Public/Partials/ContentForms.vue
index a42da793..09e451f5 100644
--- a/resources/js/Pages/Public/Partials/ContentForms.vue
+++ b/resources/js/Pages/Public/Partials/ContentForms.vue
@@ -31,7 +31,7 @@ const form = useForm({
   <h3 class="w-full py-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Form &amp; Input Components</h3>
 
   <AppForm
-    class="w-full"
+    class="w-full px-4"
     :endpoint="route('page.store', 'forms')"
     :form="form"
   >
@@ -168,7 +168,7 @@ const form = useForm({
 
   <AppSectionDivider margin="xl" />
 
-  <h3 class="mb-4 text-lg font-bold text-gray-600 dark:text-gray-300">Results:</h3>
+  <h3 class="mb-4 px-4 text-lg font-bold text-gray-600 dark:text-gray-300">Results:</h3>
 
   <div class="w-full flex p-4 bg-gray-300 dark:bg-gray-700">
     <code v-if="usePage().props.flash.output" class="text-gray-600 dark:text-gray-400">{{ usePage().props.flash.output }}</code>

From 82b8a18a5910c54e859918d9c39519b09198fdab Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:32:48 +0100
Subject: [PATCH 046/111] Remove unneeded text colour classes from
 ContentControls heading

---
 resources/js/Pages/Public/Partials/ContentControls.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/Public/Partials/ContentControls.vue b/resources/js/Pages/Public/Partials/ContentControls.vue
index 63d8d9e6..3fbde563 100644
--- a/resources/js/Pages/Public/Partials/ContentControls.vue
+++ b/resources/js/Pages/Public/Partials/ContentControls.vue
@@ -7,7 +7,7 @@ import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
 </script>
 
 <template>
-  <h3 class="w-full pt-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Tab Component</h3>
+  <h3 class="w-full px-4 font-semibold text-xs uppercase tracking-widest">Tab Component</h3>
 
   <TabControls
     class="pt-4 px-4"

From 7dd67d3a5ac6eb904b2a1593bc4729bf49fb7835 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 12:33:58 +0100
Subject: [PATCH 047/111] Remove heading from ContentForms

---
 resources/js/Pages/Public/Partials/ContentForms.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/js/Pages/Public/Partials/ContentForms.vue b/resources/js/Pages/Public/Partials/ContentForms.vue
index 09e451f5..c785b603 100644
--- a/resources/js/Pages/Public/Partials/ContentForms.vue
+++ b/resources/js/Pages/Public/Partials/ContentForms.vue
@@ -28,8 +28,6 @@ const form = useForm({
 </script>
 
 <template>
-  <h3 class="w-full py-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Form &amp; Input Components</h3>
-
   <AppForm
     class="w-full px-4"
     :endpoint="route('page.store', 'forms')"

From 6e5fb0fc2947e7019fa74851cde786716d21849e Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 13:20:13 +0100
Subject: [PATCH 048/111] Remove unneeded text colour classes from stack block
 template

---
 resources/views/partials/static-blocks/stack.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/static-blocks/stack.blade.php b/resources/views/partials/static-blocks/stack.blade.php
index 0749118f..15902176 100644
--- a/resources/views/partials/static-blocks/stack.blade.php
+++ b/resources/views/partials/static-blocks/stack.blade.php
@@ -1,4 +1,4 @@
-<h3 class="w-full my-4 font-semibold text-sm text-gray-950 dark:text-gray-100 uppercase tracking-widest">Stack</h3>
+<h3 class="w-full my-4 font-semibold text-sm uppercase tracking-widest">Stack</h3>
 
 <p class="mb-4">Running on PHP v{{ $php_version }}</p>
 

From 924c4cc9f188d4116d79f988bdf63b3a8ddffc65 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 13:20:54 +0100
Subject: [PATCH 049/111] Remove unneeded text colour classes from
 BlockHeaderLogo component

---
 resources/js/Components/Blocks/BlockHeaderLogo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Components/Blocks/BlockHeaderLogo.vue b/resources/js/Components/Blocks/BlockHeaderLogo.vue
index 9574b3a2..9323c4fd 100644
--- a/resources/js/Components/Blocks/BlockHeaderLogo.vue
+++ b/resources/js/Components/Blocks/BlockHeaderLogo.vue
@@ -13,7 +13,7 @@ defineProps({
   <div class="flex justify-center gap-x-4 mt-4">
     <IconAppLogo class="w-12 h-12 stroke-gray-900 fill-gray-900  dark:stroke-gray-100 dark:fill-gray-100" />
 
-    <h2 class="my-auto text-center text-xl font-bold text-gray-900 dark:text-gray-100">{{ blockData.heading }}</h2>
+    <h2 class="my-auto text-center text-xl font-bold">{{ blockData.heading }}</h2>
   </div>
 
   <p

From 3e0ec4aae48486b7c4e9c58a69b501b3392da38e Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 13:22:55 +0100
Subject: [PATCH 050/111] Use current color for IconAppLogo fill & stroke on
 BlockHeaderLogo component

---
 resources/js/Components/Blocks/BlockHeaderLogo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Components/Blocks/BlockHeaderLogo.vue b/resources/js/Components/Blocks/BlockHeaderLogo.vue
index 9323c4fd..5d0dc2b5 100644
--- a/resources/js/Components/Blocks/BlockHeaderLogo.vue
+++ b/resources/js/Components/Blocks/BlockHeaderLogo.vue
@@ -11,7 +11,7 @@ defineProps({
 
 <template>
   <div class="flex justify-center gap-x-4 mt-4">
-    <IconAppLogo class="w-12 h-12 stroke-gray-900 fill-gray-900  dark:stroke-gray-100 dark:fill-gray-100" />
+    <IconAppLogo class="w-12 h-12 stroke-current fill-current" />
 
     <h2 class="my-auto text-center text-xl font-bold">{{ blockData.heading }}</h2>
   </div>

From 381994ac78910bb84b5b52180dff4b5c977d6429 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 22:45:47 +0100
Subject: [PATCH 051/111] Add default template value to PageSeeder

---
 database/seeders/PageSeeder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/seeders/PageSeeder.php b/database/seeders/PageSeeder.php
index 31f7a992..f513e8b3 100644
--- a/database/seeders/PageSeeder.php
+++ b/database/seeders/PageSeeder.php
@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Enums\Webpages\WebpageTemplate;
 use App\Models\Block;
 use App\Models\Page;
 use Exception;
@@ -33,9 +34,9 @@ public function run(): void
                     'meta_title' => $seed['meta_title'] ?? null,
                     'meta_description' => $seed['meta_description'] ?? null,
                     'meta_keywords' => $seed['meta_keywords'] ?? null,
-                    'template' => $seed['template'] ?? null,
                     'in_sitemap' => $seed['in_sitemap'] ?? 1,
                     'is_homepage' => $seed['is_homepage'] ?? 0,
+                    'template' => $seed['template'] ?? WebpageTemplate::PUBLIC_CONTENT->value,
                 ]);
 
                 foreach ($seed['blocks'] ?? [] as $display_order => $block) {

From 7c38b415d861d2a149020298ab07c308a2bf338f Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 22:50:08 +0100
Subject: [PATCH 052/111] Update default homepage model template to
 PUBLIC_CONTENT

---
 .../Views/Public/Content/HomepageContentResource.php          | 2 +-
 .../Http/Controllers/Public/HomepageControllerTest.php        | 4 ++--
 .../Views/Public/Content/HomepageContentResourceTest.php      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
index f1cac1da..35fc47d0 100644
--- a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
@@ -55,7 +55,7 @@ public function getTemplate(): ?WebpageTemplate
     public function setDefaultModel(): void
     {
         $this->page = new Page([
-            'template' => WebpageTemplate::PUBLIC_INDEX->value,
+            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
             'slug' => 'home',
             'title' => config('app.name'),
             'meta_description' => config('metadata.description'),
diff --git a/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php b/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
index ea6647e7..38ecbeb0 100644
--- a/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/HomepageControllerTest.php
@@ -28,10 +28,10 @@
     );
 
     expect($actual)
-        ->toHaveCorrectHtmlHead(WebpageTemplate::PUBLIC_INDEX->value)
+        ->toHaveCorrectHtmlHead(WebpageTemplate::PUBLIC_CONTENT->value)
         ->toHaveCorrectHtmlBody()
         ->toHaveCorrectPropsDetails(
-            WebpageTemplate::PUBLIC_INDEX->value,
+            WebpageTemplate::PUBLIC_CONTENT->value,
             $data['content'],
             $data['metadata']
         );
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
index 7eaadff0..f980070e 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
@@ -52,14 +52,14 @@
     $actual = (new HomepageContentResource)->getTemplate();
 
     expect($actual?->value)
-        ->toEqual('Public/PublicHomepage');
+        ->toEqual(WebpageTemplate::PUBLIC_CONTENT->value);
 });
 
 it('initialises with setDefaultModel ok', function () {
     $actual = new HomepageContentResource;
 
     expect($actual->getTemplate()?->value)
-        ->toEqual(WebpageTemplate::PUBLIC_INDEX->value);
+        ->toEqual(WebpageTemplate::PUBLIC_CONTENT->value);
 
     expect($actual->getItem()['blocks'])
         ->toHaveCamelCaseKeys()

From 588e8de6352ec0017107b739f200af09fa779ebb Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Mon, 8 Jul 2024 20:18:15 +0100
Subject: [PATCH 053/111] Remove unnecessary template properties from page
 seeds

---
 storage/app/seeds/pages.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 0bf71550..2c175d59 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -24,7 +24,6 @@
         'meta_title' => config('app.name'),
         'meta_description' => config('metadata.description'),
         'meta_keywords' => config('metadata.keywords'),
-        'template' => WebpageTemplate::PUBLIC_INDEX->value,
         'in_sitemap' => 0,
         'is_homepage' => 1,
         'blocks' => [
@@ -78,7 +77,6 @@
         'title' => 'About',
         'meta_title' => 'About',
         'meta_description' => config('metadata.description'),
-        'template' => WebpageTemplate::PUBLIC_CONTENT->value,
         'blocks' => [
             [
                 'type' => BlockType::WYSIWYG->value,

From 98a2a8d3d38c279c2553eff961ebab2cd9e035bf Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:26:35 +0100
Subject: [PATCH 054/111] Remove template property from PageFactory homePage
 method

---
 database/factories/PageFactory.php                | 1 -
 tests/Unit/Database/Factories/PageFactoryTest.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index 42505f69..0576e9b5 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -82,7 +82,6 @@ public function homePage(): static
             'content' => '',
             'meta_title' => config('app.name'),
             'meta_description' => config('metadata.description'),
-            'template' => WebpageTemplate::PUBLIC_INDEX->value,
             'in_sitemap' => false,
             'is_homepage' => true,
         ]));
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index 4aef533c..aaba6f8c 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -46,7 +46,7 @@
     ->content->toBeString()
     ->meta_title->toBeString()
     ->meta_description->toBeString()
-    ->template->toEqual(WebpageTemplate::PUBLIC_INDEX->value)
+    ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeFalse()
     ->is_homepage->toBeTrue();
 

From 8e434c3677d96995a9d38e154e2b12b00021e791 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:30:15 +0100
Subject: [PATCH 055/111] Remove PUBLIC_INDEX case from WebpageTemplate enum

---
 app/Enums/Webpages/WebpageTemplate.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Enums/Webpages/WebpageTemplate.php b/app/Enums/Webpages/WebpageTemplate.php
index deab6569..2fa5e2c1 100644
--- a/app/Enums/Webpages/WebpageTemplate.php
+++ b/app/Enums/Webpages/WebpageTemplate.php
@@ -14,7 +14,6 @@ enum WebpageTemplate: string
     case AUTH_REGISTER = 'Auth/AuthRegister';
     case PROFILE_DASHBOARD = 'Profile/ProfileDashboard';
     case PROFILE_EDIT = 'Profile/ProfileEdit';
-    case PUBLIC_INDEX = 'Public/PublicHomepage';
     case PUBLIC_CONTENT = 'Public/PublicContent';
     case PUBLIC_CONTENT_CONTROLS = 'Public/PublicContentControls';
     case PUBLIC_CONTENT_FORMS = 'Public/PublicContentForms';

From 138614abe817810cb2d26d906b77313613ae18a6 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:30:38 +0100
Subject: [PATCH 056/111] Remove unused homepage components

---
 .../Pages/Public/Partials/ContentHomepage.vue |  9 --------
 resources/js/Pages/Public/PublicHomepage.vue  | 22 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 resources/js/Pages/Public/Partials/ContentHomepage.vue
 delete mode 100644 resources/js/Pages/Public/PublicHomepage.vue

diff --git a/resources/js/Pages/Public/Partials/ContentHomepage.vue b/resources/js/Pages/Public/Partials/ContentHomepage.vue
deleted file mode 100644
index dbda83dc..00000000
--- a/resources/js/Pages/Public/Partials/ContentHomepage.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup>
-import AppBlocks from '@/Components/Blocks/AppBlocks.vue'
-</script>
-
-<template>
-  <AppBlocks
-    v-if="$page.props.content.blocks ?? []"
-  />
-</template>
diff --git a/resources/js/Pages/Public/PublicHomepage.vue b/resources/js/Pages/Public/PublicHomepage.vue
deleted file mode 100644
index 12d30d5c..00000000
--- a/resources/js/Pages/Public/PublicHomepage.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup>
-import IconAppLogo from '@/Components/Icons/IconAppLogo.vue'
-import LayoutGuest from '@/Layouts/LayoutGuest.vue'
-import ContentHomepage from '@/Pages/Public/Partials/ContentHomepage.vue'
-
-defineProps({
-  content: {
-    type: Object,
-    default: () => ({}),
-  },
-  metadata: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-</script>
-
-<template>
-  <LayoutGuest>
-    <ContentHomepage />
-  </LayoutGuest>
-</template>

From 7d9923bfc23b9edc8016f897c98fef4791bbd3de Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 16:38:08 +0100
Subject: [PATCH 057/111] Remove unused PageSummaryResource

---
 .../Public/Summaries/PageSummaryResource.php  | 23 -----------------
 tests/Unit/App/Http/HttpArchitectureTest.php  |  5 ----
 .../Summaries/PageSummaryResourceTest.php     | 25 -------------------
 3 files changed, 53 deletions(-)
 delete mode 100644 app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php
 delete mode 100644 tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php

diff --git a/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php b/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php
deleted file mode 100644
index c43ea47d..00000000
--- a/app/Http/Resources/Views/Public/Summaries/PageSummaryResource.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Views\Public\Summaries;
-
-use App\Interfaces\Resources\Items\PageItemInterface;
-use App\Models\Page;
-
-final class PageSummaryResource implements PageItemInterface
-{
-    /**
-     * Get the resource as an array.
-     *
-     * @return array{content: string, title: string, url: string}
-     */
-    public function getItem(Page $page): array
-    {
-        return [
-            'content' => $page->getMetaDescription(),
-            'title' => $page->getTitle(),
-            'url' => $page->getUrl(),
-        ];
-    }
-}
diff --git a/tests/Unit/App/Http/HttpArchitectureTest.php b/tests/Unit/App/Http/HttpArchitectureTest.php
index 50994fda..e47c2e1e 100644
--- a/tests/Unit/App/Http/HttpArchitectureTest.php
+++ b/tests/Unit/App/Http/HttpArchitectureTest.php
@@ -90,11 +90,6 @@
     ->toHaveSuffix('MetadataResource')
     ->tohaveMethod('getItem');
 
-arch('app/Http/Resources/Views/Public/Summaries has valid architecture')
-    ->expect('App\Http\Resources\Views\Public\Summaries')
-    ->toHaveSuffix('SummaryResource')
-    ->tohaveMethod('getItem');
-
 arch('app/Http/Resources/Views/Sitemaps has valid architecture')
     ->expect('App\Http\Resources\Views\Sitemaps')
     ->toHaveSuffix('SitemapResource');
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php
deleted file mode 100644
index bef34b0b..00000000
--- a/tests/Unit/App/Http/Resources/Views/Public/Summaries/PageSummaryResourceTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-use App\Http\Resources\Views\Public\Summaries\PageSummaryResource;
-use App\Interfaces\Resources\Items\PageItemInterface;
-use App\Models\Page;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-uses(RefreshDatabase::class);
-
-arch('it implements the expected interface')
-    ->expect(PageSummaryResource::class)
-    ->toImplement(PageItemInterface::class);
-
-test('getItem returns ok', function (Page $page) {
-    $actual = (new PageSummaryResource)->getItem($page);
-
-    expect($actual)
-        ->toHaveCamelCaseKeys()
-        ->toHaveCount(3)
-        ->toMatchArray([
-            'content' => $page->getMetaDescription(),
-            'title' => $page->getTitle(),
-            'url' => $page->getUrl(),
-        ]);
-})->with('pages');

From 85060a3399ec127ded8fba0342bad6b79f1fae57 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 18:47:59 +0100
Subject: [PATCH 058/111] Remove unused properties from PageContentResource
 getItem return value

---
 .../Views/Public/Content/HomepageContentResource.php       | 3 ---
 .../Resources/Views/Public/Content/PageContentResource.php | 6 ------
 .../Views/Public/Content/PrivacyPolicyContentResource.php  | 3 ---
 .../Views/Public/Content/HomepageContentResourceTest.php   | 7 ++-----
 .../Views/Public/Content/PageContentResourceTest.php       | 5 +----
 .../Public/Content/PrivacyPolicyContentResourceTest.php    | 7 ++-----
 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
index 35fc47d0..f720e8aa 100644
--- a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
@@ -35,9 +35,6 @@ public function __construct(
      *      type: string,
      *      data: array<string, array<int, string>|string>,
      *  }>,
-     *  bodytext: string,
-     *  heading: string,
-     *  subheading: string,
      * }
      */
     public function getItem(): array
diff --git a/app/Http/Resources/Views/Public/Content/PageContentResource.php b/app/Http/Resources/Views/Public/Content/PageContentResource.php
index 3c40f9b6..43936749 100644
--- a/app/Http/Resources/Views/Public/Content/PageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/PageContentResource.php
@@ -21,18 +21,12 @@ public function __construct(
      *      type: string,
      *      data: array<string, array<int, string>|string>,
      *  }>,
-     *  bodytext: string,
-     *  heading: string,
-     *  subheading: string,
      * }
      */
     public function getItem(): array
     {
         return [
             'blocks' => (new BlocksResource)->getItems($this->page->blocks),
-            'bodytext' => $this->page->getContent(),
-            'heading' => $this->page->getTitle(),
-            'subheading' => $this->page->getSubtitle(),
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
index 0f1f28b3..9b509794 100644
--- a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
@@ -36,9 +36,6 @@ public function __construct(
      *      type: string,
      *      data: array<string, array<int, string>|string>,
      *  }>,
-     *  bodytext: string,
-     *  heading: string,
-     *  subheading: string,
      * }
      */
     public function getItem(): array
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
index f980070e..2a5d0c99 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/HomepageContentResourceTest.php
@@ -21,7 +21,7 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4);
+        ->toHaveCount(1);
 });
 
 test('getItem returns ok with a Page Model', function () {
@@ -39,12 +39,9 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(1)
         ->toMatchArray([
             'blocks' => [],
-            'bodytext' => $page->content,
-            'heading' => $page->title,
-            'subheading' => $page->subtitle,
         ]);
 });
 
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
index 33814a52..7ec93a9a 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PageContentResourceTest.php
@@ -12,11 +12,8 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(1)
         ->toMatchArray([
             'blocks' => [],
-            'bodytext' => null,
-            'heading' => '',
-            'subheading' => '',
         ]);
 });
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
index 5f9a3d51..557a5ad6 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Content/PrivacyPolicyContentResourceTest.php
@@ -20,7 +20,7 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4);
+        ->toHaveCount(1);
 });
 
 test('getItem returns ok with a Page Model', function () {
@@ -37,11 +37,8 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(4)
+        ->toHaveCount(1)
         ->toMatchArray([
             'blocks' => [],
-            'bodytext' => $page->content,
-            'heading' => $page->title,
-            'subheading' => $page->subtitle,
         ]);
 });

From da37fbdb5762ac3896485d955beb032be8d447d6 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 16:48:19 +0100
Subject: [PATCH 059/111] Remove redundant meta_title properties from page
 seeds

---
 storage/app/seeds/pages.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/storage/app/seeds/pages.php b/storage/app/seeds/pages.php
index 2c175d59..343a42dd 100644
--- a/storage/app/seeds/pages.php
+++ b/storage/app/seeds/pages.php
@@ -21,7 +21,6 @@
     [
         'slug' => 'home',
         'title' => config('app.name'),
-        'meta_title' => config('app.name'),
         'meta_description' => config('metadata.description'),
         'meta_keywords' => config('metadata.keywords'),
         'in_sitemap' => 0,
@@ -75,7 +74,6 @@
     [
         'slug' => 'about',
         'title' => 'About',
-        'meta_title' => 'About',
         'meta_description' => config('metadata.description'),
         'blocks' => [
             [
@@ -115,7 +113,6 @@
     [
         'slug' => 'controls',
         'title' => 'Controls',
-        'meta_title' => 'Controls',
         'meta_description' => $description_controls,
         'template' => WebpageTemplate::PUBLIC_CONTENT_CONTROLS->value,
         'blocks' => [
@@ -135,7 +132,6 @@
     [
         'slug' => 'forms',
         'title' => 'Forms',
-        'meta_title' => 'Forms',
         'meta_description' => $description_forms,
         'template' => WebpageTemplate::PUBLIC_CONTENT_FORMS->value,
         'blocks' => [

From e4011852afb11d5b9e998116f9e309e196e3ebe6 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 16:49:08 +0100
Subject: [PATCH 060/111] Remove redundant properties from PageSeeder

---
 database/seeders/PageSeeder.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/database/seeders/PageSeeder.php b/database/seeders/PageSeeder.php
index f513e8b3..06d91b06 100644
--- a/database/seeders/PageSeeder.php
+++ b/database/seeders/PageSeeder.php
@@ -29,13 +29,10 @@ public function run(): void
                 $page = Page::factory()->create([
                     'slug' => $seed['slug'] ?? null,
                     'title' => $seed['title'] ?? null,
-                    'subtitle' => $seed['subtitle'] ?? null,
-                    'content' => $seed['content'] ?? null,
-                    'meta_title' => $seed['meta_title'] ?? null,
-                    'meta_description' => $seed['meta_description'] ?? null,
-                    'meta_keywords' => $seed['meta_keywords'] ?? null,
                     'in_sitemap' => $seed['in_sitemap'] ?? 1,
                     'is_homepage' => $seed['is_homepage'] ?? 0,
+                    'meta_description' => $seed['meta_description'] ?? null,
+                    'meta_keywords' => $seed['meta_keywords'] ?? null,
                     'template' => $seed['template'] ?? WebpageTemplate::PUBLIC_CONTENT->value,
                 ]);
 

From e3a7f6dc8f6a3bd7cbfefe7e6c602582e712b41e Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 16:55:48 +0100
Subject: [PATCH 061/111] Remove redundant properties from PageFactory

---
 database/factories/PageFactory.php            | 23 +------------------
 .../Database/Factories/PageFactoryTest.php    | 14 ++---------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index 0576e9b5..93f95912 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -26,9 +26,6 @@ public function definition(): array
         return [
             'slug' => urlencode(str_replace(' ', '-', $title)),
             'title' => ucwords($title),
-            'subtitle' => null,
-            'content' => null,
-            'meta_title' => null,
             'meta_description' => null,
             'meta_keywords' => null,
             'open_graph_id' => null,
@@ -45,9 +42,6 @@ public function aboutPage(): static
             ...$attributes,
             'slug' => 'about',
             'title' => 'About',
-            'subtitle' => config('app.name'),
-            'content' => '',
-            'meta_title' => 'About',
             'meta_description' => config('metadata.description'),
         ]));
     }
@@ -55,19 +49,9 @@ public function aboutPage(): static
     /** Indicate that the model should use faked data with all fields filled. */
     public function dummy(): static
     {
-        $title = $this->getFakeString();
-
         return $this->state(fn (array $attributes) => array_merge([
-            'slug' => urlencode(str_replace(' ', '-', $title)),
-            'title' => ucwords($title),
-            'subtitle' => $this->getFakeString(),
-            'content' => $this->getFakeTextHtml(),
-            'meta_title' => ucwords($title),
-            'meta_description' => $this->getFakeString(20, 30),
-            'template' => WebpageTemplate::PUBLIC_CONTENT->value,
-            'in_sitemap' => true,
-            'is_homepage' => false,
             ...$attributes,
+            'meta_description' => $this->getFakeString(20, 30),
         ]));
     }
 
@@ -78,9 +62,6 @@ public function homePage(): static
             ...$attributes,
             'slug' => 'home',
             'title' => config('app.name'),
-            'subtitle' => config('metadata.description'),
-            'content' => '',
-            'meta_title' => config('app.name'),
             'meta_description' => config('metadata.description'),
             'in_sitemap' => false,
             'is_homepage' => true,
@@ -94,8 +75,6 @@ public function privacyPage(): static
             ...$attributes,
             'slug' => 'privacy',
             'title' => 'Privacy Policy',
-            'subtitle' => config('app.name'),
-            'meta_title' => 'Privacy Policy',
             'meta_description' => BlockType::PRIVACY_POLICY->schema()['description'],
         ]));
     }
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index aaba6f8c..48b71813 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -10,9 +10,6 @@
     ->expect(fn () => Page::factory()->make(['title' => 'Test Title']))
     ->title->toEqual('Test Title')
     ->slug->toBeString()
-    ->subtitle->toBeNull()
-    ->content->toBeNull()
-    ->meta_title->toBeNull()
     ->meta_description->toBeNull()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()
@@ -22,9 +19,6 @@
     ->expect(fn () => Page::factory()->aboutPage()->make(['title' => 'Test Title']))
     ->title->toEqual('Test Title')
     ->slug->toEqual('about')
-    ->subtitle->toBeString()
-    ->content->toBeString()
-    ->meta_title->toEqual('About')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()
@@ -32,8 +26,9 @@
 
 it('makes dummy page models')
     ->expect(fn () => Page::factory()->dummy()->make())
-    ->title->tobeString('Test Title')
+    ->title->tobeString()
     ->slug->toBeString()
+    ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
@@ -42,9 +37,6 @@
     ->expect(fn () => Page::factory()->homePage()->make())
     ->title->toBeString()
     ->slug->toEqual('home')
-    ->subtitle->toBeString()
-    ->content->toBeString()
-    ->meta_title->toBeString()
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeFalse()
@@ -54,8 +46,6 @@
     ->expect(fn () => Page::factory()->privacyPage()->make())
     ->title->toEqual('Privacy Policy')
     ->slug->toEqual('privacy')
-    ->subtitle->toBeString()
-    ->meta_title->toEqual('Privacy Policy')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()

From 3f64d52d9da17b5a4f2fedac869db7f9e31899d5 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:37:01 +0100
Subject: [PATCH 062/111] Remove unused properties from PageUpdateRequest

---
 app/Http/Requests/Admin/PageUpdateRequest.php     |  3 ---
 .../Http/Requests/Admin/PageUpdateRequestTest.php | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/app/Http/Requests/Admin/PageUpdateRequest.php b/app/Http/Requests/Admin/PageUpdateRequest.php
index 37323057..45adc45f 100644
--- a/app/Http/Requests/Admin/PageUpdateRequest.php
+++ b/app/Http/Requests/Admin/PageUpdateRequest.php
@@ -17,9 +17,6 @@ public function rules(): array
         return [
             'blocks' => ['nullable', 'max:5120'],
             'title' => ['required', 'string', 'max:255'],
-            'subtitle' => ['nullable', 'string', 'max:255'],
-            'content' => ['nullable', 'string', 'max:5120'],
-            'metaTitle' => ['nullable', 'string', 'max:255'],
             'metaDescription' => ['nullable', 'string', 'max:255'],
             'inSitemap' => ['required', 'boolean'],
         ];
diff --git a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
index 55596725..4924d6fd 100644
--- a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
+++ b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
@@ -26,21 +26,6 @@
             'string',
             'max:255',
         ],
-        'subtitle' => [
-            'nullable',
-            'string',
-            'max:255',
-        ],
-        'content' => [
-            'nullable',
-            'string',
-            'max:5120',
-        ],
-        'metaTitle' => [
-            'nullable',
-            'string',
-            'max:255',
-        ],
         'metaDescription' => [
             'nullable',
             'string',

From 007d1a44a1d7b32c14e5f046f7670680a362bb42 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:38:36 +0100
Subject: [PATCH 063/111] Remove unused inputs from CreateEditPage page partial
 component

---
 .../Pages/Admin/Partials/CreateEditPage.vue   | 53 -------------------
 1 file changed, 53 deletions(-)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index 1a035389..f4f9c612 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -7,7 +7,6 @@ import InputCheckbox from '@/Components/Forms/Inputs/InputCheckbox.vue'
 import InputError from '@/Components/Forms/Inputs/InputError.vue'
 import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
 import InputText from '@/Components/Forms/Inputs/InputText.vue'
-import InputWysiwyg from '@/Components/Forms/Inputs/InputWysiwyg.vue'
 import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
 import { useForm, usePage } from '@inertiajs/vue3'
 
@@ -15,11 +14,8 @@ const page = usePage().props.content
 
 const form = useForm({
   blocks: page.blocks,
-  content: page.content,
   inSitemap: page.inSitemap,
   metaDescription: page.metaDescription,
-  metaTitle: page.metaTitle,
-  subtitle: page.subtitle,
   title: page.title,
 })
 
@@ -52,38 +48,6 @@ const form = useForm({
       </FormInput>
     </div>
 
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Subtitle"
-        input-label-position="left"
-        input-field="subtitle"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-subtitle"
-          name="subtitle"
-          type="text"
-          class="block w-full"
-          v-model="form.subtitle"
-        />
-      </FormInput>
-    </div>
-
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Content"
-        input-label-position="left"
-        input-field="content"
-        :parent-form="form"
-      >
-        <InputWysiwyg
-          id="input-content"
-          class="block w-full"
-          v-model="form.content"
-        />
-      </FormInput>
-    </div>
-
     <div class="w-full flex pt-4 px-4">
       <FormInput
         input-label="Blocks"
@@ -97,23 +61,6 @@ const form = useForm({
       </FormInput>
     </div>
 
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Meta Title"
-        input-label-position="left"
-        input-field="metaTitle"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-meta-title"
-          name="metaTitle"
-          type="text"
-          class="block w-full"
-          v-model="form.metaTitle"
-        />
-      </FormInput>
-    </div>
-
     <div class="w-full flex pt-4 px-4">
       <FormInput
         input-label="Meta Description"

From 3279cdf400c93ff6a48c450555c78e13709414a5 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:39:47 +0100
Subject: [PATCH 064/111] Remove unused properties from CreateEditPageResource
 getItem return value

---
 .../Views/Admin/Pages/CreateEditPageResource.php          | 6 ------
 .../Views/Admin/Pages/CreateEditPageResourceTest.php      | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
index 71b00531..550d8122 100644
--- a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
+++ b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
@@ -19,10 +19,7 @@ final class CreateEditPageResource implements PageItemInterface
      *      data: array<string, array<int, string>|string>,
      *      schema: array{label:string, inputs:array<int, bool|int|string>}
      *  }>,
-     *  content: string,
-     *  subtitle: string,
      *  title: string,
-     *  metaTitle: string,
      *  metaDescription: string,
      *  inSitemap: bool,
      * }
@@ -32,10 +29,7 @@ public function getItem(Page $page): array
         return [
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
         ];
diff --git a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
index 0451acdc..37d15511 100644
--- a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
@@ -17,14 +17,10 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(8)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
         ]);
@@ -35,14 +31,10 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(8)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
-            'content' => $page->getContent(),
-            'subtitle' => $page->getSubtitle(),
             'title' => $page->getTitle(),
-            'metaTitle' => $page->getMetaTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
         ]);

From 5ab272299afdee876d8b128706fa609d729ae38c Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:40:22 +0100
Subject: [PATCH 065/111] Remove unused properties from page admin tests

---
 .../TestContent/Admin/PageAdminTest.php       |  8 +-------
 tests/Datasets/PageArraysUpdateInvalid.php    | 20 -------------------
 .../Controllers/Admin/PageControllerTest.php  | 12 -----------
 .../Services/Admin/PageAdminServiceTest.php   | 12 -----------
 4 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/tests/Browser/TestContent/Admin/PageAdminTest.php b/tests/Browser/TestContent/Admin/PageAdminTest.php
index 3c498e73..c149de0b 100644
--- a/tests/Browser/TestContent/Admin/PageAdminTest.php
+++ b/tests/Browser/TestContent/Admin/PageAdminTest.php
@@ -20,16 +20,12 @@ public function testAdminPageEdit(): void
         $initial_array = [
             'in_sitemap' => 0,
             'meta_description' => 'Old meta-description.',
-            'meta_title' => 'Old Title',
-            'subtitle' => 'Old subtitle',
             'title' => 'Old Title',
         ];
 
         $expected_array = [
             'title' => 'New Title',
-            'subtitle' => 'New subtitle',
-            'metaTitle' => 'New meta-title',
-            'metaDescription' => 'New meta-description.',
+            'metaDescription' => 'New description.',
             'inSitemap' => ['type' => 'checkbox'],
         ];
 
@@ -37,8 +33,6 @@ public function testAdminPageEdit(): void
         $user = User::factory()->isAdmin()->create();
 
         Assert::assertTrue($page->title === $initial_array['title']);
-        Assert::assertTrue($page->subtitle === $initial_array['subtitle']);
-        Assert::assertTrue($page->meta_title === $initial_array['meta_title']);
         Assert::assertTrue($page->meta_description === $initial_array['meta_description']);
         Assert::assertFalse($page->in_sitemap);
 
diff --git a/tests/Datasets/PageArraysUpdateInvalid.php b/tests/Datasets/PageArraysUpdateInvalid.php
index ec3fa0b4..f3550a85 100644
--- a/tests/Datasets/PageArraysUpdateInvalid.php
+++ b/tests/Datasets/PageArraysUpdateInvalid.php
@@ -30,26 +30,6 @@
             array_merge($standard_array, ['title' => str_pad('', 256, 'a')]),
             ['title' => 'The title field must not be greater than 255 characters.'],
         ],
-        'subtitle not string' => [
-            array_merge($standard_array, ['subtitle' => 1]),
-            ['subtitle' => 'The subtitle field must be a string.'],
-        ],
-        'subtitle >255 characters' => [
-            array_merge($standard_array, ['subtitle' => str_pad('', 256, 'a')]),
-            ['subtitle' => 'The subtitle field must not be greater than 255 characters.'],
-        ],
-        'content not string' => [
-            array_merge($standard_array, ['content' => 1]),
-            ['content' => 'The content field must be a string.'],
-        ],
-        'metaTitle not string' => [
-            array_merge($standard_array, ['metaTitle' => 1]),
-            ['metaTitle' => 'The meta title field must be a string.'],
-        ],
-        'metaTitle >255 characters' => [
-            array_merge($standard_array, ['metaTitle' => str_pad('', 256, 'a')]),
-            ['metaTitle' => 'The meta title field must not be greater than 255 characters.'],
-        ],
         'metaDescription not string' => [
             array_merge($standard_array, ['metaDescription' => 1]),
             ['metaDescription' => 'The meta description field must be a string.'],
diff --git a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
index 4965f97c..751677b4 100644
--- a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
@@ -87,9 +87,6 @@
     $page->refresh();
 
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($page_original->subtitle);
-    expect($page->content)->toEqual($page_original->content);
-    expect($page->meta_title)->toEqual($page_original->meta_title);
     expect($page->meta_description)->toEqual($page_original->meta_description);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
@@ -101,9 +98,6 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => 'New Title',
-        'subtitle' => 'New Subtitle',
-        'content' => '<p>New content.</p>',
-        'metaTitle' => 'New Meta-Title',
         'metaDescription' => 'New Meta-Description',
         'inSitemap' => !$page->in_sitemap,
     ];
@@ -121,9 +115,6 @@
     $page->refresh();
 
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($data['subtitle']);
-    expect($page->content)->toEqual($data['content']);
-    expect($page->meta_title)->toEqual($data['metaTitle']);
     expect($page->meta_description)->toEqual($data['metaDescription']);
     expect($page->in_sitemap)->toEqual($data['inSitemap']);
     expect($page->blocks)->toEqual($page_original->blocks);
@@ -155,9 +146,6 @@
     /** @phpstan-ignore-next-line (Intentionally accessing undefined property as part of the test.) */
     expect($page->unknown_field)->toBeNull();
     expect($page->title)->toEqual($data['title']);
-    expect($page->subtitle)->toEqual($page_original->subtitle);
-    expect($page->content)->toEqual($page_original->content);
-    expect($page->meta_title)->toEqual($page_original->meta_title);
     expect($page->meta_description)->toEqual($page_original->meta_description);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
diff --git a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
index 0a53b2a5..da1d23be 100644
--- a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
+++ b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
@@ -24,9 +24,6 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($page_original->subtitle)
-        ->content->toEqual($page_original->content)
-        ->meta_title->toEqual($page_original->meta_title)
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
         ->template->toEqual($page_original->template)
@@ -49,9 +46,6 @@
 
     $data = [
         'title' => 'New Title',
-        'subtitle' => 'New Subtitle',
-        'content' => '<p>New content.</p>',
-        'metaTitle' => 'New Meta-Title',
         'metaDescription' => 'New Meta-Description',
         'inSitemap' => !$page->in_sitemap,
         'blocks' => $blocks_array,
@@ -66,9 +60,6 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($data['subtitle'])
-        ->content->toEqual($data['content'])
-        ->meta_title->toEqual($data['metaTitle'])
         ->meta_description->toEqual($data['metaDescription'])
         ->in_sitemap->toEqual($data['inSitemap'])
         ->template->toEqual($page_original->template);
@@ -95,9 +86,6 @@
     expect($page)
         ->not->toBeNull()
         ->title->toEqual($data['title'])
-        ->subtitle->toEqual($page_original->subtitle)
-        ->content->toEqual($page_original->content)
-        ->meta_title->toEqual($page_original->meta_title)
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
         ->template->toEqual($page_original->template)

From 6ebb98503ac9416b74b40f33ad99088906d0c7d9 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 22:59:09 +0100
Subject: [PATCH 066/111] Remove unused properties from public page tests

---
 .../Feature/Http/Controllers/Public/SitemapControllerTest.php  | 3 ---
 .../Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php b/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
index 72d5dae0..3a9c2d25 100644
--- a/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/SitemapControllerTest.php
@@ -26,9 +26,6 @@
 test('show can render the general pages sitemap view', function () {
     Page::factory()->create([
         'slug' => 'test-page',
-        'meta_description' => 'Test page example meta-description.',
-        'meta_keywords' => 'test, page, keywords',
-        'meta_title' => 'Test Page',
     ]);
 
     $route = route('sitemap.show', 'pages');
diff --git a/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php b/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
index 21416a1c..a34b55ae 100644
--- a/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Sitemaps/PageSitemapResourceTest.php
@@ -10,9 +10,6 @@
 beforeEach(function () {
     $this->page = Page::factory()->create([
         'slug' => 'test-page',
-        'meta_description' => 'Test page example meta-description.',
-        'meta_keywords' => 'test, page, keywords',
-        'meta_title' => 'Test Page',
     ]);
 });
 

From 6e7d9b8791c61778f512970abd1e3053235ae979 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:41:04 +0100
Subject: [PATCH 067/111] Remove unused methods from Page model

---
 app/Models/Page.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/Models/Page.php b/app/Models/Page.php
index 08ac2e5d..6425a0e8 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -41,12 +41,6 @@ final class Page extends Model
         'is_homepage',
     ];
 
-    /** Get the HTML content string for the page. */
-    public function getContent(): string
-    {
-        return $this->content ?? '';
-    }
-
     /** Get the public URL's path for the page. */
     public function getPath(): string
     {
@@ -55,12 +49,6 @@ public function getPath(): string
             : route('page.show', $this->slug, false);
     }
 
-    /** Get the subtitle for the page. */
-    public function getSubtitle(): string
-    {
-        return $this->subtitle ?? '';
-    }
-
     /** Get the public URL for the page. */
     public function getUrl(): string
     {

From 80b010cd0d6a72abecf8fbd62df338898b766437 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:41:36 +0100
Subject: [PATCH 068/111] Remove unused properties from Page model fillable
 array

---
 app/Models/Page.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Models/Page.php b/app/Models/Page.php
index 6425a0e8..77f3918f 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -30,9 +30,6 @@ final class Page extends Model
     protected $fillable = [
         'slug',
         'title',
-        'subtitle',
-        'content',
-        'meta_title',
         'meta_description',
         'meta_keywords',
         'open_graph_id',

From f5fea6dc46e1735eb0848840e9382093398c8bf4 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 22:38:44 +0100
Subject: [PATCH 069/111] Replace getMetaTitle calls with getTitle

---
 .../Resources/Views/Public/Metadata/PageMetadataResource.php  | 2 +-
 tests/Browser/Pages/Guest/PageView.php                        | 2 +-
 .../Views/Public/Metadata/PageMetadataResourceTest.php        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php b/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
index ee67079a..2e5da6c9 100644
--- a/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
+++ b/app/Http/Resources/Views/Public/Metadata/PageMetadataResource.php
@@ -17,7 +17,7 @@ public function getItem(Page $page): array
         return [
             'canonical' => $page->getUrl(),
             'description' => $page->getMetaDescription(),
-            'title' => $page->getMetaTitle(),
+            'title' => $page->getTitle(),
         ];
     }
 }
diff --git a/tests/Browser/Pages/Guest/PageView.php b/tests/Browser/Pages/Guest/PageView.php
index 129db7bd..d3098302 100644
--- a/tests/Browser/Pages/Guest/PageView.php
+++ b/tests/Browser/Pages/Guest/PageView.php
@@ -27,7 +27,7 @@ public function assert(Browser $browser): void
         $browser
             ->assertHasLoadedCorrectly($this->url())
             ->assertHasCorrectCookies()
-            ->assertHasRenderedCorrectly($this->page->getMetaTitle())
+            ->assertHasRenderedCorrectly($this->page->getTitle())
 
             ->pause(config('tests.dusk.pause_length'));
     }
diff --git a/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php b/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
index fc7dd256..df9d5c5d 100644
--- a/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Public/Metadata/PageMetadataResourceTest.php
@@ -10,8 +10,8 @@
 beforeEach(function () {
     $this->page = Page::factory()->create([
         'slug' => 'test-page',
+        'title' => 'Test Page',
         'meta_description' => 'Test page example meta-description.',
-        'meta_title' => 'Test Page',
     ]);
 });
 
@@ -28,6 +28,6 @@
         ->toMatchArray([
             'canonical' => url($this->page->slug),
             'description' => $this->page->getMetaDescription(),
-            'title' => $this->page->getMetaTitle(),
+            'title' => $this->page->getTitle(),
         ]);
 });

From 97589b9b54b1e038f270c78c5a6106c8f0116f6a Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 22:39:15 +0100
Subject: [PATCH 070/111] Remove getMetaTitle method from HasPageView trait

---
 app/Traits/HasPageView.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Traits/HasPageView.php b/app/Traits/HasPageView.php
index 8911780c..60bbe98e 100644
--- a/app/Traits/HasPageView.php
+++ b/app/Traits/HasPageView.php
@@ -26,12 +26,6 @@ public function getMetaKeywords(): string
         return $this->meta_keywords ?? '';
     }
 
-    /** Get the meta-title for the resource. */
-    public function getMetaTitle(): string
-    {
-        return ($this->meta_title && trim($this->meta_title) !== '') ? $this->meta_title : $this->getTitle();
-    }
-
     /** Get the webpage template for the resource. */
     public function getTemplate(): ?WebpageTemplate
     {

From d5dde59e081829be52a60119f52a2fcf7c71ead8 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 17:42:06 +0100
Subject: [PATCH 071/111] Create migration to drop unused page fields

---
 ...subtitle_content_meta_title_from_pages.php | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php

diff --git a/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php b/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php
new file mode 100644
index 00000000..066d5986
--- /dev/null
+++ b/database/migrations/2024_07_16_000000_drop_subtitle_content_meta_title_from_pages.php
@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /** Run the migrations. */
+    public function up(): void
+    {
+        if (Schema::hasColumn('pages', 'subtitle')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('subtitle');
+            });
+        }
+
+        if (Schema::hasColumn('pages', 'content')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('content');
+            });
+        }
+
+        if (Schema::hasColumn('pages', 'meta_title')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('meta_title');
+            });
+        }
+    }
+
+    /** Reverse the migrations. */
+    public function down(): void
+    {
+        if (!Schema::hasColumn('pages', 'subtitle')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->string('subtitle')->nullable()->after('title');
+            });
+        }
+
+        if (!Schema::hasColumn('pages', 'content')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->text('content')->nullable()->after('subtitle');
+            });
+        }
+
+        if (!Schema::hasColumn('pages', 'meta_title')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->string('meta_title')->nullable()->after('content');
+            });
+        }
+    }
+};

From afcf1fb410399b74c60fc9f660220deaeb4e4401 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 00:41:22 +0100
Subject: [PATCH 072/111] Update CreateEditPage inSitemap input styling

---
 resources/js/Pages/Admin/Partials/CreateEditPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index f4f9c612..ff9a24b5 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -80,9 +80,9 @@ const form = useForm({
 
     <div class="w-full flex p-4">
       <label class="flex items-start">
-        <InputCheckbox name="inSitemap" v-model:checked="form.inSitemap" />
+        <InputCheckbox class="my-auto" name="inSitemap" v-model:checked="form.inSitemap" />
 
-        <span class="ms-2 text-sm text-gray-700 dark:text-gray-300">In Sitemap?</span>
+        <span class="ms-2 text-gray-700 dark:text-gray-300">In Sitemap?</span>
       </label>
     </div>
 

From 5c95a8b8caf4e737d666c2d5ef8fa688beefcf38 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:54:03 +0100
Subject: [PATCH 073/111] Create CreateEditControls component with cancel
 button

---
 .../Admin/Partials/CreateEditControls.vue     | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 resources/js/Pages/Admin/Partials/CreateEditControls.vue

diff --git a/resources/js/Pages/Admin/Partials/CreateEditControls.vue b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
new file mode 100644
index 00000000..896fa40c
--- /dev/null
+++ b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
@@ -0,0 +1,60 @@
+<script setup>
+import AppButton from '@/Components/Controls/Buttons/AppButton.vue'
+import InputError from '@/Components/Forms/Inputs/InputError.vue'
+import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
+import LinkButton from '@/Components/Controls/Links/LinkButton.vue'
+import OutlineArrowUturnLeft from '@/Components/Icons/HeroIcons/Outline/OutlineArrowUturnLeft.vue'
+import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
+import { usePage } from '@inertiajs/vue3'
+
+defineProps({
+  parentForm: {
+    type: Object,
+    required: true,
+  },
+  urlReturn: {
+    type: String,
+    default: '',
+  },
+})
+</script>
+
+<template>
+  <div class="w-full flex mt-4 pt-4 px-4">
+    <span class="w-full sm:w-1/2 xl:w-1/4 min-h-8">
+      <InputError class="my-2" :message="parentForm.hasErrors ? 'Please update the indicated fields' : ''" />
+
+      <InputSuccess :message="usePage().props.flash.status" />
+    </span>
+
+    <span class="w-full sm:w-1/2 xl:w-1/4 h-8 my-auto py-1">
+      <progress
+        v-if="parentForm.progress"
+        class="w-full my-auto"
+        max="100"
+        :value="parentForm.progress.percentage"
+      >
+        {{ parentForm.progress.percentage }}%
+      </progress>
+    </span>
+
+    <span class="sm:flex w-full xl:w-1/2 justify-end space-y-2 sm:space-y-0 sm:space-x-2 my-auto">
+      <LinkButton
+        v-if="urlReturn !== ''"
+        custom-classes="app-button-secondary-gray-100"
+        :href="returnUrl"
+        min-width="md"
+      >
+        Cancel <OutlineArrowUturnLeft class="ml-2 h-4 w-4" />
+      </LinkButton>
+
+      <AppButton
+        :class="{ 'opacity-25': parentForm.processing }"
+        :disabled="parentForm.processing"
+        min-width="md"
+      >
+        Save <OutlinePaperAirplane class="ml-2 h-4 w-4" />
+      </AppButton>
+    </span>
+  </div>
+</template>

From ac567f2b707b754f123ff9e12c08fcc29e9b3e4a Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 02:00:41 +0100
Subject: [PATCH 074/111] Update CreateEditPage to use CreateEditControls
 component

---
 .../Pages/Admin/Partials/CreateEditPage.vue   | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index ff9a24b5..e8c326e7 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -1,13 +1,10 @@
 <script setup>
-import AppButton from '@/Components/Controls/Buttons/AppButton.vue'
 import AppForm from '@/Components/Forms/AppForm.vue'
 import FormInput from '@/Components/Forms/FormInput.vue'
 import InputBlocks from '@/Components/Forms/Inputs/InputBlocks.vue'
 import InputCheckbox from '@/Components/Forms/Inputs/InputCheckbox.vue'
-import InputError from '@/Components/Forms/Inputs/InputError.vue'
-import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
 import InputText from '@/Components/Forms/Inputs/InputText.vue'
-import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
+import CreateEditControls from '@/Pages/Admin/Partials/CreateEditControls.vue'
 import { useForm, usePage } from '@inertiajs/vue3'
 
 const page = usePage().props.content
@@ -86,30 +83,9 @@ const form = useForm({
       </label>
     </div>
 
-    <div class="w-full flex mt-4 pt-4 justify-between">
-      <span class="flex mt-4">
-        <InputError class="my-auto" :message="form.hasErrors ? 'Please update the indicated fields' : ''" />
-
-        <InputSuccess class="my-auto" :message="usePage().props.flash.status" />
-      </span>
-
-      <span class="w-1/2 h-8 my-auto py-1">
-        <progress
-          v-if="form.progress"
-          class="w-full my-auto"
-          max="100"
-          :value="form.progress.percentage"
-        >
-          {{ form.progress.percentage }}%
-        </progress>
-      </span>
-
-      <AppButton
-        :class="{ 'opacity-25': form.processing }"
-        :disabled="form.processing"
-      >
-        Save <OutlinePaperAirplane class="ml-2 h-4 w-4" />
-      </AppButton>
-    </div>
+    <CreateEditControls
+      :parent-form="form"
+      :url-return="route('dashboard')"
+    />
   </AppForm>
 </template>

From 40f06b30a8ba1697829a3654e06e6d0a5c7de941 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:01:04 +0100
Subject: [PATCH 075/111] Update CreateEditPage to use tab components

---
 .../Pages/Admin/Partials/CreateEditPage.vue   | 122 ++++++++++--------
 1 file changed, 71 insertions(+), 51 deletions(-)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index e8c326e7..38147527 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -4,6 +4,9 @@ import FormInput from '@/Components/Forms/FormInput.vue'
 import InputBlocks from '@/Components/Forms/Inputs/InputBlocks.vue'
 import InputCheckbox from '@/Components/Forms/Inputs/InputCheckbox.vue'
 import InputText from '@/Components/Forms/Inputs/InputText.vue'
+import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
+import TabBody from '@/Components/Controls/Tabs/TabBody.vue'
+import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
 import CreateEditControls from '@/Pages/Admin/Partials/CreateEditControls.vue'
 import { useForm, usePage } from '@inertiajs/vue3'
 
@@ -27,61 +30,78 @@ const form = useForm({
     :endpoint="route('admin.page.edit', page.id)"
     :form="form"
   >
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Title*"
-        input-label-position="left"
-        input-field="title"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-title"
-          name="title"
-          type="text"
-          class="block w-full"
-          v-model="form.title"
-          autofocus
-        />
-      </FormInput>
-    </div>
+    <TabControls
+      class="pt-4 px-4"
+      :tabs="['Content', 'Meta Data']"
+    />
+
+    <AppSectionDivider margin="min" />
+
+    <TabBody
+      class="mx-4 pt-4 px-4 bg-white dark:bg-gray-900 rounded-b-md"
+      :tab="0"
+    >
+      <div class="w-full flex pt-4 px-4">
+        <FormInput
+          input-label="Blocks"
+          input-label-position="hidden"
+          input-field="blocks"
+          :parent-form="form"
+        >
+          <InputBlocks
+            :blocks="form.blocks"
+          />
+        </FormInput>
+      </div>
+    </TabBody>
 
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Blocks"
-        input-label-position="left"
-        input-field="blocks"
-        :parent-form="form"
-      >
-        <InputBlocks
-          :blocks="form.blocks"
-        />
-      </FormInput>
-    </div>
+    <TabBody
+      class="mx-4 px-4 py-8 bg-white dark:bg-gray-900 rounded-b-md"
+      :tab="1"
+    >
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Title*"
+          input-label-position="left"
+          input-field="title"
+          :parent-form="form"
+        >
+          <InputText
+            id="input-title"
+            name="title"
+            type="text"
+            class="block w-full"
+            v-model="form.title"
+            autofocus
+          />
+        </FormInput>
+      </div>
 
-    <div class="w-full flex pt-4 px-4">
-      <FormInput
-        input-label="Meta Description"
-        input-label-position="left"
-        input-field="metaDescription"
-        :parent-form="form"
-      >
-        <InputText
-          id="input-meta-description"
-          name="metaDescription"
-          type="text"
-          class="block w-full"
-          v-model="form.metaDescription"
-        />
-      </FormInput>
-    </div>
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Meta Description"
+          input-label-position="left"
+          input-field="metaDescription"
+          :parent-form="form"
+        >
+          <InputText
+            id="input-meta-description"
+            name="metaDescription"
+            type="text"
+            class="block w-full"
+            v-model="form.metaDescription"
+          />
+        </FormInput>
+      </div>
 
-    <div class="w-full flex p-4">
-      <label class="flex items-start">
-        <InputCheckbox class="my-auto" name="inSitemap" v-model:checked="form.inSitemap" />
+      <div class="w-full flex pt-2 px-4">
+        <label class="flex items-start text-sm">
+          <InputCheckbox class="my-auto" name="inSitemap" v-model:checked="form.inSitemap" />
 
-        <span class="ms-2 text-gray-700 dark:text-gray-300">In Sitemap?</span>
-      </label>
-    </div>
+          <span class="ms-2 text-gray-700 dark:text-gray-300">In Sitemap?</span>
+        </label>
+      </div>
+    </TabBody>
 
     <CreateEditControls
       :parent-form="form"

From afa996ad1e29216aa8faeee36cfcf41c55c1c570 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:01:46 +0100
Subject: [PATCH 076/111] Update CreateEditPage header styling

---
 resources/js/Pages/Admin/Partials/CreateEditPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index 38147527..61ed4879 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -22,7 +22,7 @@ const form = useForm({
 </script>
 
 <template>
-  <h3 class="w-full py-4 font-semibold text-xs text-gray-950 dark:text-gray-100 uppercase tracking-widest">Edit Page: {{ page.title }}</h3>
+  <h3 class="w-full p-4 font-semibold text-xs uppercase tracking-widest">Edit Page: {{ page.title }}</h3>
 
   <AppForm
     class="w-full"

From 9e7550a978106713428f66b53193b36922970354 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:02:12 +0100
Subject: [PATCH 077/111] Update TabControls focus styling

---
 resources/js/Components/Controls/Tabs/TabControls.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Components/Controls/Tabs/TabControls.vue b/resources/js/Components/Controls/Tabs/TabControls.vue
index c9620fe0..02470a1d 100644
--- a/resources/js/Components/Controls/Tabs/TabControls.vue
+++ b/resources/js/Components/Controls/Tabs/TabControls.vue
@@ -27,7 +27,7 @@ onMounted(() => selectTab(0))
     <button
       v-for="(tab,index) in props.tabs"
       :key="index"
-      class="inline-flex space-x-2 border-t border-x rounded-t-lg px-6 py-3 bg-white dark:bg-gray-900 transition ease-in-out duration-150 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-900 dark:focus:ring-gray-100 focus:rounded-sm"
+      class="inline-flex space-x-2 border-t border-x rounded-t-lg px-6 py-3 bg-white dark:bg-gray-900 transition ease-in-out duration-150 focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-900 dark:focus:ring-gray-100 focus:rounded-md"
       :class="{ 'border-gray-900 dark:border-gray-100 font-semibold cursor-default': index === store.tabs[0].activeTab, 'border-gray-400 dark:border-gray-300 opacity-75 hover:opacity-100 cursor-pointer': index !== store.tabs[0].activeTab }"
       type="button"
       @click="selectTab(index)"

From 499d9644a51b673c2b749843563c0e678d6c7228 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:03:06 +0100
Subject: [PATCH 078/111] Move InputError min height class to FormInput

---
 resources/js/Components/Forms/FormInput.vue         | 3 ++-
 resources/js/Components/Forms/Inputs/InputError.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/js/Components/Forms/FormInput.vue b/resources/js/Components/Forms/FormInput.vue
index e4b0c543..906dc783 100644
--- a/resources/js/Components/Forms/FormInput.vue
+++ b/resources/js/Components/Forms/FormInput.vue
@@ -7,7 +7,7 @@ import { computed } from 'vue'
 const props = defineProps({
   inputErrorClasses: {
     type: String,
-    default: 'w-full',
+    default: 'w-full min-h-6',
   },
   inputField: {
     type: String,
@@ -39,6 +39,7 @@ const labelPositionClasses = computed(() => {
   return {
     top: 'w-full text-gray-700 dark:text-gray-300',
     left: 'my-3 w-full md:w-1/3 text-gray-700 dark:text-gray-300',
+    hidden: 'sr-only',
   }[props.inputLabelPosition]
 })
 
diff --git a/resources/js/Components/Forms/Inputs/InputError.vue b/resources/js/Components/Forms/Inputs/InputError.vue
index 0c80e709..e4752536 100644
--- a/resources/js/Components/Forms/Inputs/InputError.vue
+++ b/resources/js/Components/Forms/Inputs/InputError.vue
@@ -7,7 +7,7 @@ defineProps({
 </script>
 
 <template>
-  <div class="min-h-6">
+  <div>
     <p v-show="message" class="text-sm text-red-600">
       ✗ {{ message }}
     </p>

From 943a8a3e64357db5688aabb5c30183e2b274613f Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:03:56 +0100
Subject: [PATCH 079/111] Add set height for buttons to app-button-base CSS
 rules

---
 resources/css/components/buttons.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/css/components/buttons.css b/resources/css/components/buttons.css
index 594b9a0c..734be84f 100644
--- a/resources/css/components/buttons.css
+++ b/resources/css/components/buttons.css
@@ -3,6 +3,7 @@
     inline-flex
     items-center
     justify-center
+    h-8
     my-auto
     border
     px-4

From e79332a79d6fda11dd8647f39b5cd009e3c72add Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 14 Jul 2024 19:05:05 +0100
Subject: [PATCH 080/111] Add logic for InputBlocks sr-only labels

---
 resources/js/Components/Forms/Inputs/InputBlocks.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Components/Forms/Inputs/InputBlocks.vue b/resources/js/Components/Forms/Inputs/InputBlocks.vue
index 242a7deb..34ed7225 100644
--- a/resources/js/Components/Forms/Inputs/InputBlocks.vue
+++ b/resources/js/Components/Forms/Inputs/InputBlocks.vue
@@ -38,7 +38,7 @@ const props = defineProps({
       :key="inputIndex"
     >
       <InputLabel
-        class="block w-full font-medium text-sm mb-2"
+        :class="input.type === 'wysiwyg' ? 'sr-only' : 'block w-full font-medium text-sm mb-2'"
         :value="input.label"
       />
 

From 6c72187655eed6ad6620c6d560cfc35eb4ec29b0 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 19:20:37 +0100
Subject: [PATCH 081/111] Create add_webpage_status_id_to_pages migration

---
 ..._000001_add_webpage_status_id_to_pages.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php

diff --git a/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php b/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php
new file mode 100644
index 00000000..581f15c4
--- /dev/null
+++ b/database/migrations/2024_07_16_000001_add_webpage_status_id_to_pages.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /** Run the migrations. */
+    public function up(): void
+    {
+        if (!Schema::hasColumn('pages', 'webpage_status_id')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->integer('webpage_status_id')->nullable()->after('id');
+            });
+        }
+    }
+
+    /** Reverse the migrations. */
+    public function down(): void
+    {
+        if (Schema::hasColumn('pages', 'webpage_status_id')) {
+            Schema::table('pages', function (Blueprint $table) {
+                $table->dropColumn('webpage_status_id');
+            });
+        }
+    }
+};

From 1c3b80e07f4e813ca28ab2aebbc8f9563109dba9 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 00:17:22 +0100
Subject: [PATCH 082/111] Add webpage_status_id Page model fillable fields

---
 app/Models/Page.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/Page.php b/app/Models/Page.php
index 77f3918f..ba6d3cbb 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -28,6 +28,7 @@ final class Page extends Model
      * @var array<int, string>
      */
     protected $fillable = [
+        'webpage_status_id',
         'slug',
         'title',
         'meta_description',

From 572ee925bed6e8864ae4a3db32e391327d630199 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Sun, 16 Jun 2024 22:58:09 +0100
Subject: [PATCH 083/111] Create WebpageStatus enum

---
 app/Enums/Webpages/WebpageStatus.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/Enums/Webpages/WebpageStatus.php

diff --git a/app/Enums/Webpages/WebpageStatus.php b/app/Enums/Webpages/WebpageStatus.php
new file mode 100644
index 00000000..74886896
--- /dev/null
+++ b/app/Enums/Webpages/WebpageStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Enums\Webpages;
+
+enum WebpageStatus: int
+{
+    /* List of the webpage statuses available to the application. */
+    case DRAFT = 1;
+    case PUBLISHED = 2;
+
+    /** Get the status's label. */
+    public function label(): string
+    {
+        return match ($this) {
+            self::DRAFT => 'Draft',
+            self::PUBLISHED => 'Published',
+        };
+    }
+}

From 44d26f4e82e170708b691b28ca5c0f01219d433c Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 13:35:37 +0100
Subject: [PATCH 084/111] Add published scope to HasPageView trait

---
 app/Traits/HasPageView.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/Traits/HasPageView.php b/app/Traits/HasPageView.php
index 60bbe98e..e8ae8d41 100644
--- a/app/Traits/HasPageView.php
+++ b/app/Traits/HasPageView.php
@@ -2,11 +2,13 @@
 
 namespace App\Traits;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 
 /**
+ * @method Builder|static published()
  * @method Builder|static inSitemap()
  * @method static Builder|static query()
  */
@@ -51,4 +53,12 @@ public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilde
             $query->where('in_sitemap', 1);
         });
     }
+
+    /** Returns all models that are Published (webpage_status_id = 2). */
+    public function scopePublished(Builder|QueryBuilder $query): Builder|QueryBuilder
+    {
+        return $query->where(function ($query) {
+            $query->where('webpage_status_id', WebpageStatus::PUBLISHED->value);
+        });
+    }
 }

From fb9bea94fb47dd9ef83d8049fa36d75067029290 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 23:32:31 +0100
Subject: [PATCH 085/111] Add isPublished method to HasPageView trait

---
 app/Traits/HasPageView.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Traits/HasPageView.php b/app/Traits/HasPageView.php
index e8ae8d41..63fec443 100644
--- a/app/Traits/HasPageView.php
+++ b/app/Traits/HasPageView.php
@@ -46,6 +46,12 @@ public function isInSitemap(): bool
         return $this->in_sitemap ?? false;
     }
 
+    /** Returns true if the item is marked as published. */
+    public function isPublished(): bool
+    {
+        return $this->webpage_status_id === WebpageStatus::PUBLISHED->value;
+    }
+
     /** Returns all models that should be in the sitemap (in_sitemap = 1). */
     public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilder
     {

From 9a1c53132162349662f3208106a1577c18b291b7 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 13:39:46 +0100
Subject: [PATCH 086/111] Add webpage_status_id field to PageFactory definition

---
 database/factories/PageFactory.php                | 4 +++-
 tests/Unit/Database/Factories/PageFactoryTest.php | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index 93f95912..5af093ef 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -3,6 +3,7 @@
 namespace Database\Factories;
 
 use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Traits\FakesDatabaseValues;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -17,13 +18,14 @@ final class PageFactory extends Factory
     /**
      * Define the model's default state.
      *
-     * @return array<string, bool|string|null>
+     * @return array<string, bool|int|string|null>
      */
     public function definition(): array
     {
         $title = $this->getFakeString();
 
         return [
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
             'slug' => urlencode(str_replace(' ', '-', $title)),
             'title' => ucwords($title),
             'meta_description' => null,
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index 48b71813..fc1b6355 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Models\Page;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -12,6 +13,7 @@
     ->slug->toBeString()
     ->meta_description->toBeNull()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
@@ -19,6 +21,7 @@
     ->expect(fn () => Page::factory()->aboutPage()->make(['title' => 'Test Title']))
     ->title->toEqual('Test Title')
     ->slug->toEqual('about')
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
     ->in_sitemap->toBeTrue()
@@ -30,6 +33,7 @@
     ->slug->toBeString()
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
@@ -39,6 +43,7 @@
     ->slug->toEqual('home')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeFalse()
     ->is_homepage->toBeTrue();
 
@@ -48,5 +53,6 @@
     ->slug->toEqual('privacy')
     ->meta_description->toBeString()
     ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::PUBLISHED->value)
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();

From 5015ed1dbf2e290602893dd4ee77c6609b6769fd Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 01:59:41 +0100
Subject: [PATCH 087/111] Add draft method to PageFactory

---
 database/factories/PageFactory.php                |  9 +++++++++
 tests/Unit/Database/Factories/PageFactoryTest.php | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
index 5af093ef..5304dc0e 100644
--- a/database/factories/PageFactory.php
+++ b/database/factories/PageFactory.php
@@ -48,6 +48,15 @@ public function aboutPage(): static
         ]));
     }
 
+    /** Indicate that the model should have draft webpage status. */
+    public function draft(): static
+    {
+        return $this->state(fn (array $attributes) => array_merge([
+            ...$attributes,
+            'webpage_status_id' => WebpageStatus::DRAFT->value,
+        ]));
+    }
+
     /** Indicate that the model should use faked data with all fields filled. */
     public function dummy(): static
     {
diff --git a/tests/Unit/Database/Factories/PageFactoryTest.php b/tests/Unit/Database/Factories/PageFactoryTest.php
index fc1b6355..65dc59db 100644
--- a/tests/Unit/Database/Factories/PageFactoryTest.php
+++ b/tests/Unit/Database/Factories/PageFactoryTest.php
@@ -27,6 +27,16 @@
     ->in_sitemap->toBeTrue()
     ->is_homepage->toBeFalse();
 
+it('makes draft page models')
+    ->expect(fn () => Page::factory()->draft()->make())
+    ->title->tobeString()
+    ->slug->toBeString()
+    ->meta_description->toBeNull()
+    ->template->toEqual(WebpageTemplate::PUBLIC_CONTENT->value)
+    ->webpage_status_id->toEqual(WebpageStatus::DRAFT->value)
+    ->in_sitemap->toBeTrue()
+    ->is_homepage->toBeFalse();
+
 it('makes dummy page models')
     ->expect(fn () => Page::factory()->dummy()->make())
     ->title->tobeString()

From 56fa8272b02398dc590653f33bce2b2e82397d30 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 00:22:18 +0100
Subject: [PATCH 088/111] Add draft page cases to Pages & PageGhosts datasets

---
 tests/Datasets/PageGhosts.php | 1 +
 tests/Datasets/Pages.php      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/Datasets/PageGhosts.php b/tests/Datasets/PageGhosts.php
index 9ec45969..1db1e3ed 100644
--- a/tests/Datasets/PageGhosts.php
+++ b/tests/Datasets/PageGhosts.php
@@ -7,6 +7,7 @@
         'new model' => [fn () => new Page],
         'page ghost min record' => [fn () => Page::factory()->make()],
         'page ghost max random record' => [fn () => Page::factory()->dummy()->make()],
+        'page ghost draft' => [fn () => Page::factory()->draft()->make()],
         'homepage ghost' => [fn () => Page::factory()->dummy()->homePage()->make()],
         'privacy page ghost' => [fn () => Page::factory()->dummy()->privacyPage()->make()],
     ];
diff --git a/tests/Datasets/Pages.php b/tests/Datasets/Pages.php
index 1b5afa6d..8135029e 100644
--- a/tests/Datasets/Pages.php
+++ b/tests/Datasets/Pages.php
@@ -30,6 +30,7 @@
     return [
         'page min record' => [fn () => Page::factory()->create()],
         'page max random record' => [fn () => Page::factory()->dummy()->create()],
+        'page draft' => [fn () => Page::factory()->draft()->create()],
         'homepage' => [fn () => Page::factory()->homePage()->create()],
         'about page' => [fn () => Page::factory()->aboutPage()->create()],
         'privacy page' => [fn () => Page::factory()->privacyPage()->create()],

From 36abff6d828efe271a21f51334174f4c5971b6fe Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 23:34:32 +0100
Subject: [PATCH 089/111] Add WebpageStatus logic to HomepageContentResource

---
 .../Resources/Views/Public/Content/HomepageContentResource.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
index f720e8aa..9cc5e933 100644
--- a/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/HomepageContentResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources\Views\Public\Content;
 
 use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Interfaces\Resources\Items\ConstantItemInterface;
 use App\Models\Block;
@@ -17,6 +18,7 @@ public function __construct(
         if (!$this->page->id) {
             $this->page = Page::query()
                 ->isHomepage()
+                ->published()
                 ->with('blocks')
                 ->first()
                 ?? new Page;
@@ -52,6 +54,7 @@ public function getTemplate(): ?WebpageTemplate
     public function setDefaultModel(): void
     {
         $this->page = new Page([
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
             'template' => WebpageTemplate::PUBLIC_CONTENT->value,
             'slug' => 'home',
             'title' => config('app.name'),

From e6e57f96cd00fa4db32c03f49c0f184f23160979 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 14:30:34 +0100
Subject: [PATCH 090/111] Add WebpageStatus logic to
 PrivacyPolicyContentResource

---
 .../Views/Public/Content/PrivacyPolicyContentResource.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
index 9b509794..5309472d 100644
--- a/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
+++ b/app/Http/Resources/Views/Public/Content/PrivacyPolicyContentResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources\Views\Public\Content;
 
 use App\Enums\Blocks\BlockType;
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
 use App\Interfaces\Resources\Items\ConstantItemInterface;
@@ -17,6 +18,7 @@ public function __construct(
     ) {
         if (!$this->page->id) {
             $this->page = Page::query()
+                ->published()
                 ->where('slug', 'privacy')
                 ->with('blocks')
                 ->first()
@@ -63,6 +65,7 @@ public function getTemplate(): ?WebpageTemplate
     public function setDefaultModel(): void
     {
         $this->page = new Page([
+            'webpage_status_id' => WebpageStatus::PUBLISHED->value,
             'template' => WebpageTemplate::PUBLIC_CONTENT->value,
             'slug' => 'privacy',
             'title' => 'Privacy Policy',

From dc51fe40d862dc8b9d7fe751038491064a912875 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 01:33:02 +0100
Subject: [PATCH 091/111] Add webpage status logic to public PageController

---
 app/Http/Controllers/Public/PageController.php         |  7 ++++---
 .../Http/Controllers/Public/PageControllerTest.php     | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Public/PageController.php b/app/Http/Controllers/Public/PageController.php
index bb6e0e39..7184aea7 100644
--- a/app/Http/Controllers/Public/PageController.php
+++ b/app/Http/Controllers/Public/PageController.php
@@ -27,9 +27,10 @@ public function show(Page $page): RedirectResponse|Response
             return to_route('home');
         }
 
-        $template = WebpageTemplate::tryFrom($page?->template ?? '');
-
-        if (!$template) {
+        if (
+            !$page->isPublished()
+            || !$template = WebpageTemplate::tryFrom($page?->template ?? '')
+        ) {
             abort(404);
         }
 
diff --git a/tests/Feature/Http/Controllers/Public/PageControllerTest.php b/tests/Feature/Http/Controllers/Public/PageControllerTest.php
index 30e48e0c..f33b9f5c 100644
--- a/tests/Feature/Http/Controllers/Public/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Public/PageControllerTest.php
@@ -16,7 +16,15 @@
     $actual = $this->get($route);
     $session = session()->all();
     $headers = $actual->headers->all();
-    $status = $page->is_homepage ? 302 : 200;
+    $status = 200;
+
+    if (!$page->isPublished()) {
+        $status = 404;
+    }
+
+    if ($page->is_homepage) {
+        $status = 302;
+    }
 
     $actual
         ->assertStatus($status)

From c9c6a572f6d03037f512139189aa732be9f603ee Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 01:43:49 +0100
Subject: [PATCH 092/111] Add webpageStatusId to CreateEditPageResource getItem
 return value

---
 .../Resources/Views/Admin/Pages/CreateEditPageResource.php    | 3 +++
 .../Views/Admin/Pages/CreateEditPageResourceTest.php          | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
index 550d8122..760fd458 100644
--- a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
+++ b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources\Views\Admin\Pages;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Http\Resources\Views\Admin\Blocks\AdminBlocksResource;
 use App\Interfaces\Resources\Items\PageItemInterface;
 use App\Models\Page;
@@ -22,6 +23,7 @@ final class CreateEditPageResource implements PageItemInterface
      *  title: string,
      *  metaDescription: string,
      *  inSitemap: bool,
+     *  webpageStatusId: int,
      * }
      */
     public function getItem(Page $page): array
@@ -32,6 +34,7 @@ public function getItem(Page $page): array
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'webpageStatusId' => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value ?? WebpageStatus::DRAFT->value,
         ];
     }
 }
diff --git a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
index 37d15511..1fe3aa5d 100644
--- a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
@@ -17,12 +17,14 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
+        ->toHaveCount(6)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'webpageStatusId' => $page->isPublished() ? 2 : 1,
         ]);
 })->with('pages');
 
@@ -31,11 +33,13 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
+        ->toHaveCount(6)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'webpageStatusId' => $page->isPublished() ? 2 : 1,
         ]);
 })->with('page-ghosts');

From 5f964455fed19dc395dbe532302b79b8bd3a11a6 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 01:46:29 +0100
Subject: [PATCH 093/111] Add webpage_status_id assertions to
 PageAdminServiceTest

---
 tests/Unit/App/Services/Admin/PageAdminServiceTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
index da1d23be..e9eaa68d 100644
--- a/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
+++ b/tests/Unit/App/Services/Admin/PageAdminServiceTest.php
@@ -26,6 +26,7 @@
         ->title->toEqual($data['title'])
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
+        ->webpage_status_id->toEqual($page_original->webpage_status_id)
         ->template->toEqual($page_original->template)
         ->blocks->toEqual($page_original->blocks);
 })->with('pages');
@@ -45,6 +46,7 @@
     }
 
     $data = [
+        'webpageStatusId' => $page->webpage_status_id === 1 ? 2 : 1,
         'title' => 'New Title',
         'metaDescription' => 'New Meta-Description',
         'inSitemap' => !$page->in_sitemap,
@@ -62,6 +64,7 @@
         ->title->toEqual($data['title'])
         ->meta_description->toEqual($data['metaDescription'])
         ->in_sitemap->toEqual($data['inSitemap'])
+        ->webpage_status_id->toEqual($data['webpageStatusId'])
         ->template->toEqual($page_original->template);
 })->with('pages');
 
@@ -88,6 +91,7 @@
         ->title->toEqual($data['title'])
         ->meta_description->toEqual($page_original->meta_description)
         ->in_sitemap->toEqual($page_original->in_sitemap)
+        ->webpage_status_id->toEqual($page_original->webpage_status_id)
         ->template->toEqual($page_original->template)
         ->blocks->toEqual($page_original->blocks);
 });

From 7454cdb67c0b731d42ea3df5d003e043ee6197cd Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 01:20:16 +0100
Subject: [PATCH 094/111] Add rules for webpageStatusId to PageUpdateRequest

---
 app/Http/Requests/Admin/PageUpdateRequest.php                | 2 ++
 tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/Http/Requests/Admin/PageUpdateRequest.php b/app/Http/Requests/Admin/PageUpdateRequest.php
index 45adc45f..9d1dbc55 100644
--- a/app/Http/Requests/Admin/PageUpdateRequest.php
+++ b/app/Http/Requests/Admin/PageUpdateRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Admin;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Interfaces\Requests\RequestInterface;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -18,6 +19,7 @@ public function rules(): array
             'blocks' => ['nullable', 'max:5120'],
             'title' => ['required', 'string', 'max:255'],
             'metaDescription' => ['nullable', 'string', 'max:255'],
+            'webpageStatusId' => ['required', 'integer', 'max:' . WebpageStatus::PUBLISHED->value],
             'inSitemap' => ['required', 'boolean'],
         ];
     }
diff --git a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
index 4924d6fd..af55ba8c 100644
--- a/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
+++ b/tests/Unit/App/Http/Requests/Admin/PageUpdateRequestTest.php
@@ -35,5 +35,10 @@
             'required',
             'boolean',
         ],
+        'webpageStatusId' => [
+            'required',
+            'integer',
+            'max:2',
+        ],
     ], $actual);
 });

From 62ad9102b6d2107506317496a54bd7a50bf9f175 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Thu, 11 Jul 2024 23:41:59 +0100
Subject: [PATCH 095/111] Add cases for webpage_status_id to
 PageArraysUpdateInvalid dataset

---
 tests/Datasets/PageArraysUpdateInvalid.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/Datasets/PageArraysUpdateInvalid.php b/tests/Datasets/PageArraysUpdateInvalid.php
index f3550a85..7fd023fc 100644
--- a/tests/Datasets/PageArraysUpdateInvalid.php
+++ b/tests/Datasets/PageArraysUpdateInvalid.php
@@ -2,6 +2,7 @@
 
 $standard_array = [
     'title' => 'Title',
+    'webpageStatusId' => 1,
     'inSitemap' => true,
 ];
 
@@ -11,11 +12,12 @@
             [],
             [
                 'title' => 'The title field is required.',
+                'webpageStatusId' => 'The webpage status id field is required.',
                 'inSitemap' => 'The in sitemap field is required.',
             ],
         ],
         'title missing' => [
-            ['inSitemap' => true],
+            ['webpageStatusId' => 1, 'inSitemap' => true],
             ['title' => 'The title field is required.'],
         ],
         'title empty' => [
@@ -38,8 +40,24 @@
             array_merge($standard_array, ['metaDescription' => str_pad('', 256, 'a')]),
             ['metaDescription' => 'The meta description field must not be greater than 255 characters.'],
         ],
+        'webpageStatusId missing' => [
+            ['title' => 'Title', 'inSitemap' => true],
+            ['webpageStatusId' => 'The webpage status id field is required.'],
+        ],
+        'webpageStatusId empty' => [
+            array_merge($standard_array, ['webpageStatusId' => '']),
+            ['webpageStatusId' => 'The webpage status id field is required.'],
+        ],
+        'webpageStatusId not integer' => [
+            array_merge($standard_array, ['webpageStatusId' => 'a']),
+            ['webpageStatusId' => 'The webpage status id field must be an integer.'],
+        ],
+        'webpageStatusId > max WebpageStatus' => [
+            array_merge($standard_array, ['webpageStatusId' => 42]),
+            ['webpageStatusId' => 'The webpage status id field must not be greater than 2.'],
+        ],
         'inSitemap missing' => [
-            ['title' => 'Title'],
+            ['title' => 'Title', 'webpageStatusId' => 1],
             ['inSitemap' => 'The in sitemap field is required.'],
         ],
         'inSitemap empty' => [

From 3c064ef876fe1297b0ed5f9acdf88c0f2b4833ad Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 00:29:01 +0100
Subject: [PATCH 096/111] Add webpage_status_id field to PageSeeder

---
 database/seeders/PageSeeder.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/database/seeders/PageSeeder.php b/database/seeders/PageSeeder.php
index 06d91b06..77d28826 100644
--- a/database/seeders/PageSeeder.php
+++ b/database/seeders/PageSeeder.php
@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Enums\Webpages\WebpageTemplate;
 use App\Models\Block;
 use App\Models\Page;
@@ -27,6 +28,7 @@ public function run(): void
         if ($seeds !== [0]) {
             foreach ($seeds as $seed) {
                 $page = Page::factory()->create([
+                    'webpage_status_id' => $seed['webpage_status_id'] ?? WebpageStatus::PUBLISHED->value,
                     'slug' => $seed['slug'] ?? null,
                     'title' => $seed['title'] ?? null,
                     'in_sitemap' => $seed['in_sitemap'] ?? 1,

From 5deeba8bb7f67dc28315d5066cec7786c789e2f5 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Fri, 12 Jul 2024 02:01:56 +0100
Subject: [PATCH 097/111] Add webpage_status_id assertions to admin
 PageControllerTest

---
 tests/Feature/Http/Controllers/Admin/PageControllerTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
index 751677b4..a1653dc6 100644
--- a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
@@ -71,6 +71,7 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => $page->getTitle() . ' - UPDATED',
+        'webpageStatusId' => $page->webpage_status_id,
         'inSitemap' => (bool) $page->in_sitemap,
     ];
 
@@ -88,6 +89,7 @@
 
     expect($page->title)->toEqual($data['title']);
     expect($page->meta_description)->toEqual($page_original->meta_description);
+    expect($page->webpage_status_id)->toEqual($page_original->webpage_status_id);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
 })->with('pages');
@@ -99,6 +101,7 @@
     $data = [
         'title' => 'New Title',
         'metaDescription' => 'New Meta-Description',
+        'webpageStatusId' => $page->webpage_status_id !== 1 ? 1 : 2,
         'inSitemap' => !$page->in_sitemap,
     ];
 
@@ -116,6 +119,7 @@
 
     expect($page->title)->toEqual($data['title']);
     expect($page->meta_description)->toEqual($data['metaDescription']);
+    expect($page->webpage_status_id)->toEqual($data['webpageStatusId']);
     expect($page->in_sitemap)->toEqual($data['inSitemap']);
     expect($page->blocks)->toEqual($page_original->blocks);
 })->with('pages');
@@ -127,6 +131,7 @@
     $user = User::factory()->isAdmin()->create();
     $data = [
         'title' => $page->getTitle() . ' - UPDATED',
+        'webpageStatusId' => $page->webpage_status_id,
         'inSitemap' => (bool) $page->in_sitemap,
         'unknownField' => 'invalid value',
     ];
@@ -147,6 +152,7 @@
     expect($page->unknown_field)->toBeNull();
     expect($page->title)->toEqual($data['title']);
     expect($page->meta_description)->toEqual($page_original->meta_description);
+    expect($page->webpage_status_id)->toEqual($page_original->webpage_status_id);
     expect($page->in_sitemap)->toEqual($page_original->in_sitemap);
     expect($page->blocks)->toEqual($page_original->blocks);
 });

From c4794e25b1422c3bd23cd266d3ab1df6b49aa4f0 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 02:08:14 +0100
Subject: [PATCH 098/111] Add InputSelect for webpageStatusId to CreateEditPage
 component

---
 .../Pages/Admin/Partials/CreateEditPage.vue   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index 61ed4879..cf6549df 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -3,6 +3,7 @@ import AppForm from '@/Components/Forms/AppForm.vue'
 import FormInput from '@/Components/Forms/FormInput.vue'
 import InputBlocks from '@/Components/Forms/Inputs/InputBlocks.vue'
 import InputCheckbox from '@/Components/Forms/Inputs/InputCheckbox.vue'
+import InputSelect from '@/Components/Forms/Inputs/InputSelect.vue'
 import InputText from '@/Components/Forms/Inputs/InputText.vue'
 import AppSectionDivider from '@/Components/Sections/AppSectionDivider.vue'
 import TabBody from '@/Components/Controls/Tabs/TabBody.vue'
@@ -17,6 +18,7 @@ const form = useForm({
   inSitemap: page.inSitemap,
   metaDescription: page.metaDescription,
   title: page.title,
+  webpageStatusId: page.webpageStatusId,
 })
 
 </script>
@@ -94,6 +96,28 @@ const form = useForm({
         </FormInput>
       </div>
 
+      <div class="w-full flex pt-2 px-4">
+        <FormInput
+          input-label="Webpage Status"
+          input-label-position="left"
+          input-field="webpageStatusId"
+          :parent-form="form"
+        >
+          <InputSelect
+            id="input-webpage-status-id"
+            name="webpageStatusId"
+            class="block w-full"
+            v-model="form.webpageStatusId"
+            :class="{ 'opacity-25': form.processing }"
+            :disabled="form.processing"
+            :options="{
+              0: { label: 'Draft', value: 1 },
+              1: { label: 'Published', value: 2 },
+            }"
+          />
+        </FormInput>
+      </div>
+
       <div class="w-full flex pt-2 px-4">
         <label class="flex items-start text-sm">
           <InputCheckbox class="my-auto" name="inSitemap" v-model:checked="form.inSitemap" />

From fb567079672e6bba11c37a7399b86202275b3213 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 02:13:00 +0100
Subject: [PATCH 099/111] Add show method to admin PageController with feature
 tests

---
 app/Http/Controllers/Admin/PageController.php | 21 +++++++++
 .../Controllers/Admin/PageControllerTest.php  | 45 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
index b846b7b3..2f0952fd 100644
--- a/app/Http/Controllers/Admin/PageController.php
+++ b/app/Http/Controllers/Admin/PageController.php
@@ -6,9 +6,11 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PageUpdateRequest;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
+use App\Http\Resources\Views\Public\Content\PageContentResource;
 use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
 use App\Models\Page;
 use App\Repositories\Views\AdminViewRepository;
+use App\Repositories\Views\PublicViewRepository;
 use App\Services\Admin\PageAdminService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
@@ -16,6 +18,25 @@
 
 final class PageController extends Controller
 {
+    /**
+     * Display the given page's preview.
+     *
+     * @throws HttpException
+     */
+    public function show(Page $page): RedirectResponse|Response
+    {
+        if (!$page->template) {
+            abort(404);
+        }
+
+        return (new PublicViewRepository)
+            ->getViewDetails(
+                $page->template,
+                (new PageContentResource($page))->getItem(),
+                (new PageMetadataResource)->getItem($page)
+            );
+    }
+
     /**
      * Display the edit view for the given page.
      *
diff --git a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
index a1653dc6..a1b5e62b 100644
--- a/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
+++ b/tests/Feature/Http/Controllers/Admin/PageControllerTest.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\Admin\PageUpdateRequest;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
 use App\Http\Resources\Views\DetailsViewResource;
+use App\Http\Resources\Views\Public\Content\PageContentResource;
 use App\Http\Resources\Views\Public\Metadata\PageMetadataResource;
 use App\Models\Page;
 use App\Models\User;
@@ -14,6 +15,50 @@
     ->expect(PageController::class)
     ->toExtend(Controller::class);
 
+test('show renders the page preview view', function (Page $page) {
+    $route = route('admin.page.show', [$page]);
+    $user = User::factory()->isAdmin()->create();
+    $actual = $this->actingAs($user)->get($route);
+    $session = session()->all();
+    $headers = $actual->headers->all();
+
+    $actual
+        ->assertStatus(200)
+        ->assertSessionHasNoErrors()
+        ->assertViewIs('app');
+
+    expect($session)->toHaveCorrectSessionValues($route);
+
+    expect($headers)->toHaveCorrectHeaderValues();
+
+    $data = (new DetailsViewResource)->getItem(
+        (new PageContentResource($page))->getItem(),
+        (new PageMetadataResource)->getItem($page)
+    );
+
+    expect($actual)
+        ->toHaveCorrectHtmlHead($page->template)
+        ->toHaveCorrectHtmlBody()
+        ->toHaveCorrectPropsDetails(
+            $page->template,
+            $data['content'],
+            $data['metadata']
+        );
+})->with('pages');
+
+test('show renders the 404 view for unknown pages', function () {
+    $url = url('admin/pages/101/preview');
+    $user = User::factory()->isAdmin()->create();
+    $actual = $this->actingAs($user)->get($url);
+    $session = session()->all();
+
+    $actual
+        ->assertStatus(404)
+        ->assertSessionHasNoErrors();
+
+    expect($session)->toHaveCorrectSessionValues($url);
+});
+
 test('edit renders the page create/edit view', function (Page $page) {
     $route = route('admin.page.edit', [$page]);
     $user = User::factory()->isAdmin()->create();

From 94817b8ac83de210b7e7e6ee0d14dddf5ad26918 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:25:00 +0100
Subject: [PATCH 100/111] Add route for admin PageController show method

---
 routes/web/admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web/admin.php b/routes/web/admin.php
index 31e1ff5f..d2e876d1 100644
--- a/routes/web/admin.php
+++ b/routes/web/admin.php
@@ -16,6 +16,7 @@
 Route::prefix('admin')->middleware(['auth', 'verified', 'admin'])->name('admin.')->group(function () {
     /** PageController Routes */
     Route::controller(PageController::class)->group(function () {
+        Route::get('pages/{page}/preview', 'show')->name('page.show');
         Route::get('pages/{page}', 'edit')->name('page.edit');
         Route::patch('pages/{page}', 'update')->name('page.update');
     });

From 5f6882958f4fb12e9a56ddca41bc7bb34287a733 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:32:59 +0100
Subject: [PATCH 101/111] Add success event emit to AppForm

---
 resources/js/Components/Forms/AppForm.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/js/Components/Forms/AppForm.vue b/resources/js/Components/Forms/AppForm.vue
index f87a729f..708be49d 100644
--- a/resources/js/Components/Forms/AppForm.vue
+++ b/resources/js/Components/Forms/AppForm.vue
@@ -1,4 +1,6 @@
 <script setup>
+const emit = defineEmits(['success'])
+
 const props = defineProps({
   endpoint: {
     type: String,
@@ -18,10 +20,12 @@ const submit = () => {
   if (props.method === 'patch') {
     props.form.patch(props.endpoint, {
       preserveScroll: true,
+      onSuccess: () => emit('success'),
     })
   } else {
     props.form.post(props.endpoint, {
       preserveScroll: true,
+      onSuccess: () => emit('success'),
     })
   }
 }

From db1147aacd888f59f1202f076e0f4cd4968c45ea Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:34:04 +0100
Subject: [PATCH 102/111] Update LinkButton to use anchor tag so target _blank
 works

---
 resources/js/Components/Controls/Links/LinkButton.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/js/Components/Controls/Links/LinkButton.vue b/resources/js/Components/Controls/Links/LinkButton.vue
index 46d8b1f5..b072e84e 100644
--- a/resources/js/Components/Controls/Links/LinkButton.vue
+++ b/resources/js/Components/Controls/Links/LinkButton.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { Link } from '@inertiajs/vue3'
 import { computed } from 'vue'
 
 const props = defineProps({
@@ -29,11 +28,11 @@ const minWidthClass = computed(() => {
 </script>
 
 <template>
-  <Link
+  <a
     class="app-button-base"
     :class="[minWidthClass, customClasses]"
     :href="href"
   >
     <slot />
-  </Link>
+  </a>
 </template>

From 7dcee6b018f83b3c4b1e8bcd2b3ebf7478425864 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:34:53 +0100
Subject: [PATCH 103/111] Reload content prop on AdminCreateEdit page component
 reload

---
 resources/js/Pages/Admin/AdminCreateEdit.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/Pages/Admin/AdminCreateEdit.vue b/resources/js/Pages/Admin/AdminCreateEdit.vue
index b8ca30bf..def19dad 100644
--- a/resources/js/Pages/Admin/AdminCreateEdit.vue
+++ b/resources/js/Pages/Admin/AdminCreateEdit.vue
@@ -2,6 +2,9 @@
 import AppPanel from '@/Components/Sections/AppPanel.vue'
 import LayoutUser from '@/Layouts/LayoutUser.vue'
 import CreateEditPage from './Partials/CreateEditPage.vue'
+import { router } from '@inertiajs/vue3'
+
+router.reload({ only: ['content'] })
 
 const props = defineProps({
   content: {

From c53321417de44c8ff5771342ca0e2108ef0a48b9 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 02:40:43 +0100
Subject: [PATCH 104/111] Update CreateEditPageResource getItem webpageStatusId
 property to be lazy-loaded

---
 .../Resources/Views/Admin/Pages/CreateEditPageResource.php | 5 +++--
 .../Views/Admin/Pages/CreateEditPageResourceTest.php       | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
index 760fd458..cdbfc74d 100644
--- a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
+++ b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
@@ -23,7 +23,7 @@ final class CreateEditPageResource implements PageItemInterface
      *  title: string,
      *  metaDescription: string,
      *  inSitemap: bool,
-     *  webpageStatusId: int,
+     *  webpageStatusId: \Closure,
      * }
      */
     public function getItem(Page $page): array
@@ -34,7 +34,8 @@ public function getItem(Page $page): array
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
-            'webpageStatusId' => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value ?? WebpageStatus::DRAFT->value,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ];
     }
 }
diff --git a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
index 1fe3aa5d..7d6dc8e4 100644
--- a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\Webpages\WebpageStatus;
 use App\Http\Resources\Views\Admin\Blocks\AdminBlocksResource;
 use App\Http\Resources\Views\Admin\Pages\CreateEditPageResource;
 use App\Interfaces\Resources\Items\PageItemInterface;
@@ -24,7 +25,8 @@
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
-            'webpageStatusId' => $page->isPublished() ? 2 : 1,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ]);
 })->with('pages');
 
@@ -40,6 +42,7 @@
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
-            'webpageStatusId' => $page->isPublished() ? 2 : 1,
+            'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
+                ?? WebpageStatus::DRAFT->value,
         ]);
 })->with('page-ghosts');

From f59f0746e08bf501056d65d879eb1e1f24370ea5 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 02:44:00 +0100
Subject: [PATCH 105/111] Add slug to CreateEditPageResource getItem return
 value

---
 .../Resources/Views/Admin/Pages/CreateEditPageResource.php  | 2 ++
 .../Views/Admin/Pages/CreateEditPageResourceTest.php        | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
index cdbfc74d..43c066e5 100644
--- a/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
+++ b/app/Http/Resources/Views/Admin/Pages/CreateEditPageResource.php
@@ -23,6 +23,7 @@ final class CreateEditPageResource implements PageItemInterface
      *  title: string,
      *  metaDescription: string,
      *  inSitemap: bool,
+     *  slug: string|null,
      *  webpageStatusId: \Closure,
      * }
      */
@@ -34,6 +35,7 @@ public function getItem(Page $page): array
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
             'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
                 ?? WebpageStatus::DRAFT->value,
         ];
diff --git a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
index 7d6dc8e4..06a73422 100644
--- a/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
+++ b/tests/Unit/App/Http/Resources/Views/Admin/Pages/CreateEditPageResourceTest.php
@@ -18,13 +18,14 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(6)
+        ->toHaveCount(7)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
             'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
                 ?? WebpageStatus::DRAFT->value,
         ]);
@@ -35,13 +36,14 @@
 
     expect($actual)
         ->toHaveCamelCaseKeys()
-        ->toHaveCount(6)
+        ->toHaveCount(7)
         ->toMatchArray([
             'id' => $page->id,
             'blocks' => (new AdminBlocksResource($page->blocks, $page))->getItems(),
             'title' => $page->getTitle(),
             'metaDescription' => $page->getMetaDescription(),
             'inSitemap' => $page->isInSitemap(),
+            'slug' => $page->slug,
             'webpageStatusId' => fn () => WebpageStatus::tryFrom($page->webpage_status_id ?? 1)?->value
                 ?? WebpageStatus::DRAFT->value,
         ]);

From f0eb47fb4bf0df346ae165a320710f79d974fd38 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:37:46 +0100
Subject: [PATCH 106/111] Add view & preview buttons to CreateEditControls page
 partial component

---
 .../Admin/Partials/CreateEditControls.vue     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditControls.vue b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
index 896fa40c..b5773717 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditControls.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditControls.vue
@@ -3,6 +3,7 @@ import AppButton from '@/Components/Controls/Buttons/AppButton.vue'
 import InputError from '@/Components/Forms/Inputs/InputError.vue'
 import InputSuccess from '@/Components/Forms/Inputs/InputSuccess.vue'
 import LinkButton from '@/Components/Controls/Links/LinkButton.vue'
+import OutlineArrowTopRightOnSquare from '@/Components/Icons/HeroIcons/Outline/OutlineArrowTopRightOnSquare.vue'
 import OutlineArrowUturnLeft from '@/Components/Icons/HeroIcons/Outline/OutlineArrowUturnLeft.vue'
 import OutlinePaperAirplane from '@/Components/Icons/HeroIcons/Outline/OutlinePaperAirplane.vue'
 import { usePage } from '@inertiajs/vue3'
@@ -12,10 +13,22 @@ defineProps({
     type: Object,
     required: true,
   },
+  showPreviewButton: {
+    type: Boolean,
+    default: false,
+  },
+  urlPreview: {
+    type: String,
+    default: '',
+  },
   urlReturn: {
     type: String,
     default: '',
   },
+  urlView: {
+    type: String,
+    default: '',
+  },
 })
 </script>
 
@@ -48,6 +61,30 @@ defineProps({
         Cancel <OutlineArrowUturnLeft class="ml-2 h-4 w-4" />
       </LinkButton>
 
+      <LinkButton
+        v-show="urlPreview !== '' && showPreviewButton"
+        custom-classes="app-button-secondary-gray-100"
+        :href="previewUrl"
+        min-width="md"
+        title="Preview the draft page"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Preview <OutlineArrowTopRightOnSquare class="-mt-0.5 -mr-0.5 ml-2 h-4 w-4" />
+      </LinkButton>
+
+      <LinkButton
+        v-show="urlView !== '' && !showPreviewButton"
+        custom-classes="app-button-secondary-gray-100"
+        :href="viewUrl"
+        min-width="md"
+        title="View the page"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        View <OutlineArrowTopRightOnSquare class="-mt-0.5 -mr-0.5 ml-2 h-4 w-4" />
+      </LinkButton>
+
       <AppButton
         :class="{ 'opacity-25': parentForm.processing }"
         :disabled="parentForm.processing"

From 2fb8886863a66e300941d1f318573c8ab9a0f8c9 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 01:38:24 +0100
Subject: [PATCH 107/111] Add logic for view & preview buttons to
 CreateEditPage page partial component

---
 resources/js/Pages/Admin/Partials/CreateEditPage.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/js/Pages/Admin/Partials/CreateEditPage.vue b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
index cf6549df..3f73de7f 100644
--- a/resources/js/Pages/Admin/Partials/CreateEditPage.vue
+++ b/resources/js/Pages/Admin/Partials/CreateEditPage.vue
@@ -10,6 +10,7 @@ import TabBody from '@/Components/Controls/Tabs/TabBody.vue'
 import TabControls from '@/Components/Controls/Tabs/TabControls.vue'
 import CreateEditControls from '@/Pages/Admin/Partials/CreateEditControls.vue'
 import { useForm, usePage } from '@inertiajs/vue3'
+import { reactive } from 'vue'
 
 const page = usePage().props.content
 
@@ -21,6 +22,10 @@ const form = useForm({
   webpageStatusId: page.webpageStatusId,
 })
 
+const state = reactive({
+  showPreviewButton: page.webpageStatusId === 1,
+})
+
 </script>
 
 <template>
@@ -31,6 +36,7 @@ const form = useForm({
     method="patch"
     :endpoint="route('admin.page.edit', page.id)"
     :form="form"
+    @success="state.showPreviewButton = form.webpageStatusId === 1"
   >
     <TabControls
       class="pt-4 px-4"
@@ -129,7 +135,10 @@ const form = useForm({
 
     <CreateEditControls
       :parent-form="form"
+      :show-preview-button="state.showPreviewButton"
+      :url-preview-url="route('admin.page.show', page.id)"
       :url-return="route('dashboard')"
+      :url-view="route('page.show', page.slug)"
     />
   </AppForm>
 </template>

From 2d26819d71f22258dab0ce0d0e58b5966545df2c Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 20:19:24 +0100
Subject: [PATCH 108/111] Update PageAdminTest to handle create/edit view tabs

---
 tests/Browser/TestContent/Admin/PageAdminTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Browser/TestContent/Admin/PageAdminTest.php b/tests/Browser/TestContent/Admin/PageAdminTest.php
index c149de0b..532d67d8 100644
--- a/tests/Browser/TestContent/Admin/PageAdminTest.php
+++ b/tests/Browser/TestContent/Admin/PageAdminTest.php
@@ -40,7 +40,9 @@ public function testAdminPageEdit(): void
             ->loginAs($user)
 
             ->visit(new AdminEditPage($page))
-            ->screenshotWholePage('admin-pages-edit-blank')
+            ->screenshotWholePage('admin-pages-edit-content-blank')
+            ->press('META DATA')
+            ->screenshotWholePage('admin-pages-edit-metadata-blank')
             ->completeForm('form', $expected_array)
             ->screenshotWholePage('admin-pages-edit-filled')
             ->submitForm('form')

From 92820f5529b7436a05d21fff1c614a629cde2ce6 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 20:19:53 +0100
Subject: [PATCH 109/111] Remove incorrect assertion

---
 tests/Browser/TestContent/Guest/PrivacyPageTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Browser/TestContent/Guest/PrivacyPageTest.php b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
index 3d79038d..0056716b 100644
--- a/tests/Browser/TestContent/Guest/PrivacyPageTest.php
+++ b/tests/Browser/TestContent/Guest/PrivacyPageTest.php
@@ -34,7 +34,6 @@ public function testPrivacyPageContentWithPageModel(): void
 
         $this->browse(fn (Browser $browser) => $browser
             ->visit(new PageView($page))
-            ->assertSee(strtoupper($page->getTitle()))
         );
     }
 }

From abeb0af068e68ff3577d0b706fe94f56a4619364 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 19:44:08 +0100
Subject: [PATCH 110/111] Bump Composer dependencies

---
 composer.json |  2 +-
 composer.lock | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index f9a760e3..eda9bef2 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": "8.2.*||8.3.*",
         "guzzlehttp/guzzle": "^7.8.1",
         "inertiajs/inertia-laravel": "^1.3",
-        "laravel/framework": "^11.15",
+        "laravel/framework": "^11.16",
         "laravel/tinker": "^2.9.0",
         "tightenco/ziggy": "^1.8.2"
     },
diff --git a/composer.lock b/composer.lock
index edc48890..16ce58dc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "49f7ea1856eb411443953713f6d87d27",
+    "content-hash": "4259c6564f1c84080d1f8e1bc3bf8853",
     "packages": [
         {
             "name": "brick/math",
@@ -1128,16 +1128,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.15.0",
+            "version": "v11.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
                 "shasum": ""
             },
             "require": {
@@ -1330,7 +1330,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-09T15:38:12+00:00"
+            "time": "2024-07-16T14:33:07+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -6863,16 +6863,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v2.34.8",
+            "version": "v2.34.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57"
+                "reference": "ef120125e036bf84c9e46a9e62219702f5b92e16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/e8f122bf47585c06431e0056189ec6bfd6f41f57",
-                "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/ef120125e036bf84c9e46a9e62219702f5b92e16",
+                "reference": "ef120125e036bf84c9e46a9e62219702f5b92e16",
                 "shasum": ""
             },
             "require": {
@@ -6891,7 +6891,7 @@
             },
             "require-dev": {
                 "pestphp/pest-dev-tools": "^2.16.0",
-                "pestphp/pest-plugin-type-coverage": "^2.8.3",
+                "pestphp/pest-plugin-type-coverage": "^2.8.4",
                 "symfony/process": "^6.4.0|^7.1.1"
             },
             "bin": [
@@ -6955,7 +6955,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v2.34.8"
+                "source": "https://github.com/pestphp/pest/tree/v2.34.9"
             },
             "funding": [
                 {
@@ -6967,7 +6967,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-10T22:02:16+00:00"
+            "time": "2024-07-11T08:36:26+00:00"
         },
         {
             "name": "pestphp/pest-plugin",

From f57f8b5659084091a2720753aea161bffd5b7d03 Mon Sep 17 00:00:00 2001
From: Graham Aitken <graham.b.aitken@gmail.com>
Date: Tue, 16 Jul 2024 19:44:22 +0100
Subject: [PATCH 111/111] Bump Node dependencies

---
 package-lock.json | 656 +++++++++++++++++++++++-----------------------
 package.json      |   6 +-
 2 files changed, 331 insertions(+), 331 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7bd4ee4..3259ec0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
                 "@ckeditor/ckeditor5-vue": "^6.0.0",
                 "@vueuse/components": "^10.11.0",
                 "@vueuse/core": "^10.11.0",
-                "ckeditor5": "^42.0.0"
+                "ckeditor5": "^42.0.1"
             },
             "devDependencies": {
                 "@inertiajs/vue3": "^1.2.0",
@@ -23,8 +23,8 @@
                 "eslint-plugin-vue": "^9.27.0",
                 "laravel-vite-plugin": "^1.0.5",
                 "postcss": "^8.4.39",
-                "tailwindcss": "^3.4.4",
-                "vite": "^5.3.3",
+                "tailwindcss": "^3.4.6",
+                "vite": "^5.3.4",
                 "vue": "^3.4.31"
             },
             "engines": {
@@ -65,456 +65,456 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-adapter-ckfinder": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-42.0.0.tgz",
-            "integrity": "sha512-d07ywmOA3ZwqL9tTT1c8oAScqqhA0Az8GC6HqIkPuSaCRKVC55aOLDkmPyACiHFkUkrhmCV9ldkVKoqptxRJVQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-42.0.1.tgz",
+            "integrity": "sha512-dfyULdo7vQDnFJWZfm0Qv6scW2TVnWLPEVo5r1D9knZbDC4zWFCmr0GeSjMHYKbtstPJzQ1QiVWKMFhWPvOeLg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-alignment": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-42.0.0.tgz",
-            "integrity": "sha512-hr1v5shN3D41EhnliLc5Svrg/JfyoKnSgnFLvejTYdd8HCyVqfiedgFCYP/goeSZTaGPpAIPojYdpQwtJON6+Q==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-42.0.1.tgz",
+            "integrity": "sha512-vy0SyqB1+SQ5ADZyyqZy4I4kD1SEVigFuCA+77IyaL9eDWvwZswwp+YuvnLRe3pZgPhCus1QMbxgbalhxnbhRg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-autoformat": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-42.0.0.tgz",
-            "integrity": "sha512-dGMwLPk4Q3Np/dVAOqwVefnS0dRGqARmcnV9lhpeC44mw+1ba3pxpCitxHkZY8epQHkLyhOuacWTPqSqAcB+bQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autoformat/-/ckeditor5-autoformat-42.0.1.tgz",
+            "integrity": "sha512-jJvtrbgtvbB4gcgWnAXIyHpb51i3dxY84Uwoc1KIRJyBeCX2vSoXKZ9frnQZp1r5r/MZfW0esuqyMHDI9R+TJQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-autosave": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autosave/-/ckeditor5-autosave-42.0.0.tgz",
-            "integrity": "sha512-Tqd8xbvjF6WTMl8R0QaCU0IW/TdqR1SlH/qXuLd+D96crCcXArRFdJ+oIjw6eJ436iI1Yp0aHzZb/KAnZ75Jww==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-autosave/-/ckeditor5-autosave-42.0.1.tgz",
+            "integrity": "sha512-ogKO/b+Ckj1yJTkuhCUnsVXkgHztKcU8K8zmpN9+nZR+BHqPEsrw7zEYdQm6LQi3tARdEvDvItqehcGDi9MA8Q==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-basic-styles": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-42.0.0.tgz",
-            "integrity": "sha512-CWMlmdTilDMlMrTA4UzxkSIpxliafcAC6mp2doDkm3MZ1K6+YewHpcxHRuZAsBMYGkmQSLq0YcqdTnDXoICSXA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-42.0.1.tgz",
+            "integrity": "sha512-p//VnlaacNeMTOmWdSFQomrTsteXRACkwd8Fr1qTu/m8FT4x8o0S2+UMiIh+H2fkUz9kqfy0lm/BE/RKsBOjng==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-block-quote": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-42.0.0.tgz",
-            "integrity": "sha512-VBXHHHALhW+iBfyAiQxskV45ozVGuanKRNagVXHPba0QLIEa2JUN75/5RVZVw3qr2BqS1wUKCrbb4qHeF94Otw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-42.0.1.tgz",
+            "integrity": "sha512-pSh752pye2vp68DAnrUg+Evi1FlxbBK2zUjt2xT92WOrqpow9b1LYdmnZkeJayt271+ot1rowyNEm8v+uOZBHw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ckbox": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckbox/-/ckeditor5-ckbox-42.0.0.tgz",
-            "integrity": "sha512-QcfLRpherNotB8XxMzHYk+CeAcqNOHan5e+kBN+mOcPkIcsbapt7RPI680YChw/sv/0yY8/5SbvXdcsn+KCFzw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckbox/-/ckeditor5-ckbox-42.0.1.tgz",
+            "integrity": "sha512-1URxhD1ejokpsTUyD+s8aoZkejBh84402sfwLTXnF6oF7Fd6XpFwkW7u3kRQVgkP88d+BeT+SXUw9230IODD5w==",
             "dependencies": {
                 "blurhash": "2.0.5",
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ckfinder": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-42.0.0.tgz",
-            "integrity": "sha512-P5hCrP4EPWRdIg7vXh2PjpovWq1SLgfjRCqC+a9hs5q/W3nYc+SIZbawJOV/kr5eq/E1O4e2flehGG7Y22AKVw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ckfinder/-/ckeditor5-ckfinder-42.0.1.tgz",
+            "integrity": "sha512-tZx2UNBblgRhJEP+ZylAOsp8DT8lvmpjxnfQWgh9RKhzrH13b4cIjN+7lbDNVLtuniCz0aSR7dHnWBrl9TxUOg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-clipboard": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-42.0.0.tgz",
-            "integrity": "sha512-/ajaQ5q0auwNsZEX1rveGQ5lBpeuhWWAVo/Ouv1IJT77G6nFDubqlYcKZEidGne2v1wtIgDK+nddnlxVdX8tvQ==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-widget": "42.0.0",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-42.0.1.tgz",
+            "integrity": "sha512-+NN8dqdskyrtkjdv5NXZqO1VvKlGvQh1+kC/PqAuBBB/mGNVHBXnUmV3RoIFHBv3C7YolW3ltwjQduz71Ay25A==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-widget": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-cloud-services": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-42.0.0.tgz",
-            "integrity": "sha512-PfH3PPB9fkweXSBfHzTbsHP/jEfDmkueGKGVkO7Z/luCASWjtNfQypykkkrDnMRv1PMJmBnK9wheWEGqBoS4kA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-cloud-services/-/ckeditor5-cloud-services-42.0.1.tgz",
+            "integrity": "sha512-nzwJKgWR0SFXV1b4pkxnOZelk2aXWxiaAmMrF4jZV8F1pTVsU3/SKxBbqhZxQZFImi9xhAGdka6QrIwEquIq1g==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-code-block": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-42.0.0.tgz",
-            "integrity": "sha512-RsXWRo6pbI2MsMHE+AE03UqEHgzErj/EO1lQy4vqgNNHqhXWqjMQZo4WSnzboczHRjNi3cNNFIw6r4nqm1Yz9w==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-42.0.1.tgz",
+            "integrity": "sha512-Ix35lRf/gS0sLPS3QawZYfnyT8TtEwTW0kfg/lhx7z+lTXmjlR7cAVAeIDrP3uQnASEydyIWHkqlzp9le0HjGA==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-core": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-42.0.0.tgz",
-            "integrity": "sha512-0WZTQM4JD3qobXNTPRMq0o1t+vYRWzkzX0LwoooZVn7NKIqCrYqVsTuV0xsN7qT0vdFNRvA9TYYfinw7j9Y4rw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-core/-/ckeditor5-core-42.0.1.tgz",
+            "integrity": "sha512-a/Lftjxi/jFiBM8l9/VI7qNqiTgGSqed4FGua1RFfE35v6goOsfFhIPkzT9sTXJL5ZDj7Zjrh/RrOc3jKzjdPA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-watchdog": "42.0.0",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-watchdog": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-easy-image": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-42.0.0.tgz",
-            "integrity": "sha512-Sb0DxfeN/BSq17ITkEoiCNMIqVcpV4JvNzDe7NlYnzmo6zL5HLX8Qd/fQAV44MrTZY8Lifkd4zqFSmSCcCZC2g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-easy-image/-/ckeditor5-easy-image-42.0.1.tgz",
+            "integrity": "sha512-l+1Pa7K5DzCL6d5+3nwDPYEUxC92pkfRQGn+LDdfjXg3kCyRexP5FasFrRCwuNmZRjws+B8gzLoTS1bRCrWB4A==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-balloon": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-42.0.0.tgz",
-            "integrity": "sha512-tTszKMob0WO7J3xEIi2GQxtDgY19dUTcGHBqpMRE2bcGTUKeeeqjfJwnNww/kDjYR+e4fmz9U5VRVg8PKQZVqQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-balloon/-/ckeditor5-editor-balloon-42.0.1.tgz",
+            "integrity": "sha512-gZ8rFF7NbYUsNfHY4I2QYbHvfoQiGu1puzflZ7vPEiu/q09E8W5TtYwRTaWDXfIwLP4RbpXBKb4xnArThdrFqw==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-classic": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-42.0.0.tgz",
-            "integrity": "sha512-/Np+DH2AVlkPVk3pkIJxJaJp2x+2GXkvn3wo/5ZFGbVBXI+e9todALoRRg2dB9EVRpv08I3ajzk5k1yl6MFa5w==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-42.0.1.tgz",
+            "integrity": "sha512-WASM6IXZED1uTvbWtLAgkga9JCVITvWGgDVAJgAYD6+7a5F2iEqxdegoV4duSr0qWhhzFqeRpey8mLrUi9VYwg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-decoupled": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-42.0.0.tgz",
-            "integrity": "sha512-bTgtSsu2f7QOMtWXZ2BQvnZ/DHRQE/wL9qN5MBhTbNf7vcayEEo++GJ/3sgLctzL7FxRCY0IqRvSrBf4fLFEZg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-42.0.1.tgz",
+            "integrity": "sha512-IR/ymKv813b8lVcFtKA6jGBvSTyc8UMOr/5yTCmvUYGBYjD39wv4QQpj4AClbbVL8CPNxUAToexLxelhjc1cgQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-inline": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-inline/-/ckeditor5-editor-inline-42.0.0.tgz",
-            "integrity": "sha512-JUe8YV59Ek4lornaa5hXQQOFkDxA3l0tp9qVIdkl2WONI1pjtK1aMxWJgeybxRGDHPSJW2Wyu/kNKw2slQP+Jg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-inline/-/ckeditor5-editor-inline-42.0.1.tgz",
+            "integrity": "sha512-A2qd/hcKpeIxRubyWLK2TZhPPCvZsDJerySSAzw6fFpAgedlBV2Lz048tV3AJholhwlFsITuaNyna/dTVE6/qg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-editor-multi-root": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-multi-root/-/ckeditor5-editor-multi-root-42.0.0.tgz",
-            "integrity": "sha512-l/+xnoVIGJeX3qU8CEKdc5RNr0Bbch2t5VNNK+N9An4SrK4ScLESyrKsIoWc4XPOoyhNe1j0luT8Ix35ftDroQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-editor-multi-root/-/ckeditor5-editor-multi-root-42.0.1.tgz",
+            "integrity": "sha512-IDU22zezBwM40/ofeAloHGzbghQxPlKW21h6XYs1RmKJLzq87BuxiZ4KY8hJkg9asdZrw4gU7YS20570QvjBjQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-engine": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-42.0.0.tgz",
-            "integrity": "sha512-9JhZDAu+IAJYD3SCrssrDU9XmEYfu+1XtYKslNlXRweNIf5QlVeZhb3pTjcR/4lbxNuYXc/VSNsFfEjbPKm1/g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-42.0.1.tgz",
+            "integrity": "sha512-hI7qVWVYYcfCeJ846Kjbbam4VnYYG93XDcL2SXKcyCgtuiJPiQroL7tvfSKTvBn2KZR2SwpHFfPkm5QXrZP+Xg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-enter": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-42.0.0.tgz",
-            "integrity": "sha512-HlSMX9jYZ1fob5L5+dJ7dmYxJT2RVzgO95IeMXvbsSMEQ5IC1ZhE8UIcaStNTUZ7SNQzhcX6cqUrPO8Zhh46xw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-42.0.1.tgz",
+            "integrity": "sha512-HuROcF33ekLzR8Uuc7tkonZqxEcpQ37pkd1Rx7V6JCt60rapm7cpELKl3nxDDyPUh+cWZ2nM6iQh/vsvXZkSKw==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-essentials": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-42.0.0.tgz",
-            "integrity": "sha512-DYWrEcraXiw+S9lbAk3UfvOnSe2ActOchk15hTishQKhRBzPqLDWr8bTYy4TwgwaMJg1gW9KK5o19oHLfW0P3A==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-42.0.1.tgz",
+            "integrity": "sha512-+hjE9KMCIsmajNmWVdUYpx27CogUry1g674VJ6he9QaFqrVsfApihZD98Zgl1QfoDdaCFnBpI9W/PE+2M1veIw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-find-and-replace": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-find-and-replace/-/ckeditor5-find-and-replace-42.0.0.tgz",
-            "integrity": "sha512-WrScnK58umy8LqGpYvQieJd8mgo9yYKVoG0KnDrlj+Q2hZhGqta5jt1CRlYOQLO2QsVg9POt6oioUTiWee60ag==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-find-and-replace/-/ckeditor5-find-and-replace-42.0.1.tgz",
+            "integrity": "sha512-GhjbzZIJ6aVfbQyCfru6jGTv1A3tmNcWs/YncSewZFb1Xxgk9EkfPcynB+hG3X8X38bX8ggvbxoicRFGKqzLHg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-font": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-42.0.0.tgz",
-            "integrity": "sha512-7ds9luaUDdHrmdZ6JKPn82+DkJAJ3Ej5Rdta8xfcnI1kDvGcLPRzwPCHeM5AD8RRqHX28B87U4FaOk9ehOE+Nw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-font/-/ckeditor5-font-42.0.1.tgz",
+            "integrity": "sha512-5TEbQvvrQn45S+08ancAFFecv8BWvC2L4nIxPKKYikOsFNScE6C5nxrr/Xaa98ZEgHowp48z+yZxLjTDwOZctQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-heading": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-42.0.0.tgz",
-            "integrity": "sha512-KLquk1q0yOjw9rGgq+beigc3uzIk5+5fq1VJCfyeq2qkrLdezWf21Up0h8zCBjJGt4Dw7jodJyMnK4GH3885Xw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-42.0.1.tgz",
+            "integrity": "sha512-Uf6IlamcgnZn3VkliP4+qWxEFKdaZNGfCntU08oW4b0Wf3i3P7lbBz73ZQ1sUF79QWZVlZiMIuQNL5RjAc93eA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-highlight": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-highlight/-/ckeditor5-highlight-42.0.0.tgz",
-            "integrity": "sha512-aWEv0yHVmzj9JRpXnURWSs64lphei+Bc6PbiecpQJvidjmFSgmVO0pFGtHe+iMmGy7S4TTGnPVEnq4IS0gGdgQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-highlight/-/ckeditor5-highlight-42.0.1.tgz",
+            "integrity": "sha512-mUvnfdX6HYa7kbsfDILLCX32Ia4lFDfOQm/mx5gR17hxbv//u55jZESKwvwNwUBoYXzln/hg2ifqoPFTFuC/aA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-horizontal-line": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-42.0.0.tgz",
-            "integrity": "sha512-9YIYENX3YM2WXLItD1rqMq+Lqc3daRT4E18C2FXgfrMUQNYDyM5UFzsi6HahjvRe2pbYOx0MwYGvaHgSjBVsCQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-42.0.1.tgz",
+            "integrity": "sha512-nw99pQ3dgm9G/M88UDtcvVUy3Xb6+baLz1IvanfItgVrH8FFObICFZjNJWxd/H4xtbQzMz1Ty6w8ZocPWja9sg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-html-embed": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-embed/-/ckeditor5-html-embed-42.0.0.tgz",
-            "integrity": "sha512-nh4ROlPU6enn9uOYigOsJHegnZslVs3UYOhLsod2JBOB2spF0AcoqOtk/Oh6SLajDa0iZ+oi1U7iNxXvekcysQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-embed/-/ckeditor5-html-embed-42.0.1.tgz",
+            "integrity": "sha512-MEim8XV+75aEnDGRkrft15oURiyVEOvHo9h+7cFeE3hgI9+wjk/V3arHQIAUkZTT3XpRv8LQKjBC1hmXTz7YyA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-html-support": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-42.0.0.tgz",
-            "integrity": "sha512-HPwiaz9Ah2BjuS2UgLdYv+APo+k0HJG79M/dgC3rNLX0O3IoWBDBXfcRhWKiGE1FBV3l1jt8eQgnaqsuKC6PIw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-42.0.1.tgz",
+            "integrity": "sha512-RxWl+RyfBSpa9setDWmtoF3ertzVOmaLi7Aw7xnyn71jV+S3aCMlZphiv7m9KENNy46FOc+Nzct5sScnJ+EpVg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-image": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-42.0.0.tgz",
-            "integrity": "sha512-lKq4OuhLDNS4sip4/yl/vGDuOitTCInMYEhvwZXlm6eFem75FTJnL1Co5+zKIVWktWvH2eFqmOGjv2jKrJIVgw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-image/-/ckeditor5-image-42.0.1.tgz",
+            "integrity": "sha512-O1u27JxByLNgZpmwP3up6lh48IU89w/7rMvd9WByQCyZpUPTT2J/4Mvjlimq1AMt61qmzx08TdcfhI+8aRhBvA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-indent": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-42.0.0.tgz",
-            "integrity": "sha512-Ba7cTreIEFoF0mJXRjBZdwgyzSvdmnqtlwMInM/IBIJDo6Vi4zx4svA2G1PvY/hV3UCvCAxzSqQ7s62yQT4KEQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-42.0.1.tgz",
+            "integrity": "sha512-aT/ui69ncvXFv/9TJqe3TUegppH62b2E9XaQqfwCmm1jZ5BDEG8oYnJI1htnsnmQSOXqye7m5276F+47nrN42w==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-language": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-language/-/ckeditor5-language-42.0.0.tgz",
-            "integrity": "sha512-x1cFYKtxBz1dhWXZ6DGvegCks7st6N1jFL55kyDgkvZqjsui/aPSvHnrcT6T0UO2sjMwAJh5/be5PXAJJ1yL0g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-language/-/ckeditor5-language-42.0.1.tgz",
+            "integrity": "sha512-iWmfEySQqDzNT8VN7qh8yr8tzUjrUwjYuYV2yvggNHPMo66JoRGsJwwZDYcdx1tOzIhcxOtZnQLK3v34k0gNQg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-link": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-42.0.0.tgz",
-            "integrity": "sha512-myphicJKjwv1LZ0pFdd1u4VOQieonPoNezRhsrFBkLTqIADgMp3+2PETyls5W8JZnua4sg/724Wa9TPmn9BLAA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-link/-/ckeditor5-link-42.0.1.tgz",
+            "integrity": "sha512-SaLYdmAknaMgX9ABxafMUmJ7a42IgKZQU58+wwwD+gWmaXt/vmWSCSbe1q6+e49UejnBMC4NCDC6YaQWAiTrIw==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-list": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-42.0.0.tgz",
-            "integrity": "sha512-taBQvwlhWmzFGGxOa5QH+XFeFRPke2X+3L/bdp/PJb9ZBX/wuqDL/cECQwDjblbGG8Iu1pDBOZSMG/bIknZjog==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-list/-/ckeditor5-list-42.0.1.tgz",
+            "integrity": "sha512-yEzFuO28msXm8I65lpF/D6eWLDK6ZsWnKsYDcQI45QlsVGxrs9r0t4mJzmHv26lN4p4/2pv5CPM1w1+ovvC6Ww==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-markdown-gfm": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-markdown-gfm/-/ckeditor5-markdown-gfm-42.0.0.tgz",
-            "integrity": "sha512-wtNpAkBiyobHbeLpsnnf9aroSIIjvKYsNxeNqB7P55ZyRN+mLdGQxp2ozPgCIjeb34SaalJ1VtiRnPS+B+NbaQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-markdown-gfm/-/ckeditor5-markdown-gfm-42.0.1.tgz",
+            "integrity": "sha512-P2ihM9c3cVDeCdrVk3JoTmG3ApJZgbYy1Iag1rcoLyVW185nn4H3rkPBVSVFfa1+B9lw0Oe50YcPv67mIWe8VQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "marked": "4.0.12",
                 "turndown": "7.2.0",
                 "turndown-plugin-gfm": "1.0.2"
             }
         },
         "node_modules/@ckeditor/ckeditor5-media-embed": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-42.0.0.tgz",
-            "integrity": "sha512-cbaTwnnNC8Li497WrArw4BcENQcv+b7FH7Q93bjytQN8vrxZR8+eWfCHbaR8dNewAWLI4/jNp9S64koOMOhUTQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-media-embed/-/ckeditor5-media-embed-42.0.1.tgz",
+            "integrity": "sha512-OnaZb8LdXKS7jyWRSInXFtA/u+t9KcSJAO68MxRnI1bkUdegudaj4JzXX7/ifIocgFTdG+QlG+v40PAUfXYTkQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-mention": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-mention/-/ckeditor5-mention-42.0.0.tgz",
-            "integrity": "sha512-6jC5vGfHAeYarmgecw4cWj7u1E4EgFZlQh6Z15WcQ2OeHTiBLh1fGFPM10gKauIYfUsmHfsVFsafGyByFQsZBw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-mention/-/ckeditor5-mention-42.0.1.tgz",
+            "integrity": "sha512-lrRSMHtbo6kuKzfoUk7D5hb7IQaFnDtTsePk7k7kkg22T0yCzxeJwmd314dAZfcNf5D49izvg1RucpquJ6XS4g==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-minimap": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-minimap/-/ckeditor5-minimap-42.0.0.tgz",
-            "integrity": "sha512-cTbZqve6xYh5D4XSecU1AEx5Rl2gRm2U91G3O53GddhuScG9tchmZ2n3kzFz6FkDcYpgWJBLK5uEdSBede+YeQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-minimap/-/ckeditor5-minimap-42.0.1.tgz",
+            "integrity": "sha512-OGdFguNeEVUh8pUF0VCAEkbM5QIiQJW9KPWc+wLJyhSMnLV4J9abI1vBalTD/C/obD1g/gKtGu3jhxNk1YMEOg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-page-break": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-page-break/-/ckeditor5-page-break-42.0.0.tgz",
-            "integrity": "sha512-2Bg4cAMBs1RGIMn0CZSnADSG+Zn19u0/qMfxR5Js5AolMjsMFcvfHVHrP7WTPfYKz0S0F9LLWTEjyf3f6PU3Og==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-page-break/-/ckeditor5-page-break-42.0.1.tgz",
+            "integrity": "sha512-bCRTEh2giOIidDjjBI+xK8TJ0QvXLtahDEV7MmecAeXu1SAk2FpECl60BUMl+/DQcaK3XGHsLZCMZsSdCXGqbQ==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-paragraph": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-42.0.0.tgz",
-            "integrity": "sha512-CNEc+YBDD5vysMxzSkCRXNtCeWJH2Drq2ynFc6YAOVXnfAQvpW3PnuwHMUQvS6r1BCk35xEbUpuRLCXxOuoipg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-42.0.1.tgz",
+            "integrity": "sha512-rxGX+vnrxUGpTXZQSIO5XBP2Cz8CaYyufLF8Ad4fTpT6VT++BAczI0r2ij5SZLK7iCKQfHBrzz1BvatJmxjr5Q==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-paste-from-office": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-42.0.0.tgz",
-            "integrity": "sha512-pfBOovJz+CnXXX4XQLJQTBRWHTnlG7gibzzMnnmK+KIzsjlVOGrl09c2uafQo0QvgNSH0bF6Yhxn6T2CTCWcYw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-42.0.1.tgz",
+            "integrity": "sha512-OKeWTHPrt7Yjp+rzZomxYmhEqZRQmGy+YGkWCdnfy2CH4ypsQVLI07hZazuZ8ZNVZ+/P7gxD7m+1y6EOj3SC5w==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-remove-format": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-42.0.0.tgz",
-            "integrity": "sha512-lS/fEoSM2HOhA+Ocve3gwRjlqKhZQx5Rbm3PBzAQJAZosfxCeCLcg2RJb1zGD4mGsY2urWAeRVNNckJObcNM9Q==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-42.0.1.tgz",
+            "integrity": "sha512-j1VpxnMRqSEDr2nzY/JGjvd+wYFqw2VJrTLA/2hmkH40BhdmCw8+t8AFLUNUPqBE/vGTHbMVvmf4vRhy/nM2Rg==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-restricted-editing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-restricted-editing/-/ckeditor5-restricted-editing-42.0.0.tgz",
-            "integrity": "sha512-5WnyJ+rLbh206Y3XbOxNKxpdNi9X4nE+O/Pk7TLgvkZ2S4UdptplaycXk9mTHZvtRWCs1VLW629WoEoHXPGtxg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-restricted-editing/-/ckeditor5-restricted-editing-42.0.1.tgz",
+            "integrity": "sha512-lgLucIp20Z6P6sUX1sH9fQiqbGQ0t/yBNoMhi340T9ejBjIfRQ2sJyvUelInD5XICrwdU29jPBcGD0VqWBbFBw==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-select-all": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-42.0.0.tgz",
-            "integrity": "sha512-6tnRtB5TIsgUh6I+lahvIYxsL61M+b0XvLQCPpIiYHn+V6htEESoniz7vVxEgwNXnCuCFoHvO+IpjC6ugd0ESA==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-42.0.1.tgz",
+            "integrity": "sha512-1PymHaP/0lEoTVrxrNzCY/36QsKqV/mKcXm5zwNwRdLgY8GB2tcu75YthubG8sVHNR893IMG4FYlGS/a1exwIQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-show-blocks": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-show-blocks/-/ckeditor5-show-blocks-42.0.0.tgz",
-            "integrity": "sha512-ZQ/u1/7fU2ZA57q3i6yTsHSgzAPQ60uK49/R/zQYCQsAzxGXavvQ0qOwbpzaR1O+y942w1n0E5roXyTelTHaPQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-show-blocks/-/ckeditor5-show-blocks-42.0.1.tgz",
+            "integrity": "sha512-mdmytIO/GslWrCt8Cubt2TsHOogio+/0lTjk76LtPIJn+AUEI4xYhPIZfFOHbxqzjVx2tx9g49Sr+S/SA2Ag9A==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-source-editing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-42.0.0.tgz",
-            "integrity": "sha512-p2KtKpcX2vuPNA85n5mQRwouEAWGqFpXiblMCdDtp8Ajql1EcGa66edOP8qeyT1CpsJ6PM/sZ86otKKGTFl4yQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-42.0.1.tgz",
+            "integrity": "sha512-6b5ujT5smdpB+2rZbGM7Isqgevs/any+PsbEtbBT7dc9NkkPI/2YH+o4a5FLf38c7fDxGCV4Ob7kwOPStkNAIA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-theme-lark": "42.0.0",
-                "ckeditor5": "42.0.0"
+                "@ckeditor/ckeditor5-theme-lark": "42.0.1",
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-special-characters": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-42.0.0.tgz",
-            "integrity": "sha512-WXKjyCE4AZG0yWRkRI3EvoYU8L+U1Ckz9cdeUEpPC7MFBZT2o28pGDyE8jzjmt51tOIZUNuSnwUCF1+kRn+xKg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-42.0.1.tgz",
+            "integrity": "sha512-irWFRCpZODtB1ui3Wm214Es6jxFNDZn/e1mbhGf5DGOGEQCLe8aAJc68FDKI3hl8cQlXxDTSch1RFvUiuNaBIA==",
             "dependencies": {
-                "ckeditor5": "42.0.0"
+                "ckeditor5": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-style": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-style/-/ckeditor5-style-42.0.0.tgz",
-            "integrity": "sha512-0WaRKAuslHEpmwz+ebQYAwmH047QPt0Kp2XiXxvbVyeSgpmX6c8AzbrkCT11kGCpC1VEdiqg8AkroPQCO+VDnw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-style/-/ckeditor5-style-42.0.1.tgz",
+            "integrity": "sha512-JVO8Iq9j15iABpHTt24T8KsdDf2KxVFe7gg0ooowlZB7CmmYVCqKBGnnMemqM+aQk3qfXPUgNA1G3v259MHs9g==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-table": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-42.0.0.tgz",
-            "integrity": "sha512-D3RwXDIsUX8MGUfg2bpcfObF0seYUllqW0aMalPPcpKVwO9Yjh98FXi8CQyrLp7Ig7ef8yFQv6I5y38Gze8Utw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-table/-/ckeditor5-table-42.0.1.tgz",
+            "integrity": "sha512-xITEPFvV05h+sNbs2jqLSUu6UUat5DCoyt9WIbqIYC8hwJrGGAcuwldyfL0e+hrUAbHHkL1K9oRlMmhKuw6OEA==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "ckeditor5": "42.0.0",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-theme-lark": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-42.0.0.tgz",
-            "integrity": "sha512-G9rda0cxoi2qrTxsUQyOTnj8cH/66ZRPYd2v2cCuWxfjkNELzqjWtl1e9v5cQQvUrxcp7gPCTOtvc3lchdD5tg==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-42.0.1.tgz",
+            "integrity": "sha512-EZfxuFpBro6VTobQytGkvMQl/H8PymANTQrnICwLEKd81ZM5yJQTeolF/VS+QFlDqx1gXUESNJt8NqFytm1cww==",
             "dependencies": {
-                "@ckeditor/ckeditor5-ui": "42.0.0"
+                "@ckeditor/ckeditor5-ui": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-typing": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-42.0.0.tgz",
-            "integrity": "sha512-6FDkdEDrWKBnEX+C4qqQ2j5VD26Z+VBr2vtprYtRykRCYpc/n4pbbz9ecjXnJ/E8ftm44nCMcBxbg8HPEjroyw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-42.0.1.tgz",
+            "integrity": "sha512-gLqp27CiLZe/ycKgJotqQ5Ta1KX3aSlZMYmnHurmOmkvjXB76syM990KlPiDAkff2QyXE1qgg0uKLgT4CbrKNg==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-ui": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-42.0.0.tgz",
-            "integrity": "sha512-Z69x9u8UkUP7P1F6u7loUGXqUiNtEXBz+2flXHxBq6JVnGh5rZ3ZtVhWQRaOSAIVp+ub/BwEcwzqq4itI1Tuog==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-42.0.1.tgz",
+            "integrity": "sha512-3OF/nm/pc8rwH65+GYET5Xj5qk53aVXnBi/DBVRQZBdhuAGlMQuy+7E2WU6vO7G24w1LOJUSPpeBJt/MXs6z2w==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "color-convert": "2.0.1",
                 "color-parse": "1.4.2",
                 "lodash-es": "4.17.21",
@@ -522,28 +522,28 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-undo": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-42.0.0.tgz",
-            "integrity": "sha512-7H4hD4k0jmrSk5n1cYKlj2rmuICIwdGFX3WMPv2KuEKI1WYZBE10KLf6bB15EFoMVvBFepX0TjfEVXTO6Ul5rw==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-42.0.1.tgz",
+            "integrity": "sha512-3tIj7JLtKFMxiJrfZ7IrBXBzBe0dtP+EcztjzgQbndS1PaAldErH3g7z55avwp6R3hum0wFnqgvQRIgSUlYONQ==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-upload": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-42.0.0.tgz",
-            "integrity": "sha512-UPRre84p6qPyPVhDsfuVh5rNGcaZjSIQhGdqOPfgMWc4QYOKNf7Y7TvW+9xzUVXyHbo2pcvOq6/Ldw6z4zk10g==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-42.0.1.tgz",
+            "integrity": "sha512-0tn4ltiz0cTmlMPFPpJkDzi5+jVkPbtv9R9OHGDFgDW0uyN93UvnW0xPpoXKn/R/qRJf2gnPK95QlUaeiz33+w==",
             "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0"
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1"
             }
         },
         "node_modules/@ckeditor/ckeditor5-utils": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-42.0.0.tgz",
-            "integrity": "sha512-9f3eAjh7sgYC+Cth0yEHaWBJpPFWWehPa3efAlSjuKl0NhW2mzSU5s9SMRNDS5MJAI+oTIOLP5/SV/pNCbiT3A==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-42.0.1.tgz",
+            "integrity": "sha512-gJlP8/dCfnmcgq1E30//rd5KU3EetuFx0QQqphuaeUxuJeVhRJlMvva0H/dZOv82uMrTBgspxYsRrkjn7XnVxQ==",
             "dependencies": {
                 "lodash-es": "4.17.21"
             }
@@ -564,33 +564,33 @@
             }
         },
         "node_modules/@ckeditor/ckeditor5-watchdog": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-watchdog/-/ckeditor5-watchdog-42.0.0.tgz",
-            "integrity": "sha512-rNk1GtiIx6KYaE/B4atNOb7QNB916RbFfq4MsOPPVow+64XF3Ljvx14qX1I/da+WH3EbpoBwbJqnIlu7aLa0Ww==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-watchdog/-/ckeditor5-watchdog-42.0.1.tgz",
+            "integrity": "sha512-ROfjUFky3W2u9F+6sXiT1IR9pa/odYAjT9ck/wp5W2dHum5XMIAdF4A6bEwXeBtZnpMo8+tQ1b1OZv78rZ31IA==",
             "dependencies": {
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-widget": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-42.0.0.tgz",
-            "integrity": "sha512-HbPQCCwsBfRWSHOM0Qn1MFvlAym1S3XvQzqe7tEPZ577RLSk0H4FEvv6YxpUNjsjujYlDsUK+dF8zVye7Cv7tw==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-enter": "42.0.0",
-                "@ckeditor/ckeditor5-typing": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-42.0.1.tgz",
+            "integrity": "sha512-hz02QxOFw4HNmDqM6369rCZgEotsmUtHcysC1Ius6XxbPiZHLraagb2wG9Dts/80DRN//1zGbxKG61sTa/5Bog==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-enter": "42.0.1",
+                "@ckeditor/ckeditor5-typing": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
         "node_modules/@ckeditor/ckeditor5-word-count": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-word-count/-/ckeditor5-word-count-42.0.0.tgz",
-            "integrity": "sha512-+P8Q7hWdkq+sTt2+qAgz+OsOsTTdqluyYgrKRx9DvjLRsF+VmlHwNTaOMqcnU1EWNfFcjevQHoTugmqm+dWquQ==",
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/@ckeditor/ckeditor5-word-count/-/ckeditor5-word-count-42.0.1.tgz",
+            "integrity": "sha512-hTTCMmWTORGLj4f83DeKZC0d8K4JmOJHCCzAQypPIB1qD2n1D6VbweoVsgVOUr5fPsd5QO5jOyor2T2yHyQmyg==",
             "dependencies": {
-                "ckeditor5": "42.0.0",
+                "ckeditor5": "42.0.1",
                 "lodash-es": "4.17.21"
             }
         },
@@ -2185,67 +2185,67 @@
             }
         },
         "node_modules/ckeditor5": {
-            "version": "42.0.0",
-            "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-42.0.0.tgz",
-            "integrity": "sha512-l/Qdw61+nAhkNfXRzPp3a6W75XGnKBKWlJqEbgMGclgAvaqgWE7MAz9VqQCJSeMK8PjgFH1EcBMPRmG+6W8QRQ==",
-            "dependencies": {
-                "@ckeditor/ckeditor5-adapter-ckfinder": "42.0.0",
-                "@ckeditor/ckeditor5-alignment": "42.0.0",
-                "@ckeditor/ckeditor5-autoformat": "42.0.0",
-                "@ckeditor/ckeditor5-autosave": "42.0.0",
-                "@ckeditor/ckeditor5-basic-styles": "42.0.0",
-                "@ckeditor/ckeditor5-block-quote": "42.0.0",
-                "@ckeditor/ckeditor5-ckbox": "42.0.0",
-                "@ckeditor/ckeditor5-ckfinder": "42.0.0",
-                "@ckeditor/ckeditor5-clipboard": "42.0.0",
-                "@ckeditor/ckeditor5-cloud-services": "42.0.0",
-                "@ckeditor/ckeditor5-code-block": "42.0.0",
-                "@ckeditor/ckeditor5-core": "42.0.0",
-                "@ckeditor/ckeditor5-easy-image": "42.0.0",
-                "@ckeditor/ckeditor5-editor-balloon": "42.0.0",
-                "@ckeditor/ckeditor5-editor-classic": "42.0.0",
-                "@ckeditor/ckeditor5-editor-decoupled": "42.0.0",
-                "@ckeditor/ckeditor5-editor-inline": "42.0.0",
-                "@ckeditor/ckeditor5-editor-multi-root": "42.0.0",
-                "@ckeditor/ckeditor5-engine": "42.0.0",
-                "@ckeditor/ckeditor5-enter": "42.0.0",
-                "@ckeditor/ckeditor5-essentials": "42.0.0",
-                "@ckeditor/ckeditor5-find-and-replace": "42.0.0",
-                "@ckeditor/ckeditor5-font": "42.0.0",
-                "@ckeditor/ckeditor5-heading": "42.0.0",
-                "@ckeditor/ckeditor5-highlight": "42.0.0",
-                "@ckeditor/ckeditor5-horizontal-line": "42.0.0",
-                "@ckeditor/ckeditor5-html-embed": "42.0.0",
-                "@ckeditor/ckeditor5-html-support": "42.0.0",
-                "@ckeditor/ckeditor5-image": "42.0.0",
-                "@ckeditor/ckeditor5-indent": "42.0.0",
-                "@ckeditor/ckeditor5-language": "42.0.0",
-                "@ckeditor/ckeditor5-link": "42.0.0",
-                "@ckeditor/ckeditor5-list": "42.0.0",
-                "@ckeditor/ckeditor5-markdown-gfm": "42.0.0",
-                "@ckeditor/ckeditor5-media-embed": "42.0.0",
-                "@ckeditor/ckeditor5-mention": "42.0.0",
-                "@ckeditor/ckeditor5-minimap": "42.0.0",
-                "@ckeditor/ckeditor5-page-break": "42.0.0",
-                "@ckeditor/ckeditor5-paragraph": "42.0.0",
-                "@ckeditor/ckeditor5-paste-from-office": "42.0.0",
-                "@ckeditor/ckeditor5-remove-format": "42.0.0",
-                "@ckeditor/ckeditor5-restricted-editing": "42.0.0",
-                "@ckeditor/ckeditor5-select-all": "42.0.0",
-                "@ckeditor/ckeditor5-show-blocks": "42.0.0",
-                "@ckeditor/ckeditor5-source-editing": "42.0.0",
-                "@ckeditor/ckeditor5-special-characters": "42.0.0",
-                "@ckeditor/ckeditor5-style": "42.0.0",
-                "@ckeditor/ckeditor5-table": "42.0.0",
-                "@ckeditor/ckeditor5-theme-lark": "42.0.0",
-                "@ckeditor/ckeditor5-typing": "42.0.0",
-                "@ckeditor/ckeditor5-ui": "42.0.0",
-                "@ckeditor/ckeditor5-undo": "42.0.0",
-                "@ckeditor/ckeditor5-upload": "42.0.0",
-                "@ckeditor/ckeditor5-utils": "42.0.0",
-                "@ckeditor/ckeditor5-watchdog": "42.0.0",
-                "@ckeditor/ckeditor5-widget": "42.0.0",
-                "@ckeditor/ckeditor5-word-count": "42.0.0"
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/ckeditor5/-/ckeditor5-42.0.1.tgz",
+            "integrity": "sha512-qgsv/eP79OKunE76mMyPP1/PPjsBkLUlmb4cR/TA5C6HGsMvrCmYhryIgvdcqnZ0k8OIre1/X50+3VWvMnJ2qQ==",
+            "dependencies": {
+                "@ckeditor/ckeditor5-adapter-ckfinder": "42.0.1",
+                "@ckeditor/ckeditor5-alignment": "42.0.1",
+                "@ckeditor/ckeditor5-autoformat": "42.0.1",
+                "@ckeditor/ckeditor5-autosave": "42.0.1",
+                "@ckeditor/ckeditor5-basic-styles": "42.0.1",
+                "@ckeditor/ckeditor5-block-quote": "42.0.1",
+                "@ckeditor/ckeditor5-ckbox": "42.0.1",
+                "@ckeditor/ckeditor5-ckfinder": "42.0.1",
+                "@ckeditor/ckeditor5-clipboard": "42.0.1",
+                "@ckeditor/ckeditor5-cloud-services": "42.0.1",
+                "@ckeditor/ckeditor5-code-block": "42.0.1",
+                "@ckeditor/ckeditor5-core": "42.0.1",
+                "@ckeditor/ckeditor5-easy-image": "42.0.1",
+                "@ckeditor/ckeditor5-editor-balloon": "42.0.1",
+                "@ckeditor/ckeditor5-editor-classic": "42.0.1",
+                "@ckeditor/ckeditor5-editor-decoupled": "42.0.1",
+                "@ckeditor/ckeditor5-editor-inline": "42.0.1",
+                "@ckeditor/ckeditor5-editor-multi-root": "42.0.1",
+                "@ckeditor/ckeditor5-engine": "42.0.1",
+                "@ckeditor/ckeditor5-enter": "42.0.1",
+                "@ckeditor/ckeditor5-essentials": "42.0.1",
+                "@ckeditor/ckeditor5-find-and-replace": "42.0.1",
+                "@ckeditor/ckeditor5-font": "42.0.1",
+                "@ckeditor/ckeditor5-heading": "42.0.1",
+                "@ckeditor/ckeditor5-highlight": "42.0.1",
+                "@ckeditor/ckeditor5-horizontal-line": "42.0.1",
+                "@ckeditor/ckeditor5-html-embed": "42.0.1",
+                "@ckeditor/ckeditor5-html-support": "42.0.1",
+                "@ckeditor/ckeditor5-image": "42.0.1",
+                "@ckeditor/ckeditor5-indent": "42.0.1",
+                "@ckeditor/ckeditor5-language": "42.0.1",
+                "@ckeditor/ckeditor5-link": "42.0.1",
+                "@ckeditor/ckeditor5-list": "42.0.1",
+                "@ckeditor/ckeditor5-markdown-gfm": "42.0.1",
+                "@ckeditor/ckeditor5-media-embed": "42.0.1",
+                "@ckeditor/ckeditor5-mention": "42.0.1",
+                "@ckeditor/ckeditor5-minimap": "42.0.1",
+                "@ckeditor/ckeditor5-page-break": "42.0.1",
+                "@ckeditor/ckeditor5-paragraph": "42.0.1",
+                "@ckeditor/ckeditor5-paste-from-office": "42.0.1",
+                "@ckeditor/ckeditor5-remove-format": "42.0.1",
+                "@ckeditor/ckeditor5-restricted-editing": "42.0.1",
+                "@ckeditor/ckeditor5-select-all": "42.0.1",
+                "@ckeditor/ckeditor5-show-blocks": "42.0.1",
+                "@ckeditor/ckeditor5-source-editing": "42.0.1",
+                "@ckeditor/ckeditor5-special-characters": "42.0.1",
+                "@ckeditor/ckeditor5-style": "42.0.1",
+                "@ckeditor/ckeditor5-table": "42.0.1",
+                "@ckeditor/ckeditor5-theme-lark": "42.0.1",
+                "@ckeditor/ckeditor5-typing": "42.0.1",
+                "@ckeditor/ckeditor5-ui": "42.0.1",
+                "@ckeditor/ckeditor5-undo": "42.0.1",
+                "@ckeditor/ckeditor5-upload": "42.0.1",
+                "@ckeditor/ckeditor5-utils": "42.0.1",
+                "@ckeditor/ckeditor5-watchdog": "42.0.1",
+                "@ckeditor/ckeditor5-widget": "42.0.1",
+                "@ckeditor/ckeditor5-word-count": "42.0.1"
             }
         },
         "node_modules/color-convert": {
@@ -5388,9 +5388,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.4",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
-            "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
+            "version": "3.4.6",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz",
+            "integrity": "sha512-1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==",
             "dev": true,
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
@@ -5663,9 +5663,9 @@
             "integrity": "sha512-z2YZusTFC6KnLERx1cgoIRX2CjPRP0W75N+3CC6gbvdX5Ch47rZkEMGO2Xnf+IEmi3RiFLxS18gayMA27iU7Kg=="
         },
         "node_modules/vite": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
-            "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
+            "version": "5.3.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
+            "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.21.3",
diff --git a/package.json b/package.json
index 13ff1458..bdd878d7 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
         "eslint-plugin-vue": "^9.27.0",
         "laravel-vite-plugin": "^1.0.5",
         "postcss": "^8.4.39",
-        "tailwindcss": "^3.4.4",
-        "vite": "^5.3.3",
+        "tailwindcss": "^3.4.6",
+        "vite": "^5.3.4",
         "vue": "^3.4.31"
     },
     "dependencies": {
         "@ckeditor/ckeditor5-vue": "^6.0.0",
         "@vueuse/components": "^10.11.0",
         "@vueuse/core": "^10.11.0",
-        "ckeditor5": "^42.0.0"
+        "ckeditor5": "^42.0.1"
     }
 }