From e08587fe6faac205ec8c39e8e7124f442d73845f Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 12 Aug 2020 02:26:22 -0400 Subject: [PATCH 1/7] Update Intro Hub Get Plus to link to plus description page, and Ghostery Midnight Modal CTA to link to landing page --- app/shared-components/PromoModal/PromoModal.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 45ac1bbc5..988a892f7 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -69,10 +69,10 @@ class PromoModal extends React.Component { let url; switch (product) { case PLUS: - url = `https://checkout.${DOMAIN}.com/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case PREMIUM: - url = `https://ghostery.com/thanks-for-downloading-midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `https://www.ghostery.com/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); From 21d398bbd3e012cbaef9f276f61584ca051fc484 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:07:10 -0400 Subject: [PATCH 2/7] Use ghostery root domain from globals --- app/shared-components/PromoModal/PromoModal.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 988a892f7..2b6414e95 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -23,7 +23,7 @@ import { sendMessage } from '../../panel/utils/msg'; import globals from '../../../src/classes/Globals'; import ModalExitButton from '../../panel/components/BuildingBlocks/ModalExitButton'; -const DOMAIN = globals.DEBUG ? 'ghosterystage' : 'ghostery'; +const { GHOSTERY_ROOT_DOMAIN } = globals; const INSIGHTS = 'insights'; const PLUS = 'plus'; const PREMIUM = 'premium'; @@ -69,14 +69,14 @@ class PromoModal extends React.Component { let url; switch (product) { case PLUS: - url = `https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `https://www.${GHOSTERY_ROOT_DOMAIN}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case PREMIUM: - url = `https://www.ghostery.com/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `https://www.${GHOSTERY_ROOT_DOMAIN}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `https://checkout.${DOMAIN}.com/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `https://checkout.${GHOSTERY_ROOT_DOMAIN}/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } From adbe0b8ffc5325318182006bc4e26969dde93c24 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:20:43 -0400 Subject: [PATCH 3/7] Use checkout base URL --- app/shared-components/PromoModal/PromoModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 2b6414e95..529f4bb87 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -76,7 +76,7 @@ class PromoModal extends React.Component { break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `https://checkout.${GHOSTERY_ROOT_DOMAIN}/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${CHECKOUT_BASE_URL}/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } From 001128896ec8be4dc28fd1bb2a360953d0d1bce3 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:29:01 -0400 Subject: [PATCH 4/7] Add GHOSTERY_WEBSITE_BASE_URL to globals and use in PromoModal.jsx --- app/shared-components/PromoModal/PromoModal.jsx | 6 +++--- src/classes/Globals.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 529f4bb87..4c764932a 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -23,7 +23,7 @@ import { sendMessage } from '../../panel/utils/msg'; import globals from '../../../src/classes/Globals'; import ModalExitButton from '../../panel/components/BuildingBlocks/ModalExitButton'; -const { GHOSTERY_ROOT_DOMAIN } = globals; +const { GHOSTERY_WEBSITE_BASE_URL, CHECKOUT_BASE_URL } = globals; const INSIGHTS = 'insights'; const PLUS = 'plus'; const PREMIUM = 'premium'; @@ -69,10 +69,10 @@ class PromoModal extends React.Component { let url; switch (product) { case PLUS: - url = `https://www.${GHOSTERY_ROOT_DOMAIN}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_WEBSITE_BASE_URL}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case PREMIUM: - url = `https://www.${GHOSTERY_ROOT_DOMAIN}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_WEBSITE_BASE_URL}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); diff --git a/src/classes/Globals.js b/src/classes/Globals.js index 9aed8fa14..2b3f15e7b 100644 --- a/src/classes/Globals.js +++ b/src/classes/Globals.js @@ -53,6 +53,7 @@ class Globals { this.GHOSTERY_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`; this.ACCOUNT_BASE_URL = `https://account.${this.GHOSTERY_ROOT_DOMAIN}`; this.CHECKOUT_BASE_URL = `https://checkout.${this.GHOSTERY_ROOT_DOMAIN}`; + this.GHOSTERY_WEBSITE_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`; this.METRICS_BASE_URL = `https://${this.DEBUG ? 'staging-d' : 'd'}.ghostery.com`; this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`; this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`; From a4be00c6302fa9dd46e2a98511301f1da962b186 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:31:53 -0400 Subject: [PATCH 5/7] Add / --- app/shared-components/PromoModal/PromoModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 4c764932a..8452a3f96 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -76,7 +76,7 @@ class PromoModal extends React.Component { break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `${CHECKOUT_BASE_URL}/insights?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${CHECKOUT_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } From 874760b0aa202d04b272db2dea3a2c0ddca20cc0 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:36:00 -0400 Subject: [PATCH 6/7] Use GHOSTERY_WEBSITE_BASE_URL in insights CTA --- app/shared-components/PromoModal/PromoModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index 8452a3f96..b535b1fb4 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -76,7 +76,7 @@ class PromoModal extends React.Component { break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `${CHECKOUT_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_WEBSITE_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } From 8b0e10f5944e310c9c5c56356cd03984386006dc Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 13 Aug 2020 16:38:21 -0400 Subject: [PATCH 7/7] Remove and replace GHOSTERY_WEBSITE_BASE_URL with GHOSTERY_BASE_URL --- app/shared-components/PromoModal/PromoModal.jsx | 8 ++++---- src/classes/Globals.js | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx index b535b1fb4..eb98a4d51 100644 --- a/app/shared-components/PromoModal/PromoModal.jsx +++ b/app/shared-components/PromoModal/PromoModal.jsx @@ -23,7 +23,7 @@ import { sendMessage } from '../../panel/utils/msg'; import globals from '../../../src/classes/Globals'; import ModalExitButton from '../../panel/components/BuildingBlocks/ModalExitButton'; -const { GHOSTERY_WEBSITE_BASE_URL, CHECKOUT_BASE_URL } = globals; +const { GHOSTERY_BASE_URL } = globals; const INSIGHTS = 'insights'; const PLUS = 'plus'; const PREMIUM = 'premium'; @@ -69,14 +69,14 @@ class PromoModal extends React.Component { let url; switch (product) { case PLUS: - url = `${GHOSTERY_WEBSITE_BASE_URL}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_BASE_URL}/products/plus?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case PREMIUM: - url = `${GHOSTERY_WEBSITE_BASE_URL}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_BASE_URL}/midnight?utm_source=gbe&utm_campaign=${utm_campaign}`; break; case INSIGHTS: sendMessage('ping', 'promo_modals_insights_upgrade_cta'); - url = `${GHOSTERY_WEBSITE_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; + url = `${GHOSTERY_BASE_URL}/insights/?utm_source=gbe&utm_campaign=${utm_campaign}`; break; default: } diff --git a/src/classes/Globals.js b/src/classes/Globals.js index 2b3f15e7b..9aed8fa14 100644 --- a/src/classes/Globals.js +++ b/src/classes/Globals.js @@ -53,7 +53,6 @@ class Globals { this.GHOSTERY_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`; this.ACCOUNT_BASE_URL = `https://account.${this.GHOSTERY_ROOT_DOMAIN}`; this.CHECKOUT_BASE_URL = `https://checkout.${this.GHOSTERY_ROOT_DOMAIN}`; - this.GHOSTERY_WEBSITE_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`; this.METRICS_BASE_URL = `https://${this.DEBUG ? 'staging-d' : 'd'}.ghostery.com`; this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`; this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`;