Skip to content
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.

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

Mwpw 164093: Adobe Home 'Pricing Widget' merch card #3384

Open
wants to merge 111 commits into
base: stage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
2ae5836
MWPW-162385 add wcsApiKey attribute
npeltier Nov 14, 2024
541f98e
Merge branch 'stage' of github.com:adobecom/milo into MWPW-162385
npeltier Nov 15, 2024
e445eed
MWPW-161355: Update MAS documentation (#3135)
yesil Nov 18, 2024
b99fc0e
Merge branch 'ccd' into MWPW-162385
npeltier Nov 19, 2024
935341c
MWPW-161845: basic analytics on mas cards (#3206)
3ch023 Nov 19, 2024
6f22877
MWPW-159191: MAS Freyja support (#3209)
yesil Nov 21, 2024
da55e2f
MWPW-161804: Merch card style auditing (#3216)
Axelcureno Nov 21, 2024
ec2d95f
Added space after price recurrence label for display-per-unit prices …
st-angelo-adobe Nov 21, 2024
08c281e
Merge branch 'main' of github.com:adobecom/milo into MWPW-162385
npeltier Nov 22, 2024
2dd8fd8
adding example
npeltier Nov 22, 2024
df69264
Merge branch 'ccd' of github.com:adobecom/milo into MWPW-162385
npeltier Nov 22, 2024
4c688d0
MWPW-162933: merge mas modules (#3248)
yesil Nov 26, 2024
f9680ce
MWPW-160755 - add tests for CCD cards (#3256)
afmicka Nov 26, 2024
2b8083b
Merge branch 'ccd' of github.com:adobecom/milo into MWPW-162385
npeltier Nov 27, 2024
3bcaa80
MWPW-162385 add wcsApiKey attribute (#3203)
afmicka Nov 28, 2024
211c7d4
MWPW-163041: analytics fix (#3257)
3ch023 Nov 29, 2024
bcaa237
Fix overriding of border style on merch cards (#3278)
st-angelo-adobe Nov 29, 2024
94a424e
Bump timeout from 2 to 10 sec (#3282)
3ch023 Nov 29, 2024
ea01ee0
MWPW-163479: Switch to Spectrum CSS from SWC
yesil Dec 2, 2024
0155146
update doc style
yesil Dec 2, 2024
e904710
update doc style
yesil Dec 2, 2024
8ef2ecf
update doc style
yesil Dec 2, 2024
176d1f7
update doc style
yesil Dec 2, 2024
6fbef16
update doc style
yesil Dec 2, 2024
6d87b20
update doc style
yesil Dec 2, 2024
0d8ca95
Update styles
yesil Dec 2, 2024
a52d00a
update docs
yesil Dec 2, 2024
f50bfa9
Keep SWC logic as an option
yesil Dec 3, 2024
49ae33e
MWPW-161645: lana logging for CCD (#3271)
yesil Dec 3, 2024
2fb80c9
fix gaps with Spectrum CSS support
yesil Dec 4, 2024
6ecca9a
Merge remote-tracking branch 'upstream/ccd' into MWPW-163479
yesil Dec 4, 2024
7877dbf
update version
yesil Dec 4, 2024
1946ac7
fix gaps reported by ccd teamm
yesil Dec 5, 2024
17d0906
address gaps
yesil Dec 5, 2024
3ffabfa
address gaps
yesil Dec 5, 2024
fa5d083
address gaps
yesil Dec 5, 2024
1bad4d2
address gaps
yesil Dec 5, 2024
cae858b
address gaps
yesil Dec 5, 2024
baf80b4
fix for MWPW-163718
yesil Dec 6, 2024
c79ce78
addressed design gaps.
yesil Dec 6, 2024
c5f27bf
bump the version
yesil Dec 6, 2024
68a4328
Merge remote-tracking branch 'upstream/stage' into ccd
3ch023 Dec 6, 2024
dc0f9c7
add build artifacts
3ch023 Dec 6, 2024
796ef80
Update colors based on CCD app
yesil Dec 9, 2024
f05b400
Update colors based on CCD app
yesil Dec 9, 2024
528817d
build without source maps
yesil Dec 9, 2024
f738897
Merge branch 'ccd' of github.com:adobecom/milo into MWPW-163479
yesil Dec 9, 2024
5b9a917
update Nala tests
afmicka Dec 9, 2024
584bc90
fix lint
afmicka Dec 9, 2024
0fe6648
reset box-sizing for merch-card elements
yesil Dec 9, 2024
a92795d
Merge branch 'MWPW-163479' of github.com:adobecom/milo into MWPW-163479
yesil Dec 9, 2024
ef8bf8d
Force box-sizing on merch-card
yesil Dec 10, 2024
1542e75
update styles: box-sizing
yesil Dec 10, 2024
7d39fd0
Merge branch 'stage' of github.com:adobecom/milo into MWPW-163479
yesil Dec 10, 2024
6207c0f
fix ccd gallery
yesil Dec 10, 2024
da77c52
update version
yesil Dec 10, 2024
d52f154
limit ccd price style to their variants
yesil Dec 10, 2024
4f632c2
limit ccd price style to suggest variant
yesil Dec 10, 2024
3b5f734
preserve white spaces in prices section
yesil Dec 11, 2024
8235b2a
fix spacing in price
yesil Dec 11, 2024
89a2a94
Update version
yesil Dec 11, 2024
1623cae
Update doc
yesil Dec 11, 2024
145627c
update cards
yesil Dec 11, 2024
6b8e8da
update gallery styles
yesil Dec 11, 2024
3cd086a
make the gallery responsive
yesil Dec 11, 2024
b170145
align slice card ctas
yesil Dec 11, 2024
ced06ed
cards resize responsively
yesil Dec 11, 2024
c2bdc87
fix 1x of gap issue
yesil Dec 11, 2024
a7b12d7
fix description text alignement
yesil Dec 11, 2024
2c01de0
fix gaps in minimal widths
yesil Dec 11, 2024
355e8eb
fix the gallery layout
yesil Dec 11, 2024
e6f5508
Merge branch 'stage' of github.com:adobecom/milo into MWPW-163479
yesil Dec 12, 2024
d8803ca
Fix strikethrough price color in promos
yesil Dec 12, 2024
abb166f
Update nala tests
yesil Dec 12, 2024
1f414a6
MWPW-164177: clean up card style on fragment
yesil Dec 12, 2024
4127767
Added a new section to ccd gallery
yesil Dec 12, 2024
5d812fa
update mas version
yesil Dec 12, 2024
5291737
MWPW-164093: Adobe Home pricing widget merch card
Axelcureno Dec 16, 2024
fcf026e
Update pricing widget fragment mapping for improved heading and body …
Axelcureno Dec 16, 2024
d799a1c
Update pricing widget fragment mapping for improved heading and body …
Axelcureno Dec 16, 2024
4a7da24
Update pricing widget styles to enforce box-sizing property
Axelcureno Dec 16, 2024
69cfa63
fix missing default spectrum css button style
yesil Dec 17, 2024
a448349
review comments addressed
Axelcureno Dec 17, 2024
4d469be
review comments addressed and new adobe home page
Axelcureno Dec 17, 2024
642abaf
Merge branch 'MWPW-163479' into MWPW-164093
Axelcureno Dec 17, 2024
ea4a0e4
updated deps
Axelcureno Dec 17, 2024
ae8f846
review comments
Axelcureno Dec 19, 2024
807188c
Merge branch 'stage' into MWPW-164093
Axelcureno Jan 9, 2025
a7f82b0
updated deps
Axelcureno Jan 9, 2025
6108523
Merge branch 'stage' into MWPW-164093
Axelcureno Jan 13, 2025
46ea511
updated deps
Axelcureno Jan 13, 2025
a3e991a
ignore line
Axelcureno Jan 14, 2025
1707695
switch to swc
Axelcureno Jan 16, 2025
0e062b0
wip
Axelcureno Jan 16, 2025
3d1d993
swc
Axelcureno Jan 16, 2025
f60b9cc
wip
Axelcureno Jan 16, 2025
bf2de2d
wip
Axelcureno Jan 16, 2025
eab5f9f
wip
Axelcureno Jan 16, 2025
4c91498
wip
Axelcureno Jan 16, 2025
4aabd78
wip
Axelcureno Jan 16, 2025
3e43909
wip
Axelcureno Jan 16, 2025
87ac969
wip
Axelcureno Jan 16, 2025
e84a14a
Update adobe-home.html
Axelcureno Jan 16, 2025
d859046
theme switch
Axelcureno Jan 16, 2025
9ab7996
dark theme on ah pricing widget card
Axelcureno Jan 21, 2025
2adec6e
Merge branch 'stage' into MWPW-164093
st-angelo-adobe Jan 22, 2025
cf1cc7a
single and double variants, title and description max count, styles p…
st-angelo-adobe Jan 23, 2025
74ece86
price styles changes
st-angelo-adobe Jan 23, 2025
869e4d9
more style changes
st-angelo-adobe Jan 23, 2025
de9f147
Merge branch 'stage' into MWPW-164093
Axelcureno Jan 24, 2025
a4ce526
updated deps
Axelcureno Jan 24, 2025
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
288 changes: 240 additions & 48 deletions libs/deps/mas/mas.js

Large diffs are not rendered by default.

328 changes: 260 additions & 68 deletions libs/deps/mas/merch-card.js

Large diffs are not rendered by default.

288 changes: 240 additions & 48 deletions libs/features/mas/dist/mas.js

Large diffs are not rendered by default.

151 changes: 151 additions & 0 deletions libs/features/mas/docs/adobe-home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
<!doctype html>
<html>
<head>
<meta charset="UTF-8" />
<title>Adobe Home Gallery</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="spectrum.css" />
<link rel="stylesheet" href="styles.css" />
<link
rel="stylesheet"
href="https://p.typekit.net/p.css?s=1&k=hah7vzn&ht=tk&f=7180.7181.7182.7183.22474.22749.22750.22751.22753&a=8634977&app=typekit&e=css"
/>
<link rel="stylesheet" href="https://use.typekit.net/hah7vzn.css" />
<script src="/libs/deps/lit-all.min.js" type="module"></script>

<script>
const ENVS = {
qa: 'qa-odin',
stage: 'stage-odin',
prod: 'odin',
};
const href = window.location.href;
const envOverride = new URL(href).searchParams.get('aem.env');
const env =
envOverride && ENVS[envOverride]
? ENVS[envOverride]
: ENVS.prod;
const meta = document.createElement('meta');
meta.name = 'aem-base-url';
meta.content = `https://${env}.adobe.com`;
document.head.appendChild(meta);

const params = new URLSearchParams(document.location.search);
function toggleTheme(theme) {
document.body.className = 'spectrum spectrum--medium';
document.body.classList.add(`spectrum--${theme}`);
params.set('theme', theme);
history.replaceState(
null,
'',
`${location.pathname}?${params}`,
);
}
</script>
<script type="module" src="../dist/mas.js"></script>

<script type="module">
// mas-commerce-service
const masCommerceService = document.createElement(
'mas-commerce-service',
);
['locale', 'language', 'env'].forEach((attribute) => {
const value = params.get(attribute);
if (value) masCommerceService.setAttribute(attribute, value);
});
masCommerceService.setAttribute('host-env', 'prod');
masCommerceService.setAttribute('lana-tags', 'ah');
masCommerceService.setAttribute('lana-sample-rate', '100'); // optional, default value is set to '1'
document.head.appendChild(masCommerceService);
</script>
</head>

<body class="spectrum spectrum--medium spectrum--light">
<main>
<div class="gallery-content">
<h1 id="ah-gallery" tabindex="-1">
Adobe Home Gallery
<a
class="header-anchor"
href="#ah-gallery"
title="Permalink to this heading"
>#</a
>
</h1>
Switch Theme:
<a
class="spectrum-Link spectrum-Link--secondary theme-toggle"
href="javascript:toggleTheme('dark');"
>Dark</a
>
OR
<a
class="spectrum-Link spectrum-Link--secondary theme-toggle"
href="javascript:toggleTheme('light');"
>Light</a
>

<div class="adobe-home-container">
<h2 id="ah-pricing-widget" tabindex="-1">
Adobe Home Pricing Widget
<a
class="header-anchor"
href="#ah-pricing-widget"
title="Permalink to this heading"
>#</a
>
</h2>

<h3 class="size-header" tabindex="-1">Triple Plan</h3>

<div class="three-merch-cards ah-pricing-widget">
<merch-card
><aem-fragment
fragment="44520fdc-f6e1-4c21-8978-9cd25a1be158"
></aem-fragment
></merch-card>
<merch-card
><aem-fragment
fragment="dc4605b3-64ec-4b21-981a-b363835abe0d"
></aem-fragment
></merch-card>
<merch-card
><aem-fragment
fragment="dca47eeb-eab3-4000-84ad-c70d41ba2b01"
></aem-fragment
></merch-card>
</div>

<h3 class="size-header" tabindex="-1">Double Plan</h3>

<div class="two-merch-cards ah-pricing-widget">
<merch-card
><aem-fragment
fragment="78fd4254-31a3-4191-b19b-031d9857300b"
></aem-fragment
></merch-card>
<merch-card
><aem-fragment
fragment="96727fef-fed2-410e-80d2-1515fd397f8e"
></aem-fragment
></merch-card>
</div>

<h3 class="size-header" tabindex="-1">Single Plan</h3>

<div class="one-merch-card ah-pricing-widget">
<merch-card
><aem-fragment
fragment="8058f4b0-309b-44be-9ae8-1494d8cfa6c4"
></aem-fragment
></merch-card>
</div>
</div>
</div>
</main>
<script>
const theme = params.get('theme');
if (theme) toggleTheme(theme);
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions libs/features/mas/docs/ccd.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<main>
<div class="gallery-content">

<h1 id="ccd-gallery" tabindex="-1">CCD Gallery <a class="header-anchor" href="#ccd-gallery" href="#ccd-gallery" title="Permalink to this heading">#</a></h1>
Switch Theme: <a class="spectrum-Link pectrum-Link--secondary" href="javascript:toggleTheme('darkest');">Darkest</a> OR <a class="spectrum-Link pectrum-Link--secondary" href="javascript:toggleTheme('light');">Light</a>
<h1 id="ccd-gallery" tabindex="-1">CCD Gallery <a class="header-anchor" href="#ccd-gallery" title="Permalink to this heading">#</a></h1>
Switch Theme: <a class="spectrum-Link spectrum-Link--secondary" href="javascript:toggleTheme('darkest');">Darkest</a> OR <a class="spectrum-Link pectrum-Link--secondary" href="javascript:toggleTheme('light');">Light</a>

<h2 id="ccd-slice-card" tabindex="-1">CCD Slice Cards <a class="header-anchor" href="#ccd-slice-card" title="Permalink to this heading">#</a></h2>
<div class="three-merch-cards ccd-slice">
Expand Down
Loading
Loading