group changes

models/Badge.yaml

@@ -1,13 +1,17 @@
 type: object
 name: Badge
 label: Badge
+fieldGroups:
+  - name: settings
+    label: Settings
 fields:
+  - type: string
+    name: label
+    label: Label
+    description: The text in the badge
   - type: string
     name: elementId
+    group: settings
     label: Element ID
     description: The unique ID for an HTML element, must not contain whitespace
     default: ''
-  - type: string
-    name: label
-    label: Label
-    description: The text in the badge

models/Button.yaml

@@ -1,12 +1,12 @@
 type: object
 name: Button
 label: Button
+fieldGroups:
+  - name: styles
+    label: Styles
+  - name: settings
+    label: Settings
 fields:
-  - type: string
-    name: elementId
-    label: Element ID
-    description: The unique ID for an HTML element, must not contain whitespace
-    default: ''
   - type: string
     name: label
     label: Label
@@ -22,10 +22,12 @@ fields:
     default: '/'
   - type: boolean
     name: showIcon
+    group: styles
     label: Show icon
     default: false
   - type: enum
     name: icon
+    group: styles
     label: Icon
     options:
       - arrowLeft
@@ -39,13 +41,15 @@ fields:
     default: arrowLeft
   - type: enum
     name: iconPosition
+    group: styles
     label: Icon position
     options:
       - left
       - right
     default: right
   - type: enum
     name: style
+    group: styles
     label: Style
     options:
       - label: Link
@@ -55,3 +59,9 @@ fields:
       - label: Secondary
         value: secondary
     default: secondary
+  - type: string
+    name: elementId
+    group: settings
+    label: Element ID
+    description: The unique ID for an HTML element, must not contain whitespace
+    default: ''

models/CheckboxFormControl.yaml

@@ -1,6 +1,9 @@
 type: object
 name: CheckboxFormControl
 label: Checkbox
+fieldGroups:
+  - name: styles
+    label: Styles
 fields:
   - type: string
     name: name
@@ -16,6 +19,7 @@ fields:
     default: false
   - type: enum
     name: width
+    group: styles
     label: Width
     options:
       - label: Full

models/Config.yaml

@@ -2,23 +2,6 @@ type: data
 name: Config
 label: Site configuration
 fields:
-  - type: enum
-    name: backgroundColor
-    label: Background color
-    options:
-      - label: White
-        value: bg-white
-      - label: Base
-        value: bg-base
-      - label: Primary
-        value: bg-primary
-      - label: Secondary
-        value: bg-secondary
-      - label: Complementary 1
-        value: bg-complementary-1
-      - label: Complementary 2
-        value: bg-complementary-2
-    default: bg-white
   - type: model
     name: navBar
     label: Navbar configuration

models/ContactBlock.yaml

@@ -1,6 +1,9 @@
 type: object
 name: ContactBlock
 label: Contact
+fieldGroups:
+  - name: settings
+    label: Settings
 fields:
   - type: string
     name: phoneNumber
@@ -21,4 +24,8 @@ fields:
     name: addressAltText
     label: Address alt text
   - type: string
-    name: elementId
+    name: elementId
+    group: settings
+    label: Element ID
+    description: The unique ID for an HTML element, must not contain whitespace
+    default: ''

models/ContactSection.yaml

@@ -6,10 +6,10 @@ extends:
 groups:
   - sectionComponent
 fieldGroups:
-  - name: settings
-    label: Settings
   - name: styles
     label: Styles
+  - name: settings
+    label: Settings
 fields:
   - name: colors
     default: colors-h
@@ -32,6 +32,7 @@ fields:
   - type: enum
     name: variant
     label: Arrangement
+    group: styles
     options:
       - label: Contact form with feature on the left
         value: variant-a
@@ -40,6 +41,7 @@ fields:
     default: variant-b
   - type: model
     name: badge
+    group: styles
     label: Badge
     models:
       - Badge
@@ -56,7 +58,7 @@ fields:
       - FormBlock
     default:
       type: FormBlock
-      idAttr: contact-form
+      elementId: contact-form
       action: /.netlify/functions/submission_created
       destination: ''
       fields:

models/CtaSection.yaml

@@ -6,10 +6,10 @@ extends:
 groups:
   - sectionComponent
 fieldGroups:
-  - name: settings
-    label: Settings
   - name: styles
     label: Styles
+  - name: settings
+    label: Settings
 fields:
   - type: enum
     name: variant
@@ -22,6 +22,7 @@ fields:
     default: variant-b
   - type: model
     name: badge
