Merge pull request #371 from statikbe/reworkfieldscraft5

[CRAFT-5] cleanup all duplicate fields, optimize all content builder blocks to reuse fields where possible, remove supertable
statikbe · Jul 22, 2024 · 3c7f648 · 3c7f648
2 parents 6fa536d + 0b860c6
commit 3c7f648
Show file tree

Hide file tree

Showing 111 changed files with 1,054 additions and 4,052 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,6 @@
     "verbb/hyper": "2.0.2",
     "verbb/image-resizer": "^4.0.0-beta.1",
     "verbb/knock-knock": "dev-craft-5 as 3.0.0",
-    "verbb/super-table": "4.0.1",
     "verbb/tablemaker": "^5.0.0",
     "vlucas/phpdotenv": "^5.4.1"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/config/project/entryTypes/callToAction--7b5ab248-6255-4b42-88bc-80c1dee62b20.yaml b/config/project/entryTypes/callToAction--7b5ab248-6255-4b42-88bc-80c1dee62b20.yaml
@@ -36,7 +36,7 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Contentbuilder Title (Anchor)
+            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Title (Anchor)
             handle: blockTitle
             includeInCards: false
             instructions: null
@@ -51,7 +51,7 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 7d5a93a5-4324-462a-9dad-375cb5172cce # Text - Contentbuilder Body Simple
+            fieldUid: 5d7250f9-a00c-4732-a743-b46bb5d11646 # CK Editor - Standard
             handle: text
             includeInCards: false
             instructions: null
@@ -60,47 +60,47 @@ fieldLayouts:
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 7890db9a-85df-4352-9aa0-e84e1856466f
+            uid: e28da65a-afdc-46d5-9836-5356db6ad43d
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: 7def856e-47b3-4b83-ba43-23b5da28a176 # Content Builder - Call To Action - Image
-            handle: image
+            fieldUid: f936530d-29a5-4460-9ccd-b586bfb25329 # Call to actions
+            handle: cta
             includeInCards: false
             instructions: null
-            label: Image
-            providesThumbs: true
-            required: false
+            label: null
+            providesThumbs: false
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 05216db1-92ad-4acb-ad4a-caf5abad6e04
+            uid: 19e39354-0b95-4efe-b985-cce67beab385
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: 17647a4e-555f-49c4-ac53-e0a1ea9e5b40 # Contentbuilder CTA (Single)
-            handle: cta
+            fieldUid: a44287f8-d6ed-4f2c-8a63-0c1312ef236e # Image
+            handle: null
             includeInCards: false
             instructions: null
-            label: 'Call to action'
+            label: null
             providesThumbs: false
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 8f7f6839-1be4-434b-b363-821879c54f91
+            uid: 5f1e5136-4dc7-4574-bb44-3bf0909e1518
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: 3857f4aa-a319-44ec-8b5e-d907d3d1bf31 # Content Builder  Background Color
-            handle: backgroundColor
+            fieldUid: 3857f4aa-a319-44ec-8b5e-d907d3d1bf31 # Background Color
+            handle: null
             includeInCards: false
             instructions: null
-            label: 'Background color'
+            label: null
             providesThumbs: false
             required: false
             tip: null
@@ -118,8 +118,8 @@ icon: link
 name: 'Call To Action'
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
-titleFormat: ''
-titleTranslationKeyFormat: ''
+titleFormat: null
+titleTranslationKeyFormat: null
 titleTranslationMethod: site
diff --git a/config/project/entryTypes/category--2a768305-5971-43c0-a2f4-415e648c6a45.yaml b/config/project/entryTypes/category--2a768305-5971-43c0-a2f4-415e648c6a45.yaml
@@ -43,8 +43,8 @@ icon: tag
 name: Category
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
-titleFormat: ''
-titleTranslationKeyFormat: ''
+titleFormat: null
+titleTranslationKeyFormat: null
 titleTranslationMethod: site
diff --git a/config/project/entryTypes/contact--f2d8b097-d5ba-4224-9736-4dc41bd6580f.yaml b/config/project/entryTypes/contact--f2d8b097-d5ba-4224-9736-4dc41bd6580f.yaml
@@ -283,8 +283,8 @@ icon: envelope
 name: Contact
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
-titleFormat: ''
-titleTranslationKeyFormat: ''
+titleFormat: null
+titleTranslationKeyFormat: null
 titleTranslationMethod: site
diff --git a/config/project/entryTypes/customTable--f2d33237-c7de-4590-9683-7efe6594ebbd.yaml b/config/project/entryTypes/customTable--f2d33237-c7de-4590-9683-7efe6594ebbd.yaml
@@ -36,7 +36,7 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Contentbuilder Title (Anchor)
+            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Title (Anchor)
             handle: blockTitle
             includeInCards: false
             instructions: null
@@ -57,7 +57,7 @@ fieldLayouts:
             instructions: null
             label: Table
             providesThumbs: false
-            required: false
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: f6dc8760-1fb1-431b-a419-4d199757ca92

