@qld-gov-au/qgds-bootstrap5 1.1.41 → 2.0.1

package/src/components/bs5/header/header.stories.js

@@ -2,16 +2,9 @@ import { Header } from "./Header.js";
 import { Navbar } from "../navbar/Navbar.js";
 import { SearchInput } from "../searchInput/SearchInput.js";
 
-// Sample components
-import { Banner } from "../banner/Banner.js";
-import { Footer } from "../footer/Footer.js";
-
 // Mock data
-import menu_state from "../navbar/navbar.variant.menuState.data.json";
-import cobrand_example from "../navbar/navbar.variant.coBrand.data.json";
+import menu_state from "../navbar/navbar.data.json";
 import searchData from "../searchInput/searchInput.data.json";
-import breadcrumbs from "../banner/banner.data.json";
-import footerData from "../footer/footer.data.json";
 
 import masterbrand_variant from "./header.variant.masterBrand.data.json";
 import subbrand_variant from "./header.variant.subBrand.data.json";
@@ -167,6 +160,9 @@ export default {
   argTypes: {},
   parameters: {
     layout: "fullscreen",
+    docs: {
+      story: { height: "400px" },
+    },
   },
 };
 
@@ -214,7 +210,7 @@ export const SubBrand = {
 
 // Co brand
 export const CoBrand = {
-  args: mergeArgs(alternative_palette, cobrand_variant, cobrand_example),
+  args: mergeArgs(alternative_palette, cobrand_variant, menu_state),
   argTypes: arg_types,
   parameters: {
     backgrounds: {
@@ -224,9 +220,7 @@ export const CoBrand = {
   },
   decorators: [
     (Story, context) => {
-      const { variantClass, ...args } = context.args;
-      const bannerDataWithOverride = { ...breadcrumbs, variantClass };
-      const footerDataWithOverride = { ...footerData, variantClass };
+      const args = context.args;
 
       // Generate CSS variables from args
       const cssVariables = Object.keys(args)
@@ -245,8 +239,6 @@ export const CoBrand = {
         </style>
         <main>
           ${Story()}
-          ${new Banner(bannerDataWithOverride).html}
-          ${new Footer(footerDataWithOverride).html}
         </main>
       `;
     },
@@ -265,9 +257,7 @@ export const EndorsedBrand = {
   },
   decorators: [
     (Story, context) => {
-      const { variantClass, ...args } = context.args;
-      const bannerDataWithOverride = { ...breadcrumbs, variantClass };
-      const footerDataWithOverride = { ...footerData, variantClass };
+      const args = context.args;
 
       // Generate CSS variables from args
       const cssVariables = Object.keys(args)
@@ -287,10 +277,6 @@ export const EndorsedBrand = {
         <main>
           ${Story()}
         </main>
-        <div>
-          ${new Banner(bannerDataWithOverride).html}         
-          ${new Footer(footerDataWithOverride).html}
-        </div>
       `;
     },
   ],
@@ -308,9 +294,7 @@ export const StandaloneBrand = {
   },
   decorators: [
     (Story, context) => {
-      const { variantClass, ...args } = context.args;
-      const bannerDataWithOverride = { ...breadcrumbs, variantClass };
-      const footerDataWithOverride = { ...footerData, variantClass };
+      const args = context.args;
 
       // Generate CSS variables from args
       const cssVariables = Object.keys(args)
@@ -330,10 +314,6 @@ export const StandaloneBrand = {
         <main>
           ${Story()}
         </main>
-        <div>
-          ${new Banner(bannerDataWithOverride).html}
-          ${new Footer(footerDataWithOverride).html}
-        </div>
       `;
     },
   ],

package/src/components/bs5/header/header.variant.coBrand.data.json

@@ -1,51 +1,39 @@
 {
-  "icon-root": "./assets/img/svg-icons.svg",
-  "icons": {
-    "menu-icon": "qld__icon__mobile-menu",
-    "search-icon": "qld__icon__search",
-    "close-icon": "qld__icon__close",
-    "chevron_down": "qld__icon__chevron-down"
-  },
-  "sitePreHeader": {
-    "url": {
-      "value": "https://qld.gov.au"
-    },
-    "text": {
-      "value": "www.qld.gov.au"
+  "isCoBrand": true,
+  "preHeader": {
+    "globalLink": {
+      "text": "www.qld.gov.au",
+      "url": "https://qld.gov.au"
     },
-    "CTA": [
+    "actions": [
       {
         "id": "CTAone",
-        "url": {
-          "value": "#"
-        },
-        "text": {
-          "value": "Get support to quit"
-        }
+        "url": "#",
+        "text": "Get support to quit",
+        "icon": "profile"
       }
     ]
   },
-  "siteHeader": {
-    "config": {
-      "masterbrand_enabled": false,
-      "subbrand_enabled": true,
-      "cobrand_enabled": false,
-      "endorsed_enabled": false,
-      "standalone_enabled": false
-    },
-    "url": {
-      "value": "https://qld.gov.au"
-    },
-    "logo": {},
-    "secondaryType": {
-      "logo": {
-        "value": ""
-      },
-      "siteTitle": {
-        "value": "Vaping Exposed"
+  "mainContent": {
+    "url": "https://qld.gov.au",
+    "logo": null,
+    "secondaryLogo": null,
+    "siteTitle": "Department of Seniors, Disability Services and Aboriginal and Torres Strait Islander Partnerships",
+    "subline": ""
+  },
+  "assets": {
+    "SVGSpritePath": "./assets/img/icons-sprite.svg",
+    "siteSearch": {
+      "value": "#",
+      "placeholder": "",
+      "label": "",
+      "formAction": {
+        "url": "https://www.forgov.qld.gov.au/search"
       },
-      "subline": {
-        "value": ""
+      "options": {
+        "borderStyle": {
+          "full": true
+        }
       }
     }
   }

package/src/components/bs5/header/header.variant.endorsed.data.json

@@ -1,172 +1,138 @@
 {
-  "icon-root": "./assets/img/svg-icons.svg",
-  "icons": {
-    "menu-icon": "qld__icon__mobile-menu",
-    "search-icon": "qld__icon__search",
-    "close-icon": "qld__icon__close",
-    "chevron_down": "qld__icon__chevron-down"
-  },
-  "sitePreHeader": {
-    "url": {
-      "value": "https://qld.gov.au"
-    },
-    "text": {
-      "value": "www.qld.gov.au"
+  "isEndorsedBrand": true,
+  "preHeader": {
+    "globalLink": {
+      "text": "www.qld.gov.au",
+      "url": "https://qld.gov.au"
     },
-    "CTA": [
+    "actions": [
       {
         "id": "CTAone",
-        "url": {
-          "value": "#"
-        },
-        "text": {
-          "value": "For Queenslanders"
-        },
-        "dropdown_enabled": true,
-        "dropdown_options": {
-          "dropdown_type": "list",
-          "view_more": true,
-          "label": "View all",
-          "url": "https://www.qld.gov.au/queenslanders",
-          "target": "_blank",
-          "dropdown_config": {
-            "groups": [
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Transport and motoring"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Employment and jobs"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Education and training"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Queensland and its government"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Health and wellbeing"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Community support"
-              }
-            ]
-          }
+        "url": "#",
+        "text": "For Queenslanders",
+        "dropdown": {
+          "type": "list",
+          "viewMore": {
+            "text": "View all",
+            "url": "https://www.qld.gov.au/queenslanders",
+            "target": "_blank"
+          },
+          "items": [
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Transport and motoring"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Employment and jobs"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Education and training"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Queensland and its government"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Health and wellbeing"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Community support"
+            }
+          ]
         }
       },
       {
         "id": "CTAtwo",
-        "url": {
-          "value": "#"
-        },
-        "text": {
-          "value": "Business and Industry"
-        },
-        "dropdown_enabled": true,
-        "dropdown_options": {
-          "dropdown_type": "list",
-          "view_more": true,
-          "label": "View all",
-          "url": "https://www.qld.gov.au/queenslanders",
-          "target": "_blank",
-          "dropdown_config": {
-            "groups": [
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Transport and motoring"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Employment and jobs"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Education and training"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Queensland and its government"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Health and wellbeing"
-              },
-              {
-                "action": "_blank",
-                "url": "#",
-                "label": "Community support"
-              }
-            ]
-          }
+        "url": "#",
+        "text": "Business and Industry",
+        "dropdown": {
+          "type": "list",
+          "viewMore": {
+            "text": "View all",
+            "url": "https://www.qld.gov.au/queenslanders",
+            "target": "_blank"
+          },
+          "items": [
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Transport and motoring"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Employment and jobs"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Education and training"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Queensland and its government"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Health and wellbeing"
+            },
+            {
+              "target": "_blank",
+              "url": "#",
+              "text": "Community support"
+            }
+          ]
         }
       },
       {
         "id": "CTAthree",
-        "url": {
-          "value": "#"
-        },
-        "text": {
-          "value": "Login"
-        },
-        "dropdown_enabled": true,
-        "dropdown_options": {
-          "dropdown_type": "form",
-          "dropdown_config": {
-            "content": "<div></div>"
-          }
+        "url": "#",
+        "text": "Login",
+        "dropdown": {
+          "type": "html",
+          "HTMLContent": "<div></div>"
         }
       }
     ]
   },
-  "siteHeader": {
-    "config": {
-      "masterbrand_enabled": false,
-      "subbrand_enabled": false,
-      "cobrand_enabled": false,
-      "endorsed_enabled": true,
-      "standalone_enabled": false
+  "mainContent": {
+    "url": "https://qld.gov.au",
+    "logo": {
+      "src": "assets/img/endorsed.svg",
+      "altText": "Primary logo Endorsed brand alt text"
     },
-    "url": {
-      "value": "https://qld.gov.au"
+    "secondaryLogo": {
+      "src": "assets/img/endorsed.svg",
+      "altText": "Secondary logo Endorsed brand alt text"
     },
-    "secondaryType": {
-      "logo": {
-        "value": "assets/img/endorsed.svg"
-      },
-      "siteTitle": {
-        "value": "Endorsed brand example"
-      },
-      "subline": {
-        "value": ""
-      }
-    }
+    "siteTitle": "Endorsed brand example",
+    "subline": ""
   },
-  "siteSearchAsset": {
-    "value": "#",
-    "placeholder": "",
-    "label": "",
-    "formAction": {
-      "url": "https://www.forgov.qld.gov.au/search"
-    },
-    "options": {
-      "borderStyle": {
-        "full": true
+  "assets": {
+    "SVGSpritePath": "./assets/img/icons-sprite.svg",
+    "siteSearch": {
+      "value": "#",
+      "placeholder": "",
+      "label": "",
+      "formAction": {
+        "url": "https://www.forgov.qld.gov.au/search"
+      },
+      "options": {
+        "borderStyle": {
+          "full": true
+        }
       }
     }
   }