+    group: styles
     label: Badge
     models:
       - Badge

models/EmailFormControl.yaml

@@ -1,6 +1,9 @@
 type: object
 name: EmailFormControl
 label: Email
+fieldGroups:
+  - name: styles
+    label: Styles
 fields:
   - type: string
     name: name
@@ -19,6 +22,7 @@ fields:
     default: false
   - type: enum
     name: width
+    group: styles
     label: Width
     options:
       - label: Full

models/FeaturedPeopleSection.yaml

@@ -6,13 +6,14 @@ extends:
 groups:
   - sectionComponent
 fieldGroups:
-  - name: settings
-    label: Settings
   - name: styles
     label: Styles
+  - name: settings
+    label: Settings
 fields:
   - type: enum
     name: variant
+    group: styles
     label: Arrangement
     options:
       - label: Four columns, person info with image at the top
@@ -24,6 +25,7 @@ fields:
     default: variant-a
   - type: model
     name: badge
+    group: styles
     label: Badge
     models:
       - Badge

models/FeaturedPostsSection.yaml

@@ -6,13 +6,14 @@ extends:
 groups:
   - sectionComponent
 fieldGroups:
-  - name: settings
-    label: Settings
   - name: styles
     label: Styles
+  - name: settings
+    label: Settings
 fields:
   - type: enum
     name: variant
+    group: styles
     label: Arrangement
     options:
       - label: Three columns, post thumbnail at the top
@@ -22,6 +23,7 @@ fields:
     default: variant-b
   - type: model
     name: badge
+    group: styles
     label: Badge
     models:
       - Badge

models/Footer.yaml

@@ -1,9 +1,15 @@
 type: object
 name: Footer
 label: Footer
+fieldGroups:
+  - name: styles
+    label: Styles
+  - name: settings
+    label: Settings
 fields:
   - type: enum
     name: colors
+    group: styles
     label: Colors
     options:
       - label: Base foreground on white background
@@ -27,21 +33,19 @@ fields:
     default: colors-a
   - type: enum
     name: width
+    group: styles
     label: Width
     options:
       - wide
       - full
     default: wide
-  - type: string
-    name: title
-    label: Title
-  - type: boolean
-    name: isTitleVisible
-    label: Display title
   - type: model
     name: logo
     label: Logo
     models: [ImageBlock]
+  - type: string
+    name: title
+    label: Title
   - type: markdown
     name: text
     label: Text

models/FormBlock.yaml

@@ -1,16 +1,10 @@
 type: object
 name: FormBlock
 label: Form
+fieldGroups:
+  - name: settings
+    label: Settings
 fields:
-  - type: string
-    name: idAttr
-    label: ID (used for id and name attributes)
-  - type: string
-    name: action
-    label: Action (form submission URL)
-  - type: string
-    name: destination
-    label: Destination (email to redirect responses)
   - type: list
     name: fields
     label: Fields
@@ -25,3 +19,16 @@ fields:
   - type: string
     name: submitLabel
     label: Submit button label
+  - type: string
+    name: elementId
+    group: settings
+    label: Element ID
+    description: The unique ID used for id and name attributes, must not contain whitespace
+  - type: string
+    name: action
+    group: settings
+    label: Action (form submission URL)
+  - type: string
+    name: destination
+    group: settings
+    label: Destination (email to redirect responses)

models/HeroSection.yaml

@@ -6,10 +6,10 @@ extends:
 groups:
   - sectionComponent
 fieldGroups:
-  - name: settings
-    label: Settings
   - name: styles
     label: Styles
+  - name: settings
+    label: Settings
 fields:
   - name: colors
     default: colors-f
@@ -29,21 +29,9 @@ fields:
     default: none
   - name: textAlign
     default: left
-  - type: enum
-    name: variant
-    label: Arrangement
-    options:
-      - label: Hero with feature on the right
-        value: variant-a
-      - label: Hero with feature on the left
-        value: variant-b
-      - label: Hero with feature at the top
-        value: variant-c
-      - label: Hero with feature at the bottom
-        value: variant-d
-    default: variant-a
   - type: model
     name: badge
+    group: styles
     label: Badge
     models:
       - Badge
@@ -92,6 +80,15 @@ fields:
       type: ImageBlock
       url: /images/hero.png
       altText: Hero section image
+  - type: enum
+    name: featurePosition
+    label: Feature position
+    options:
+      - right
+      - left
+      - top
+      - bottom
+    default: right
   - type: model
     name: backgroundImage
     group: styles