diff --git a/config/project/entryTypes/form--f3211a4e-d5f8-4514-a372-c5b8cfc2c44a.yaml b/config/project/entryTypes/form--f3211a4e-d5f8-4514-a372-c5b8cfc2c44a.yaml
@@ -36,7 +36,7 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Contentbuilder Title (Anchor)
+            fieldUid: 838aabf9-a30e-4616-ad7c-b89fe15d7cae # Title (Anchor)
             handle: blockTitle
             includeInCards: false
             instructions: null
@@ -51,7 +51,7 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: b866ebd2-431e-47e9-8db0-97c56606cb70 # Text - Contentbuilder Body Standard
+            fieldUid: 5d7250f9-a00c-4732-a743-b46bb5d11646 # CK Editor - Standard
             handle: text
             includeInCards: false
             instructions: null
@@ -60,13 +60,13 @@ fieldLayouts:
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: f4ed4f28-d68c-466a-960b-e7a6ded6428d
+            uid: eefee792-3270-40b9-aec3-9efbd6f7d496
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: 74a30650-eb90-462f-a104-de1d41ac8221 # Content Builder - Form - Form
+            fieldUid: 74a30650-eb90-462f-a104-de1d41ac8221 # Form
             handle: null
             includeInCards: false
             instructions: null
@@ -81,11 +81,11 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 3857f4aa-a319-44ec-8b5e-d907d3d1bf31 # Content Builder  Background Color
-            handle: backgroundColor
+            fieldUid: 3857f4aa-a319-44ec-8b5e-d907d3d1bf31 # Background Color
+            handle: null
             includeInCards: false
             instructions: null
-            label: 'Background color'
+            label: null
             providesThumbs: false
             required: false
             tip: null
@@ -103,8 +103,8 @@ icon: input-text
 name: Form
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
-titleFormat: ''
-titleTranslationKeyFormat: ''
+titleFormat: null
+titleTranslationKeyFormat: null
 titleTranslationMethod: site
diff --git a/config/project/entryTypes/heroBlock--ed516703-9411-446f-8ce9-d66e9c48839a.yaml b/config/project/entryTypes/heroBlock--ed516703-9411-446f-8ce9-d66e9c48839a.yaml
@@ -36,56 +36,41 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 2184d090-d3e1-413b-8d21-b537c5141ef8 # Hero - Image
-            handle: image
-            includeInCards: false
-            instructions: null
-            label: Image
-            providesThumbs: true
-            required: true
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            uid: c2d6ef90-7210-48ad-a51c-200fb5b1e1e9
-            userCondition: null
-            warning: null
-            width: 100
-          -
-            elementCondition: null
-            fieldUid: f2cda3ff-d4de-4c81-a8c2-944f82c303db # Hero - Title
+            fieldUid: a44287f8-d6ed-4f2c-8a63-0c1312ef236e # Image
             handle: null
-            includeInCards: true
-            instructions: null
-            label: Title
+            includeInCards: false
+            instructions: 'The minimum width for this image is 2200px. The ideal width is 4400px.'
+            label: null
             providesThumbs: false
             required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 003f98c4-765a-40ca-a3e3-54a939e9dd59
+            uid: 24930e35-c651-4057-aca2-933dedc35049
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: d04eb799-5eb6-46db-92f8-88c4e6b8812e # Hero - Intro
-            handle: intro
+            fieldUid: b5de6dcf-80e6-48e2-b846-0dab7f35c4c8 # Intro Text
+            handle: null
             includeInCards: false
             instructions: null
-            label: Intro
+            label: null
             providesThumbs: false
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 4b54acd3-0bf2-44fa-83a9-bbf84c59e917
+            uid: 7363453d-680b-42f9-b2af-53051eff7e07
             userCondition: null
             warning: null
             width: 100
           -
             elementCondition: null
-            fieldUid: f936530d-29a5-4460-9ccd-b586bfb25329 # Hero - Call to actions
+            fieldUid: f936530d-29a5-4460-9ccd-b586bfb25329 # Call to actions
             handle: null
             includeInCards: false
             instructions: null
-            label: 'Call to actions'
+            label: null
             providesThumbs: false
             required: false
             tip: null
@@ -98,13 +83,13 @@ fieldLayouts:
         uid: f0a1f43c-d76e-40d3-9b39-e2a0e2021a72
         userCondition: null
 handle: heroBlock
-hasTitleField: false
+hasTitleField: true
 icon: image
 name: 'Hero Block'
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
-titleFormat: ''
-titleTranslationKeyFormat: ''
+titleFormat: null
+titleTranslationKeyFormat: null
 titleTranslationMethod: site
diff --git a/config/project/entryTypes/home--89c47888-bddf-4633-9352-1d5dc3bb452f.yaml b/config/project/entryTypes/home--89c47888-bddf-4633-9352-1d5dc3bb452f.yaml
@@ -145,8 +145,8 @@ icon: house
 name: Home
 showSlugField: true
 showStatusField: true
-slugTranslationKeyFormat: ''
+slugTranslationKeyFormat: null
 slugTranslationMethod: site
 titleFormat: '{section.name|raw}'
-titleTranslationKeyFormat: ''
+titleTranslationKeyFormat: null
 titleTranslationMethod: site