From d46b54db4b779ac3226b59b2b71d15c9c77361f4 Mon Sep 17 00:00:00 2001 From: Josmar Soares Trigueiro Junior Date: Thu, 17 Oct 2024 17:34:52 -0300 Subject: [PATCH 1/2] feat: add b2b warning topbar inactive organization block --- store/blocks/header/header.jsonc | 108 ++++++++++++++++++------------- 1 file changed, 64 insertions(+), 44 deletions(-) diff --git a/store/blocks/header/header.jsonc b/store/blocks/header/header.jsonc index 0ba92ed..a71c454 100644 --- a/store/blocks/header/header.jsonc +++ b/store/blocks/header/header.jsonc @@ -1,45 +1,64 @@ { "header": { - "blocks": ["header-layout.desktop", "header-layout.mobile"] + "blocks": [ + "header-layout.desktop", + "header-layout.mobile" + ] }, - "header.full": { - "blocks": ["header-layout.desktop", "header-layout.mobile"] + "blocks": [ + "header-layout.desktop", + "header-layout.mobile" + ] }, - "header-layout.desktop": { - "children": ["sticky-layout#desktop"] + "children": [ + "sticky-layout#desktop" + ] }, - "sticky-layout#desktop": { "props": { "blockClass": "sticky-header" }, "children": [ "flex-layout.row#telemarketing", + "flex-layout.row#pendingOrgAlert", "flex-layout.row#organization", "flex-layout.row#desktop", "flex-layout.row#headerStripe", "quotes-locking-modal" ] }, - "flex-layout.row#telemarketing": { - "children": ["telemarketing"], + "children": [ + "telemarketing" + ], + "props": { + "blockClass": [ + "bg-blue-medium" + ], + "fullWidth": true + } + }, + "flex-layout.row#pendingOrgAlert": { + "children": [ + "b2b-warning-topbar-inactive-organization" + ], "props": { - "blockClass": ["bg-blue-medium"], "fullWidth": true } }, - "flex-layout.row#organization": { - "children": ["b2b-user-widget"], + "children": [ + "b2b-user-widget" + ], "props": { - "blockClass": ["bg-fresh-blue-lightest"], + "blockClass": [ + "bg-fresh-blue-lightest" + ], "fullWidth": true } }, - "flex-layout.row#desktop": { "props": { "verticalAlign": "center", @@ -55,15 +74,15 @@ "minicart.v2" ] }, - "flex-layout.col#search-bar": { - "children": ["search-bar"], + "children": [ + "search-bar" + ], "props": { "paddingLeft": 8, "width": "grow" } }, - "flex-layout.row#headerStripe": { "props": { "blockClass": "headerStripe", @@ -83,49 +102,44 @@ "check-permission#reseller" ] }, - "rich-text#headStripe1": { "props": { "blockClass": "HeaderStripeText", "text": "[Today's Deals](/deals)" } }, - "rich-text#headStripe2": { "props": { "blockClass": "HeaderStripeText", "text": "[New Releases](/releases)" } }, - "rich-text#headStripe3": { "props": { "blockClass": "HeaderStripeText", "text": "[Top Sales](/top-sales)" } }, - "rich-text#headStripe4": { "props": { "blockClass": "HeaderStripeText", "text": "[Costumer Services](/services)" } }, - "rich-text#headStripe5": { "props": { "blockClass": "HeaderStripeText", "text": "[Gift Cards](/gift-cards)" } }, - "flex-layout.col#logo-desktop": { "props": { "verticalAlign": "middle" }, - "children": ["logo"] + "children": [ + "logo" + ] }, - "logo": { "props": { "title": "Logo", @@ -134,11 +148,11 @@ "width": "123" } }, - "header-layout.mobile": { - "children": ["sticky-layout#mobile"] + "children": [ + "sticky-layout#mobile" + ] }, - "sticky-layout#mobile": { "children": [ "flex-layout.row#mobileHeader", @@ -149,11 +163,11 @@ "blockClass": "headerMobile" } }, - "flex-layout.row#mobileHeader": { - "children": ["flex-layout.col#mobileHeader"] + "children": [ + "flex-layout.col#mobileHeader" + ] }, - "slider-layout#menuLinks": { "props": { "itemsPerPage": { @@ -174,16 +188,22 @@ "rich-text#headStripe5" ] }, - "flex-layout.col#mobileHeader": { - "children": ["flex-layout.row#mobile", "flex-layout.row#mobileSearch"], + "children": [ + "flex-layout.row#mobile", + "flex-layout.row#mobileSearch" + ], "props": { "blockClass": "main-header-mobile" } }, - "flex-layout.row#mobile": { - "children": ["drawer", "logo", "check-permission#login", "minicart.v2"], + "children": [ + "drawer", + "logo", + "check-permission#login", + "minicart.v2" + ], "props": { "preventHorizontalStretch": true, "preserveLayoutOnMobile": true, @@ -191,7 +211,6 @@ "fullWidth": true } }, - "link#orderQuote": { "props": { "label": "My Quotes", @@ -199,39 +218,40 @@ "blockClass": "orderQuote" } }, - "link#profile": { - "children": ["icon-profile"], + "children": [ + "icon-profile" + ], "props": { "href": "/account", "blockClass": "accountLink" } }, - "flex-layout.row#mobileSearch": { - "children": ["search-bar#mobile"], + "children": [ + "search-bar#mobile" + ], "props": { "blockClass": "searchBarMobile" } }, - "search-bar#mobile": { - "blocks": ["autocomplete-result-list.v2#mobile"], + "blocks": [ + "autocomplete-result-list.v2#mobile" + ], "props": { "openAutocompleteOnFocus": true, "blockClass": "searchMobile" } }, - "login": { "props": { "iconLabel": "Hello, Sign in" } }, - "login#mobile": { "props": { "iconLabel": "Sign in" } } -} +} \ No newline at end of file From 3ebeb636055c84358b289093e0e7580425377da5 Mon Sep 17 00:00:00 2001 From: Josmar Soares Trigueiro Junior Date: Thu, 17 Oct 2024 17:36:22 -0300 Subject: [PATCH 2/2] doc: update changelog file --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 674094c..6956a54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- `b2b-warning-topbar-inactive-organization` block ## [3.0.2] - 2024-10-15 ### Added