From be9bf389a85f0b7d604cb3c7e8bca410957e2c01 Mon Sep 17 00:00:00 2001 From: sean-binary Date: Wed, 18 Nov 2020 09:40:52 +0800 Subject: [PATCH 1/2] feat: add QR code and desktop copywriting --- src/images/common/p2p_playstore.png | Bin 0 -> 4082 bytes src/pages/p2p/components/_availability.js | 99 +++++++++++++++++----- 2 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 src/images/common/p2p_playstore.png diff --git a/src/images/common/p2p_playstore.png b/src/images/common/p2p_playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..80917c1e57127230cefb74a45fbeb4ec46e18ce3 GIT binary patch literal 4082 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 literal 0 HcmV?d00001 diff --git a/src/pages/p2p/components/_availability.js b/src/pages/p2p/components/_availability.js index 3e12de2e5c2..db4e265084e 100644 --- a/src/pages/p2p/components/_availability.js +++ b/src/pages/p2p/components/_availability.js @@ -1,10 +1,11 @@ import React from 'react' +import { graphql, useStaticQuery } from 'gatsby' import styled from 'styled-components' import Desktop from 'images/svg/p2p-desktop.svg' import Mobile from 'images/svg/p2p-mobile.svg' import { localize, Localize } from 'components/localization' -import { Header, LocalizedLinkText, SpanLinkText, Text } from 'components/elements' -import { Flex, SectionContainer } from 'components/containers' +import { Header, LocalizedLinkText, SpanLinkText, Text, QueryImage } from 'components/elements' +import { Flex, SectionContainer, Show } from 'components/containers' import Login from 'common/login' import device from 'themes/device' @@ -79,13 +80,16 @@ const StyledText = styled(Text)` ` const Line = styled.div` width: 1px; - height: 38rem; + height: 44rem; border: solid 1px var(--color-grey-21); margin: 0 4.5rem; @media ${device.laptop} { height: 47rem; } + @media ${device.tabletL} { + height: 52rem; + } @media ${device.tablet} { height: 1px; width: 50rem; @@ -102,7 +106,24 @@ const Line = styled.div` } ` +const Left = styled.div` + width: 78%; +` + +const Right = styled.div` + width: 22%; +` + +const query = graphql` + query { + qr_code: file(relativePath: { eq: "p2p_playstore.png" }) { + ...fadeIn + } + } +` + const Availability = () => { + const data = useStaticQuery(query) const handleLogin = () => { Login.redirectToLogin() } @@ -116,7 +137,8 @@ const Availability = () => { as="h2" mb="4rem" > - {localize('Available on desktop and mobile')} + {localize('How to get DP2P')} + {localize('Available on desktop and mobile')} { - + + + + + +
@@ -169,24 +196,58 @@ const Availability = () => { - + + + + + +
- , - ]} - /> + + + + , + ]} + /> + + + + + + + + , + ]} + /> + From 354c395553d1dec84af91507451bf9813e53edcb Mon Sep 17 00:00:00 2001 From: sean-binary Date: Wed, 18 Nov 2020 15:18:08 +0800 Subject: [PATCH 2/2] moved p2p related assets into its own folder --- src/common/utility.js | 2 ++ src/images/common/{ => p2p}/p2p_banner.png | Bin src/images/common/{ => p2p}/p2p_banner_mobile.png | Bin src/images/common/{ => p2p}/p2p_buy_sell.png | Bin src/images/common/{ => p2p}/p2p_hero_background.png | Bin .../common/{ => p2p}/p2p_hero_background_mobile.png | Bin src/images/common/{ => p2p}/p2p_hero_img.png | Bin src/images/common/{ => p2p}/p2p_local_currency.png | Bin src/images/common/{ => p2p}/p2p_playstore.png | Bin src/images/common/{ => p2p}/p2p_web_and_mobile.png | Bin src/pages/p2p/components/_availability.js | 7 ++++--- src/pages/p2p/components/_dp2p.js | 6 +++--- src/pages/p2p/components/_hero.js | 8 +++++--- src/pages/p2p/components/_p2pbanner.js | 4 ++-- 14 files changed, 16 insertions(+), 11 deletions(-) rename src/images/common/{ => p2p}/p2p_banner.png (100%) rename src/images/common/{ => p2p}/p2p_banner_mobile.png (100%) rename src/images/common/{ => p2p}/p2p_buy_sell.png (100%) rename src/images/common/{ => p2p}/p2p_hero_background.png (100%) rename src/images/common/{ => p2p}/p2p_hero_background_mobile.png (100%) rename src/images/common/{ => p2p}/p2p_hero_img.png (100%) rename src/images/common/{ => p2p}/p2p_local_currency.png (100%) rename src/images/common/{ => p2p}/p2p_playstore.png (100%) rename src/images/common/{ => p2p}/p2p_web_and_mobile.png (100%) diff --git a/src/common/utility.js b/src/common/utility.js index f917dd72239..b33d8d285fc 100644 --- a/src/common/utility.js +++ b/src/common/utility.js @@ -101,6 +101,7 @@ const zoho_url = 'https://deriv.zohorecruit.com/' const brand_name = 'Deriv' const map_api_key = 'AIzaSyAEha6-HeZuI95L9JWmX3m6o-AxQr_oFqU' const gtm_test_domain = 'deriv-com.binary.sx' +const p2p_playstore_url = 'https://play.google.com/store/apps/details?id=com.deriv.dp2p' const mga_link_url = 'https://authorisation.mga.org.mt/verification.aspx?lang=EN&company=a5fd1edc-d072-4c26-b0cd-ab3fa0f0cc40&details=1' @@ -144,4 +145,5 @@ export { toHashFormat, zoho_url, trimSpaces, + p2p_playstore_url, } diff --git a/src/images/common/p2p_banner.png b/src/images/common/p2p/p2p_banner.png similarity index 100% rename from src/images/common/p2p_banner.png rename to src/images/common/p2p/p2p_banner.png diff --git a/src/images/common/p2p_banner_mobile.png b/src/images/common/p2p/p2p_banner_mobile.png similarity index 100% rename from src/images/common/p2p_banner_mobile.png rename to src/images/common/p2p/p2p_banner_mobile.png diff --git a/src/images/common/p2p_buy_sell.png b/src/images/common/p2p/p2p_buy_sell.png similarity index 100% rename from src/images/common/p2p_buy_sell.png rename to src/images/common/p2p/p2p_buy_sell.png diff --git a/src/images/common/p2p_hero_background.png b/src/images/common/p2p/p2p_hero_background.png similarity index 100% rename from src/images/common/p2p_hero_background.png rename to src/images/common/p2p/p2p_hero_background.png diff --git a/src/images/common/p2p_hero_background_mobile.png b/src/images/common/p2p/p2p_hero_background_mobile.png similarity index 100% rename from src/images/common/p2p_hero_background_mobile.png rename to src/images/common/p2p/p2p_hero_background_mobile.png diff --git a/src/images/common/p2p_hero_img.png b/src/images/common/p2p/p2p_hero_img.png similarity index 100% rename from src/images/common/p2p_hero_img.png rename to src/images/common/p2p/p2p_hero_img.png diff --git a/src/images/common/p2p_local_currency.png b/src/images/common/p2p/p2p_local_currency.png similarity index 100% rename from src/images/common/p2p_local_currency.png rename to src/images/common/p2p/p2p_local_currency.png diff --git a/src/images/common/p2p_playstore.png b/src/images/common/p2p/p2p_playstore.png similarity index 100% rename from src/images/common/p2p_playstore.png rename to src/images/common/p2p/p2p_playstore.png diff --git a/src/images/common/p2p_web_and_mobile.png b/src/images/common/p2p/p2p_web_and_mobile.png similarity index 100% rename from src/images/common/p2p_web_and_mobile.png rename to src/images/common/p2p/p2p_web_and_mobile.png diff --git a/src/pages/p2p/components/_availability.js b/src/pages/p2p/components/_availability.js index db4e265084e..0b6078f0ada 100644 --- a/src/pages/p2p/components/_availability.js +++ b/src/pages/p2p/components/_availability.js @@ -8,6 +8,7 @@ import { Header, LocalizedLinkText, SpanLinkText, Text, QueryImage } from 'compo import { Flex, SectionContainer, Show } from 'components/containers' import Login from 'common/login' import device from 'themes/device' +import { p2p_playstore_url } from 'common/utility' const Row = styled.div` display: flex; @@ -116,7 +117,7 @@ const Right = styled.div` const query = graphql` query { - qr_code: file(relativePath: { eq: "p2p_playstore.png" }) { + qr_code: file(relativePath: { eq: "p2p/p2p_playstore.png" }) { ...fadeIn } } @@ -214,7 +215,7 @@ const Availability = () => { components={[ { components={[ { const query = graphql` query { - p2p_hero_background: file(relativePath: { eq: "p2p_hero_background.png" }) { + p2p_hero_background: file(relativePath: { eq: "p2p/p2p_hero_background.png" }) { ...fadeIn } - p2p_hero_background_mobile: file(relativePath: { eq: "p2p_hero_background_mobile.png" }) { + p2p_hero_background_mobile: file( + relativePath: { eq: "p2p/p2p_hero_background_mobile.png" } + ) { ...fadeIn } - p2p_hero_img: file(relativePath: { eq: "p2p_hero_img.png" }) { + p2p_hero_img: file(relativePath: { eq: "p2p/p2p_hero_img.png" }) { ...fadeIn } } diff --git a/src/pages/p2p/components/_p2pbanner.js b/src/pages/p2p/components/_p2pbanner.js index d787a1891d6..c28fe0c4854 100644 --- a/src/pages/p2p/components/_p2pbanner.js +++ b/src/pages/p2p/components/_p2pbanner.js @@ -94,10 +94,10 @@ const StyledHeader = styled(Header)` const query = graphql` query { - p2p_banner: file(relativePath: { eq: "p2p_banner.png" }) { + p2p_banner: file(relativePath: { eq: "p2p/p2p_banner.png" }) { ...fadeIn } - p2p_banner_mobile: file(relativePath: { eq: "p2p_banner_mobile.png" }) { + p2p_banner_mobile: file(relativePath: { eq: "p2p/p2p_banner_mobile.png" }) { ...fadeIn } }