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.

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

MWPW-163684 Set trial limit and show upsell #938

Merged
merged 5 commits into from
Jan 13, 2025
Merged

MWPW-163684 Set trial limit and show upsell #938

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7595b6a
Set trial limit and show upsell
TsayAdobe Jan 9, 2025
7de75d0
Merge branch 'stage' into MWPW-163684
TsayAdobe Jan 9, 2025
5f360ff
ESLint fixes
TsayAdobe Jan 9, 2025
57c8180
Fix color
TsayAdobe Jan 13, 2025
5a0e6e0
Merge branch 'stage' into MWPW-163684
TsayAdobe Jan 13, 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
1 change: 1 addition & 0 deletions acrobat/blocks/verb-widget/limits.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const LIMITS = {
'image/png',
],
multipleFiles: true,
trial: 2,
},
};

Expand Down
121 changes: 121 additions & 0 deletions acrobat/blocks/verb-widget/verb-widget.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
display: flex;
justify-content: space-between;
align-items: center;
min-height: 100%;
}

.verb-col {
Expand Down Expand Up @@ -277,6 +278,66 @@
text-decoration: none;
}

.verb-upsell {
color: rgb(34, 34, 34);

Check failure on line 282 in acrobat/blocks/verb-widget/verb-widget.css

View workflow job for this annotation

GitHub Actions / runner / stylelint (18.x) 

[stylelint] reported by reviewdog 🐶
Expected modern color-function notation

Raw Output:
message:"Expected modern color-function notation"  location:{path:"/home/runner/work/dc/dc/acrobat/blocks/verb-widget/verb-widget.css"  range:{start:{line:282  column:10}}}  severity:ERROR  source:{name:"stylelint"  url:"https://stylelint.io/"}  code:{value:"color-function-notation"}
TsayAdobe marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
flex-direction: column;
width: 774.75px;
height: 532px;
position: static;
justify-content: normal;
align-items: normal;
}

.verb-upsell-heading {
display: inline;
font-size: 32px;
font-weight: 700;
line-height: 40px;
margin-bottom: 8px;
}

.verb-upsell-heading + .verb-upsell-heading {
margin-left: 5px;
}

.verb-upsell-heading-nopayment {
font-weight: 400 !important;
}

.verb-upsell-bullets-heading {
margin-bottom: -4px;
margin-top: 24px;
padding-left: 0;
}

.verb-upsell-bullets {
margin-top: 8px;
padding: 0 0 0 15px;
}

.verb-upsell-list {
font-size: 16px;
list-style-position: inside;
margin-bottom: 0;
margin-top: 8px;
max-width: 408px;
padding: 0 0 0 10px;
}

.verb-upsell-bullets li::before {
content: "•";
position: absolute;
left: -12px;
}

.verb-upsell-bullets li {
list-style: none;
position: relative;
padding-left: 0;
margin-bottom: 8px;
}

