Skip to content

Commit

Permalink
Merge pull request #13 from Josmar-jr/feat/add-b2b-warning-topbar-ina…
Browse files Browse the repository at this point in the history
…ctive-org-block

Feat/add b2b warning topbar inactive org block
  • Loading branch information
ataideverton authored Dec 9, 2024
2 parents 78338e3 + 3ebeb63 commit d89c550
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 44 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
108 changes: 64 additions & 44 deletions store/blocks/header/header.jsonc
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": {
Expand All @@ -174,64 +188,70 @@
"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,
"colSizing": "auto",
"fullWidth": true
}
},

"link#orderQuote": {
"props": {
"label": "My Quotes",
"href": "/b2b-quotes",
"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"
}
}
}
}

0 comments on commit d89c550

Please sign in to comment.