Skip to content

♻️ [Amp story shopping] Change "vendor" to "brand" #37958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
processprocess merged 2 commits into from
Mar 29, 2022
Merged

♻️ [Amp story shopping] Change "vendor" to "brand" #37958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c374524
Change vendor to brand.
processprocess Mar 25, 2022
5cd8a7f
Merge branch 'main' into brand
processprocess Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/amp-story/amp-story-shopping.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -77,7 +77,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
Expand All @@ -102,7 +102,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down Expand Up @@ -139,7 +139,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -160,7 +160,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
Expand Down Expand Up @@ -188,7 +188,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down
2 changes: 1 addition & 1 deletion examples/amp-story/shopping/remote.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.0,
"productPriceCurrency": "JPY",
"productImages": [
Expand Down
12 changes: 6 additions & 6 deletions examples/visual-tests/amp-story/amp-story-shopping-landscape.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -78,7 +78,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -107,7 +107,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down Expand Up @@ -145,7 +145,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -166,7 +166,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -194,7 +194,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down
12 changes: 6 additions & 6 deletions examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -77,7 +77,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -107,7 +107,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down Expand Up @@ -144,7 +144,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -165,7 +165,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -193,7 +193,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down
12 changes: 6 additions & 6 deletions examples/visual-tests/amp-story/amp-story-shopping-rtl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -77,7 +77,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -107,7 +107,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down Expand Up @@ -144,7 +144,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -165,7 +165,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -193,7 +193,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down
12 changes: 6 additions & 6 deletions examples/visual-tests/amp-story/amp-story-shopping.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -77,7 +77,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -106,7 +106,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down Expand Up @@ -144,7 +144,7 @@
"productUrl": "https://www.google.com",
"productId": "lamp",
"productTitle": "Brass Lamp",
"productVendor": "Lamp Co",
"productBrand": "Lamp Co",
"productPrice": 799.00,
"productPriceCurrency": "USD",
"productImages": [
Expand All @@ -165,7 +165,7 @@
"productUrl": "https://www.google.com",
"productId": "art",
"productTitle": "Abstract Art",
"productVendor": "V. Artsy",
"productBrand": "V. Artsy",
"productPrice": 1200.00,
"productPriceCurrency": "INR",
"productImages": [{"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "art"}],
Expand Down Expand Up @@ -193,7 +193,7 @@
"productUrl": "https://www.google.com",
"productId": "flowers",
"productTitle": "Flowers",
"productVendor": "Very Long Flower Company Name",
"productBrand": "Very Long Flower Company Name",
"productPrice": 10.00,
"productPriceCurrency": "USD",
"productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ amp-story-shopping-attachment a {
margin: 1.5em var(--i-amphtml-shopping-attachment-horizontal-spacing) 2em !important;
}

.i-amphtml-amp-story-shopping-pdp-header-vendor {
.i-amphtml-amp-story-shopping-pdp-header-brand {
font-weight: 500 !important;
font-size: 1.1em !important;
line-height: 0.9em !important;
Expand Down
10 changes: 5 additions & 5 deletions extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
return (
<div class="i-amphtml-amp-story-shopping-pdp">
<div class="i-amphtml-amp-story-shopping-pdp-header">
{activeProductData.productVendor && (
<span class="i-amphtml-amp-story-shopping-pdp-header-vendor">
{activeProductData.productVendor}
{activeProductData.productBrand && (
<span class="i-amphtml-amp-story-shopping-pdp-header-brand">
{activeProductData.productBrand}
</span>
)}
<div class="i-amphtml-amp-story-shopping-pdp-header-title-and-price">
Expand Down Expand Up @@ -436,9 +436,9 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
backgroundImage: `url("${data['productImages'][0].url}")`,
}}
></div>
{data['productVendor'] && (
{data['productBrand'] && (
<div class="i-amphtml-amp-story-shopping-plp-card-brand">
{data['productVendor']}
{data['productBrand']}
</div>
)}
<div class="i-amphtml-amp-story-shopping-plp-card-title">
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describes.realWin(
productUrl: 'https://www.google.com',
productId: 'lamp',
productTitle: 'Brass Lamp',
productVendor: 'Lamp Co',
productBrand: 'Lamp Co',
productPrice: 799.0,
productPriceCurrency: 'USD',
productImages: [
Expand All @@ -63,7 +63,7 @@ describes.realWin(
productUrl: 'https://www.google.com',
productId: 'art',
productTitle: 'Abstract Art',
productVendor: 'V. Artsy',
productBrand: 'V. Artsy',
productPrice: 1200.0,
productPriceCurrency: 'INR',
productImages: [
Expand Down
10 changes: 5 additions & 5 deletions extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describes.realWin(
'productUrl': 'https://www.google.com',
'productId': 'lamp',
'productTitle': 'Brass Lamp',
'productVendor': 'Lamp Co',
'productBrand': 'Lamp Co',
'productPrice': 799.0,
'productPriceCurrency': 'USD',
'productImages': [
Expand All @@ -50,7 +50,7 @@ describes.realWin(
'productUrl': 'https://www.google.com',
'productId': 'art',
'productTitle': 'Abstract Art',
'productVendor': 'V. Artsy',
'productBrand': 'V. Artsy',
'productPrice': 1200.0,
'productPriceCurrency': 'JPY',
'productImages': [
Expand All @@ -71,7 +71,7 @@ describes.realWin(
'productUrl': 'https://www.google.com',
'productId': 'chair',
'productTitle': 'Yellow chair',
'productVendor': 'Chair Co.',
'productBrand': 'Chair Co.',
'productPrice': 1000.0,
'productPriceCurrency': 'BRL',
'productTagText': 'The perfectly imperfect yellow chair',
Expand All @@ -91,7 +91,7 @@ describes.realWin(
'productUrl': 'https://www.google.com',
'productId': 'flowers',
'productTitle': 'Flowers',
'productVendor': 'Very Long Flower Company Name',
'productBrand': 'Very Long Flower Company Name',
'productPrice': 10.0,
'productPriceCurrency': 'USD',
'productIcon':
Expand Down Expand Up @@ -167,7 +167,7 @@ describes.realWin(
'productUrl': 'https://www.google.com',
'productId': 'art',
'productTitle': 'Abstract Art',
'productVendor': 'V. Artsy',
'productBrand': 'V. Artsy',
'productPrice': 1200.0,
'productPriceCurrency': 'JPY',
'productImages': [
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story/1.0/amp-story-store-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export let InteractiveReactData;
* @typedef {{
* productId: string,
* productTitle: string,
* productVendor: string,
* productBrand: string,
* productPrice: number,
* productPriceCurrency: string,
* productIcon: string,
Expand Down