@media screen and (min-width: 768px) {
.verb-container {
align-items: center;
Expand Down Expand Up @@ -324,4 +385,64 @@
.verb-cta {
cursor: pointer;
}

.verb-upsell {
width: 100%;
height: auto;
}

.verb-upsell-heading {
display: inline;
word-wrap: break-word;
overflow-wrap: break-word;
white-space: normal;
max-width: 100%;
}

.verb-upsell-heading + .verb-upsell-heading {
margin-left: 5px;
}

.verb-upsell-bullets-heading {
margin-bottom: -4px;
margin-top: 16px;
}

.verb-upsell-bullets {
margin-top: 4px;
}

.verb-upsell-bullets li {
margin-bottom: 0;
}

.verb-upsell-bullets li:last-child {
margin-bottom: 0;
}
}

.verb-wrapper.verb-upsell-active {
cursor: default;
border: 3px solid #d5d5d5;
}

.verb-wrapper.verb-upsell-active:hover {
border: 3px solid #d5d5d5;
}

.verb-wrapper.verb-upsell-active.dragging {
background-color: #fff;
border: 3px solid #d5d5d5;
}

.verb-upsell-column {
flex: 1;
padding-right: 24px;
}

.verb-upsell-social-container {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
}
46 changes: 46 additions & 0 deletions acrobat/blocks/verb-widget/verb-widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,37 @@ function handleExit(event) {
event.returnValue = true;
}

async function showUpSell(verb, element) {
const headline = window.mph[`verb-widget-upsell-headline-${verb}`] || window.mph['verb-widget-upsell-headline'];
const headlineNopayment = window.mph['verb-widget-upsell-headline-nopayment'];
const bulletsHeading = window.mph['verb-widget-upsell-bullets-heading'];
const bullets = window.mph[`verb-widget-upsell-bullets-${verb}`] || window.mph['verb-widget-upsell-bullets'];

const headlineEl = createTag('h1', { class: 'verb-upsell-heading' }, headline);
const headingNopaymentEl = createTag('h1', { class: 'verb-upsell-heading verb-upsell-heading-nopayment' }, headlineNopayment);
const upsellBulletsHeading = createTag('p', { class: 'verb-upsell-bullets-heading' }, bulletsHeading);
const upsellBullets = createTag('ul', { class: 'verb-upsell-bullets' });
bullets.split('\n').forEach((bullet) => upsellBullets.append(createTag('li', {}, bullet)));

const upsell = createTag('div', { class: 'verb-upsell' });
const upsellColumn = createTag('div', { class: 'verb-upsell-column' });
const socialContainer = createTag('div', { class: 'verb-upsell-social-container' });

const upsellRow = createTag('div', { class: 'verb-row' });
upsellRow.append(upsellColumn, socialContainer);

upsell.append(upsellRow);

upsellColumn.append(headlineEl, headingNopaymentEl, upsellBulletsHeading, upsellBullets);

const widget = createTag('div', { class: 'verb-wrapper verb-upsell-active' });
const widgetContainer = createTag('div', { class: 'verb-container' });
widget.append(widgetContainer);
widgetContainer.append(upsell);

element.replaceChildren(widget);
}

export default async function init(element) {
if (isOldBrowser()) {
window.location.href = EOLBrowserPage;
Expand Down Expand Up @@ -205,6 +236,14 @@ export default async function init(element) {
// Analytics
verbAnalytics('landing:shown', VERB);

if (LIMITS[VERB].trial) {
const count = parseInt(localStorage.getItem(`${VERB}_trial`), 10);
if (count >= LIMITS[VERB].trial) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm understanding this correctly, this logic would show the upsell screen even on the 2nd attempt since it's using >=. Would trial need to be updated to 3 in the limits.js file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1st trial, count = NaN, after uploading, the local storage = 1.
2nd trial, count = 1, after uploading, the local storage = 2.
3rd attempt, count = 2, count >= LIMITS[VERB].trial

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that makes sense, thanks for clarifying!

showUpSell(VERB, element);
return;
}
}

window.prefetchInitiated = false;

widgetMobileButton.addEventListener('click', () => {
Expand Down Expand Up @@ -241,6 +280,7 @@ export default async function init(element) {

element.addEventListener('unity:track-analytics', (e) => {
const cookieExp = new Date(Date.now() + 90 * 1000).toUTCString();

const { event, data } = e.detail || {};

if (!event) return;
Expand All @@ -260,6 +300,12 @@ export default async function init(element) {
setUser();
},
uploading: () => {
if (LIMITS[VERB].trial) {
const key = `${VERB}_trial`;
const stored = localStorage.getItem(key);
const count = parseInt(stored, 10);
localStorage.setItem(key, count + 1 || 1);
}
verbAnalytics('job:uploading', VERB, data);
setUser();
document.cookie = `UTS_Uploading=${Date.now()};domain=.adobe.com;path=/;expires=${cookieExp}`;
Expand Down
Loading