From 5309f8fe536db3a08983e6fee0d88d50ce4c6aa6 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 22 Oct 2024 18:25:34 -0500 Subject: [PATCH] Website: add swag request CTA to /better (#23108) Closes: https://github.com/fleetdm/confidential/issues/8439 Changes: - Added a swag request CTA to the /better page that is visible to users visiting the website from the contiguous US. --- website/api/controllers/view-transparency.js | 11 +++++++- .../images/icon-fleet-tumbler-55x51@2x.png | Bin 0 -> 3638 bytes website/assets/styles/pages/transparency.less | 24 ++++++++++++++++++ website/views/pages/transparency.ejs | 13 +++++++++- 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 website/assets/images/icon-fleet-tumbler-55x51@2x.png diff --git a/website/api/controllers/view-transparency.js b/website/api/controllers/view-transparency.js index 7267792026..4aa3a2b69f 100644 --- a/website/api/controllers/view-transparency.js +++ b/website/api/controllers/view-transparency.js @@ -16,8 +16,17 @@ module.exports = { fn: async function () { + + let showSwagForm = false; + // Due to shipping costs, we'll check the requesting user's cf-ipcountry to see if they're in the US, and their cf-iplongitude header to see if they're in the contiguous US. + if(this.req.get('cf-ipcountry') === 'US' && this.req.get('cf-iplongitude') > -125) { + showSwagForm = true; + } // Respond with view. - return {showSecureframeBanner: this.req.param('utm_content') === 'secureframe'}; + return { + showSecureframeBanner: this.req.param('utm_content') === 'secureframe', + showSwagForm, + }; } diff --git a/website/assets/images/icon-fleet-tumbler-55x51@2x.png b/website/assets/images/icon-fleet-tumbler-55x51@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d027315cc6d9032f3953d5ca1747812e32e2f9bf GIT binary patch literal 3638 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 IM6N<$f+v~EMgRZ+ literal 0 HcmV?d00001 diff --git a/website/assets/styles/pages/transparency.less b/website/assets/styles/pages/transparency.less index 89283f74b1..68d561ac88 100644 --- a/website/assets/styles/pages/transparency.less +++ b/website/assets/styles/pages/transparency.less @@ -83,6 +83,30 @@ line-height: @text-lineheight; } } + [purpose='swag-cta'] { + display: flex; + width: 263px; + // padding: 16px 24px; + align-items: center; + text-decoration: none; + border-radius: 6px; + border: 1px solid var(--UI-Gray, #E3E3E3); + background: #FFF; + box-shadow: 1px 2px 2px 0px rgba(197, 199, 209, 0.20); + font-size: 14px; + [purpose='swag-link'] { + padding: 16px 24px; + display: block; + } + strong { + font-weight: 800; + } + img { + width: 55px; + height: 51px; + margin-right: 24px; + } + } [purpose='feature'] { padding-top: 64px; padding-bottom: 64px; diff --git a/website/views/pages/transparency.ejs b/website/views/pages/transparency.ejs index 44f9b2854e..1a85af36ca 100644 --- a/website/views/pages/transparency.ejs +++ b/website/views/pages/transparency.ejs @@ -9,7 +9,18 @@

How does it affect me?

Your IT team has to maintain your computer and keep it compliant with with a bunch of security requirements. But they also realize you have a job to do. So they want to be as un-intrusive as possible.

-

That’s why they chose Fleet. It’s compatible with everything, including Linux, so it doesn’t limit what operating system you use. And it’s open source, meaning if you want to, you can take it apart and see what it’s doing to your computer.

+

That’s why they chose Fleet. It’s compatible with everything, including Linux, so it doesn’t limit what operating system you use. And it’s open source, meaning if you want to, you can take it apart and see what it’s doing to your computer.

+
Information about a users device in Fleet.