From 3c9f7d4c202e2a5671a113eca75f1412b8242fea Mon Sep 17 00:00:00 2001 From: mohammad-rework Date: Mon, 3 Jan 2022 21:39:46 +0330 Subject: [PATCH 1/8] convert landing-ebooks to TS --- .../{_get-ebook.js => _get-ebook.tsx} | 15 ++++---- .../components/{_header.js => _header.tsx} | 37 +++++++++++-------- .../ebooks/components/{_hero.js => _hero.tsx} | 27 +++++++------- .../{_image-text.js => _image-text.tsx} | 19 +++++----- .../{_introduction.js => _introduction.tsx} | 25 ++++++++----- .../components/{_topics.js => _topics.tsx} | 15 ++++---- .../landing/ebooks/{crypto.js => crypto.tsx} | 0 .../landing/ebooks/{forex.js => forex.tsx} | 11 +++--- .../landing/ebooks/{stocks.js => stocks.tsx} | 0 9 files changed, 77 insertions(+), 72 deletions(-) rename src/pages/landing/ebooks/components/{_get-ebook.js => _get-ebook.tsx} (98%) rename src/pages/landing/ebooks/components/{_header.js => _header.tsx} (93%) rename src/pages/landing/ebooks/components/{_hero.js => _hero.tsx} (93%) rename src/pages/landing/ebooks/components/{_image-text.js => _image-text.tsx} (94%) rename src/pages/landing/ebooks/components/{_introduction.js => _introduction.tsx} (92%) rename src/pages/landing/ebooks/components/{_topics.js => _topics.tsx} (93%) rename src/pages/landing/ebooks/{crypto.js => crypto.tsx} (100%) rename src/pages/landing/ebooks/{forex.js => forex.tsx} (96%) rename src/pages/landing/ebooks/{stocks.js => stocks.tsx} (100%) diff --git a/src/pages/landing/ebooks/components/_get-ebook.js b/src/pages/landing/ebooks/components/_get-ebook.tsx similarity index 98% rename from src/pages/landing/ebooks/components/_get-ebook.js rename to src/pages/landing/ebooks/components/_get-ebook.tsx index fa46cbe8dc2..a31b032ee11 100644 --- a/src/pages/landing/ebooks/components/_get-ebook.js +++ b/src/pages/landing/ebooks/components/_get-ebook.tsx @@ -1,5 +1,4 @@ import React from 'react' -import PropTypes from 'prop-types' import styled from 'styled-components' import Cookies from 'js-cookie' import Login from 'common/login' @@ -17,6 +16,12 @@ import Facebook from 'images/svg/custom/facebook-blue.svg' import Google from 'images/svg/custom/google.svg' import ViewEmailImage from 'images/common/sign-up/view-email.png' +type GetEbbokProps = { + color?: string + ebook_utm_code: string + onSubmit?: (submit_status: string, email: string) => void +} + const SignupFormWrapper = styled(Flex)` width: 50%; align-items: center; @@ -175,7 +180,7 @@ const EmailImage = styled.img` width: 20rem; ` -const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }) => { +const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: GetEbbokProps) => { const [is_checked, setChecked] = React.useState(false) const [email, setEmail] = React.useState('') const [is_submitting, setIsSubmitting] = React.useState(false) @@ -394,10 +399,4 @@ const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }) => ) } -GetEbook.propTypes = { - color: PropTypes.string, - ebook_utm_code: PropTypes.string, - onSubmit: PropTypes.func, -} - export default GetEbook diff --git a/src/pages/landing/ebooks/components/_header.js b/src/pages/landing/ebooks/components/_header.tsx similarity index 93% rename from src/pages/landing/ebooks/components/_header.js rename to src/pages/landing/ebooks/components/_header.tsx index 2858e550160..6e6eb9ccd67 100644 --- a/src/pages/landing/ebooks/components/_header.js +++ b/src/pages/landing/ebooks/components/_header.tsx @@ -1,12 +1,29 @@ import React from 'react' import styled from 'styled-components' -import PropTypes from 'prop-types' import GetEbook from './_get-ebook' import { Flex } from 'components/containers' import { Header, QueryImage, Text } from 'components/elements' import { localize } from 'components/localization' import device from 'themes/device.js' +type HeaderImageProps = { + imgWidth: number + imgHeight: number +} + +type HeaderSectionProps = { + authorDesc: string + authorName: string + bg?: string + bgMobile?: string + ebook_utm_code: string + imgHeight: number + imgWidth: number + introMain: string + introSub: string + mainHeaderImage: any +} + const MainWrapper = styled(Flex)` width: 100%; background-image: ${(props) => @@ -48,7 +65,8 @@ const TopHeaderImgWrapper = styled(Flex)` margin-top: -70px; } ` -const HeaderImage = styled(QueryImage)` + +const HeaderImage = styled(QueryImage)` width: ${(props) => (props.imgWidth ? `${props.imgWidth}px` : '557px')}; height: ${(props) => (props.imgHeight ? `${props.imgHeight}px` : '703px')}; position: relative; @@ -149,7 +167,7 @@ const HeaderSection = ({ bg, bgMobile, ebook_utm_code, -}) => { +}: HeaderSectionProps) => { return ( @@ -228,17 +246,4 @@ const HeaderSection = ({ ) } -HeaderSection.propTypes = { - authorDesc: PropTypes.string, - authorName: PropTypes.string, - bg: PropTypes.any, - bgMobile: PropTypes.any, - ebook_utm_code: PropTypes.string, - imgHeight: PropTypes.number, - imgWidth: PropTypes.number, - introMain: PropTypes.any, - introSub: PropTypes.any, - mainHeaderImage: PropTypes.any, -} - export default HeaderSection diff --git a/src/pages/landing/ebooks/components/_hero.js b/src/pages/landing/ebooks/components/_hero.tsx similarity index 93% rename from src/pages/landing/ebooks/components/_hero.js rename to src/pages/landing/ebooks/components/_hero.tsx index 1fcb8ce2866..286152aaf4a 100644 --- a/src/pages/landing/ebooks/components/_hero.js +++ b/src/pages/landing/ebooks/components/_hero.tsx @@ -1,6 +1,5 @@ import React from 'react' import styled from 'styled-components' -import PropTypes from 'prop-types' import GetEbook from './_get-ebook' import { Flex, Box } from 'components/containers' import { Header, QueryImage, Text } from 'components/elements' @@ -8,6 +7,18 @@ import { localize } from 'components/localization' import device from 'themes/device.js' import { useBrowserResize } from 'components/hooks/use-browser-resize' +type HeroProps = { + authorDesc: string + authorName: string + bg: string + bgMobile: string + color: string + ebook_utm_code: string + introMain: string + introSub: string + mainHeaderImage: any +} + const MainWrapper = styled(Box)` background-image: ${(props) => props.bg}; @@ -49,7 +60,7 @@ const Hero = ({ introMain, introSub, mainHeaderImage, -}) => { +}: HeroProps) => { const [is_mobile] = useBrowserResize() return ( @@ -136,16 +147,4 @@ const Hero = ({ ) } -Hero.propTypes = { - authorDesc: PropTypes.string, - authorName: PropTypes.string, - bg: PropTypes.any, - bgMobile: PropTypes.any, - color: PropTypes.string, - ebook_utm_code: PropTypes.string, - introMain: PropTypes.string, - introSub: PropTypes.string, - mainHeaderImage: PropTypes.any, -} - export default Hero diff --git a/src/pages/landing/ebooks/components/_image-text.js b/src/pages/landing/ebooks/components/_image-text.tsx similarity index 94% rename from src/pages/landing/ebooks/components/_image-text.js rename to src/pages/landing/ebooks/components/_image-text.tsx index 15e80bf2974..5e44e8d5814 100644 --- a/src/pages/landing/ebooks/components/_image-text.js +++ b/src/pages/landing/ebooks/components/_image-text.tsx @@ -1,12 +1,19 @@ import React from 'react' import styled from 'styled-components' -import PropTypes from 'prop-types' import { Header, Text, Li } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import BackgroundPattern from 'images/svg/landing/ebook-intro-bg.svg' import device from 'themes/device' import { localize, Localize } from 'components/localization' +type ImageTextProps = { + imageWidth: number + introImage: string + introList?: string[] + introPara: string + subPara: string +} + const BackgroundWrapper = styled.div` width: 100%; height: 100%; @@ -91,7 +98,7 @@ const MediaItemList = styled.ul` font-size: 20px; ` -const ImageText = ({ introImage, imageWidth, introPara, subPara, introList }) => { +const ImageText = ({ introImage, imageWidth, introPara, subPara, introList }: ImageTextProps) => { return ( @@ -140,12 +147,4 @@ const ImageText = ({ introImage, imageWidth, introPara, subPara, introList }) => ) } -ImageText.propTypes = { - imageWidth: PropTypes.number, - introImage: PropTypes.any, - introList: PropTypes.array, - introPara: PropTypes.string, - subPara: PropTypes.string, -} - export default ImageText diff --git a/src/pages/landing/ebooks/components/_introduction.js b/src/pages/landing/ebooks/components/_introduction.tsx similarity index 92% rename from src/pages/landing/ebooks/components/_introduction.js rename to src/pages/landing/ebooks/components/_introduction.tsx index 5b080cda3fd..9461a268b15 100644 --- a/src/pages/landing/ebooks/components/_introduction.js +++ b/src/pages/landing/ebooks/components/_introduction.tsx @@ -1,12 +1,19 @@ import React from 'react' import styled from 'styled-components' -import PropTypes from 'prop-types' import { Header, Text, Li } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import BackgroundPattern from 'images/svg/landing/ebook-intro-bg.svg' import device from 'themes/device' import { localize, Localize } from 'components/localization' +type IntroductionProps = { + imageWidth: number + introImage: string + introList?: string[] + introPara: string + subPara?: string +} + const BacgroundWrapper = styled.div` width: 100%; height: 100%; @@ -85,7 +92,13 @@ const MediaItemList = styled.ul` font-size: 20px; ` -const Introduction = ({ introImage, imageWidth, introPara, subPara, introList }) => { +const Introduction = ({ + introImage, + imageWidth, + introPara, + subPara, + introList, +}: IntroductionProps) => { return ( @@ -135,12 +148,4 @@ const Introduction = ({ introImage, imageWidth, introPara, subPara, introList }) ) } -Introduction.propTypes = { - imageWidth: PropTypes.number, - introImage: PropTypes.any, - introList: PropTypes.array, - introPara: PropTypes.string, - subPara: PropTypes.string, -} - export default Introduction diff --git a/src/pages/landing/ebooks/components/_topics.js b/src/pages/landing/ebooks/components/_topics.tsx similarity index 93% rename from src/pages/landing/ebooks/components/_topics.js rename to src/pages/landing/ebooks/components/_topics.tsx index 03e01601421..59c6a6fd98c 100644 --- a/src/pages/landing/ebooks/components/_topics.js +++ b/src/pages/landing/ebooks/components/_topics.tsx @@ -1,11 +1,16 @@ import React from 'react' import styled from 'styled-components' -import PropTypes from 'prop-types' import { Header, Li, QueryImage } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import device from 'themes/device' import { localize, Localize } from 'components/localization' +type TopicsProps = { + title?: string + topicsImage: any + topicsList: string[] +} + const FullWidth = styled.div` background-image: linear-gradient(to bottom, #eaf4f5 1%, rgba(242, 245, 248, 0) 99%); @@ -79,7 +84,7 @@ const TopicImgWrapper = styled.div` } ` -const Topics = ({ title, topicsImage, topicsList }) => { +const Topics = ({ title, topicsImage, topicsList }: TopicsProps) => { return ( @@ -113,10 +118,4 @@ const Topics = ({ title, topicsImage, topicsList }) => { ) } -Topics.propTypes = { - title: PropTypes.string, - topicsImage: PropTypes.any, - topicsList: PropTypes.array, -} - export default Topics diff --git a/src/pages/landing/ebooks/crypto.js b/src/pages/landing/ebooks/crypto.tsx similarity index 100% rename from src/pages/landing/ebooks/crypto.js rename to src/pages/landing/ebooks/crypto.tsx diff --git a/src/pages/landing/ebooks/forex.js b/src/pages/landing/ebooks/forex.tsx similarity index 96% rename from src/pages/landing/ebooks/forex.js rename to src/pages/landing/ebooks/forex.tsx index a50bd2b4ec2..ad1fc65a6f6 100644 --- a/src/pages/landing/ebooks/forex.js +++ b/src/pages/landing/ebooks/forex.tsx @@ -1,5 +1,4 @@ import React from 'react' -import PropTypes from 'prop-types' import { graphql, useStaticQuery } from 'gatsby' import Introduction from './components/_introduction' import HeaderSection from './components/_header' @@ -9,6 +8,10 @@ import { SEO } from 'components/containers' import { localize, WithIntl } from 'components/localization' import introForexEbook from 'images/common/ebooks/introduction-forex-ebook.png' +type ForexEbookProps = { + language: string +} + const introPoints = [ localize('The basics of forex trading'), localize('How to manage risk when trading forex'), @@ -46,7 +49,7 @@ const query = graphql` } ` -const ForexEbook = (props) => { +const ForexEbook = (props: ForexEbookProps) => { const { language } = props let lng = language if (lng != 'es') { @@ -89,8 +92,4 @@ const ForexEbook = (props) => { ) } -ForexEbook.propTypes = { - language: PropTypes.string, -} - export default WithIntl()(ForexEbook) diff --git a/src/pages/landing/ebooks/stocks.js b/src/pages/landing/ebooks/stocks.tsx similarity index 100% rename from src/pages/landing/ebooks/stocks.js rename to src/pages/landing/ebooks/stocks.tsx From 8a2f15ff534ef6dd241c7524c6db498dff05bf20 Mon Sep 17 00:00:00 2001 From: mohammad-rework Date: Tue, 4 Jan 2022 15:41:24 +0330 Subject: [PATCH 2/8] solve the same height value in condition --- src/pages/landing/ebooks/components/_header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/landing/ebooks/components/_header.tsx b/src/pages/landing/ebooks/components/_header.tsx index 6e6eb9ccd67..c8ae82f484e 100644 --- a/src/pages/landing/ebooks/components/_header.tsx +++ b/src/pages/landing/ebooks/components/_header.tsx @@ -89,7 +89,7 @@ const HeaderImage = styled(QueryImage)` @media ${device.tabletS} { width: ${(props) => (props.imgWidth < 600 ? '115%' : '105%')}; - height: ${(props) => (props.imgWidth < 600 ? '105%' : '105%')}; + height: ${(props) => (props.imgWidth < 600 ? '115%' : '105%')}; margin-left: ${(props) => (props.imgWidth < 600 ? '-110px' : '-50px')}; } @media ${device.mobileS} { From 0f158e7e5c92b0bd9464e27292d9307c18423f0e Mon Sep 17 00:00:00 2001 From: mohammad-rework Date: Tue, 4 Jan 2022 15:56:10 +0330 Subject: [PATCH 3/8] trigger vercel From 1b41fddf0d70f910ac8b1187f241106fc2c93237 Mon Sep 17 00:00:00 2001 From: mohammad-rework Date: Mon, 10 Jan 2022 18:08:28 +0330 Subject: [PATCH 4/8] fix: code smells and remove duplicate types --- .../landing/ebooks/components/_get-ebook.tsx | 8 ++++---- .../{_header.tsx => _header-section.tsx} | 18 +++++++---------- src/pages/landing/ebooks/components/_hero.tsx | 11 ++-------- .../landing/ebooks/components/_image-text.tsx | 17 ++++++++-------- .../landing/ebooks/components/_topics.tsx | 3 ++- src/pages/landing/ebooks/components/_types.ts | 20 +++++++++++++++++++ src/pages/landing/ebooks/forex.tsx | 2 +- src/pages/landing/ebooks/stocks.tsx | 2 +- 8 files changed, 45 insertions(+), 36 deletions(-) rename src/pages/landing/ebooks/components/{_header.tsx => _header-section.tsx} (94%) create mode 100644 src/pages/landing/ebooks/components/_types.ts diff --git a/src/pages/landing/ebooks/components/_get-ebook.tsx b/src/pages/landing/ebooks/components/_get-ebook.tsx index a31b032ee11..08dd2cc9dd3 100644 --- a/src/pages/landing/ebooks/components/_get-ebook.tsx +++ b/src/pages/landing/ebooks/components/_get-ebook.tsx @@ -205,8 +205,8 @@ const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: Ge setEmailErrorMsg(validateEmail(message.replace(/\s/g, ''))) } - const validateEmail = (email) => { - const error_message = validation.email(email) || submit_error_msg + const validateEmail = (enteredEmail) => { + const error_message = validation.email(enteredEmail) || submit_error_msg if (submit_error_msg) { setSubmitErrorMsg('') @@ -221,7 +221,7 @@ const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: Ge setEmailErrorMsg('') } - const getVerifyEmailRequest = (email) => { + const getVerifyEmailRequest = (enteredEmail) => { const affiliate_token = Cookies.getJSON('affiliate_tracking') const cookies = getCookiesFields() @@ -229,7 +229,7 @@ const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: Ge const cookies_value = getDataObjFromCookies(cookies_objects, cookies) return { - verify_email: email, + verify_email: enteredEmail, type: 'account_opening', url_parameters: { ...(affiliate_token && { affiliate_token: affiliate_token }), diff --git a/src/pages/landing/ebooks/components/_header.tsx b/src/pages/landing/ebooks/components/_header-section.tsx similarity index 94% rename from src/pages/landing/ebooks/components/_header.tsx rename to src/pages/landing/ebooks/components/_header-section.tsx index c8ae82f484e..7bcf712014d 100644 --- a/src/pages/landing/ebooks/components/_header.tsx +++ b/src/pages/landing/ebooks/components/_header-section.tsx @@ -1,6 +1,7 @@ import React from 'react' import styled from 'styled-components' import GetEbook from './_get-ebook' +import { HeaderAndHeroProps } from './_types' import { Flex } from 'components/containers' import { Header, QueryImage, Text } from 'components/elements' import { localize } from 'components/localization' @@ -11,17 +12,9 @@ type HeaderImageProps = { imgHeight: number } -type HeaderSectionProps = { - authorDesc: string - authorName: string - bg?: string - bgMobile?: string - ebook_utm_code: string +type HeaderSectionProps = HeaderAndHeroProps & { imgHeight: number imgWidth: number - introMain: string - introSub: string - mainHeaderImage: any } const MainWrapper = styled(Flex)` @@ -66,9 +59,12 @@ const TopHeaderImgWrapper = styled(Flex)` } ` +const widthProps = (props) => (props.imgWidth ? `${props.imgWidth}px` : '557px') +const heightProps = (props) => (props.imgHeight ? `${props.imgHeight}px` : '703px') + const HeaderImage = styled(QueryImage)` - width: ${(props) => (props.imgWidth ? `${props.imgWidth}px` : '557px')}; - height: ${(props) => (props.imgHeight ? `${props.imgHeight}px` : '703px')}; + width: ${widthProps}; + height: ${heightProps}; position: relative; top: 75px; margin: 0; diff --git a/src/pages/landing/ebooks/components/_hero.tsx b/src/pages/landing/ebooks/components/_hero.tsx index 286152aaf4a..750e8d80626 100644 --- a/src/pages/landing/ebooks/components/_hero.tsx +++ b/src/pages/landing/ebooks/components/_hero.tsx @@ -1,22 +1,15 @@ import React from 'react' import styled from 'styled-components' import GetEbook from './_get-ebook' +import { HeaderAndHeroProps } from './_types' import { Flex, Box } from 'components/containers' import { Header, QueryImage, Text } from 'components/elements' import { localize } from 'components/localization' import device from 'themes/device.js' import { useBrowserResize } from 'components/hooks/use-browser-resize' -type HeroProps = { - authorDesc: string - authorName: string - bg: string - bgMobile: string +type HeroProps = HeaderAndHeroProps & { color: string - ebook_utm_code: string - introMain: string - introSub: string - mainHeaderImage: any } const MainWrapper = styled(Box)` diff --git a/src/pages/landing/ebooks/components/_image-text.tsx b/src/pages/landing/ebooks/components/_image-text.tsx index 5e44e8d5814..ed3b9160436 100644 --- a/src/pages/landing/ebooks/components/_image-text.tsx +++ b/src/pages/landing/ebooks/components/_image-text.tsx @@ -1,19 +1,12 @@ import React from 'react' import styled from 'styled-components' +import { ImageTextAndIntroductionProps } from './_types' import { Header, Text, Li } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import BackgroundPattern from 'images/svg/landing/ebook-intro-bg.svg' import device from 'themes/device' import { localize, Localize } from 'components/localization' -type ImageTextProps = { - imageWidth: number - introImage: string - introList?: string[] - introPara: string - subPara: string -} - const BackgroundWrapper = styled.div` width: 100%; height: 100%; @@ -98,7 +91,13 @@ const MediaItemList = styled.ul` font-size: 20px; ` -const ImageText = ({ introImage, imageWidth, introPara, subPara, introList }: ImageTextProps) => { +const ImageText = ({ + introImage, + imageWidth, + introPara, + subPara, + introList, +}: ImageTextAndIntroductionProps) => { return ( diff --git a/src/pages/landing/ebooks/components/_topics.tsx b/src/pages/landing/ebooks/components/_topics.tsx index 59c6a6fd98c..a0be25a5071 100644 --- a/src/pages/landing/ebooks/components/_topics.tsx +++ b/src/pages/landing/ebooks/components/_topics.tsx @@ -1,5 +1,6 @@ import React from 'react' import styled from 'styled-components' +import { ImageDataLike } from 'gatsby-plugin-image' import { Header, Li, QueryImage } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import device from 'themes/device' @@ -7,7 +8,7 @@ import { localize, Localize } from 'components/localization' type TopicsProps = { title?: string - topicsImage: any + topicsImage: ImageDataLike topicsList: string[] } diff --git a/src/pages/landing/ebooks/components/_types.ts b/src/pages/landing/ebooks/components/_types.ts new file mode 100644 index 00000000000..dfce317e88c --- /dev/null +++ b/src/pages/landing/ebooks/components/_types.ts @@ -0,0 +1,20 @@ +import { ImageDataLike } from 'gatsby-plugin-image' + +export type HeaderAndHeroProps = { + authorDesc: string + authorName: string + bg?: string + bgMobile?: string + ebook_utm_code: string + introMain: string + introSub: string + mainHeaderImage: ImageDataLike +} + +export type ImageTextAndIntroductionProps = { + imageWidth: number + introImage: string + introList?: string[] + introPara: string + subPara?: string +} diff --git a/src/pages/landing/ebooks/forex.tsx b/src/pages/landing/ebooks/forex.tsx index ad1fc65a6f6..6ddf92466dd 100644 --- a/src/pages/landing/ebooks/forex.tsx +++ b/src/pages/landing/ebooks/forex.tsx @@ -1,7 +1,7 @@ import React from 'react' import { graphql, useStaticQuery } from 'gatsby' import Introduction from './components/_introduction' -import HeaderSection from './components/_header' +import HeaderSection from './components/_header-section' import Topics from './components/_topics' import Layout from 'components/layout/layout' import { SEO } from 'components/containers' diff --git a/src/pages/landing/ebooks/stocks.tsx b/src/pages/landing/ebooks/stocks.tsx index 0d6c8eb1abf..a9fad8b38e3 100644 --- a/src/pages/landing/ebooks/stocks.tsx +++ b/src/pages/landing/ebooks/stocks.tsx @@ -1,6 +1,6 @@ import React from 'react' import { graphql, useStaticQuery } from 'gatsby' -import HeaderSection from './components/_header' +import HeaderSection from './components/_header-section' import Introduction from './components/_introduction' import Topics from './components/_topics' import Layout from 'components/layout/layout' From df1a1de307c5d76f06e9b3f9f5b9311a2f7672a4 Mon Sep 17 00:00:00 2001 From: mohammad-rework <93753441+mohammad-rework@users.noreply.github.com> Date: Sat, 15 Jan 2022 01:03:15 +0330 Subject: [PATCH 5/8] Update src/pages/landing/ebooks/components/_topics.tsx Co-authored-by: Sean Ho <72253841+sean-binary@users.noreply.github.com> --- src/pages/landing/ebooks/components/_topics.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/landing/ebooks/components/_topics.tsx b/src/pages/landing/ebooks/components/_topics.tsx index a0be25a5071..510a3c5c4b8 100644 --- a/src/pages/landing/ebooks/components/_topics.tsx +++ b/src/pages/landing/ebooks/components/_topics.tsx @@ -1,6 +1,6 @@ import React from 'react' import styled from 'styled-components' -import { ImageDataLike } from 'gatsby-plugin-image' +import type { ImageDataLike } from 'gatsby-plugin-image' import { Header, Li, QueryImage } from 'components/elements' import checkIcon from 'images/common/ebooks/check-icon.png' import device from 'themes/device' From 24d9ba7808bebee03a97831d0487539e1023406e Mon Sep 17 00:00:00 2001 From: mohammad-rework Date: Sat, 15 Jan 2022 01:10:54 +0330 Subject: [PATCH 6/8] add import type for ImageDataLike --- src/pages/landing/ebooks/components/_types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/landing/ebooks/components/_types.ts b/src/pages/landing/ebooks/components/_types.ts index dfce317e88c..d244534d15f 100644 --- a/src/pages/landing/ebooks/components/_types.ts +++ b/src/pages/landing/ebooks/components/_types.ts @@ -1,4 +1,4 @@ -import { ImageDataLike } from 'gatsby-plugin-image' +import type { ImageDataLike } from 'gatsby-plugin-image' export type HeaderAndHeroProps = { authorDesc: string From 3e4fbfaa991e2a5b912717b79b15515336320975 Mon Sep 17 00:00:00 2001 From: Mohammad Hashemi Date: Wed, 19 Jan 2022 10:30:56 +0330 Subject: [PATCH 7/8] fix: typo GetEbbokProps to GetEbookProps --- src/pages/landing/ebooks/components/_get-ebook.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/landing/ebooks/components/_get-ebook.tsx b/src/pages/landing/ebooks/components/_get-ebook.tsx index 08dd2cc9dd3..417aaa740ad 100644 --- a/src/pages/landing/ebooks/components/_get-ebook.tsx +++ b/src/pages/landing/ebooks/components/_get-ebook.tsx @@ -16,7 +16,7 @@ import Facebook from 'images/svg/custom/facebook-blue.svg' import Google from 'images/svg/custom/google.svg' import ViewEmailImage from 'images/common/sign-up/view-email.png' -type GetEbbokProps = { +type GetEbookProps = { color?: string ebook_utm_code: string onSubmit?: (submit_status: string, email: string) => void @@ -180,7 +180,7 @@ const EmailImage = styled.img` width: 20rem; ` -const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: GetEbbokProps) => { +const GetEbook = ({ color = 'var(--color-white)', ebook_utm_code, onSubmit }: GetEbookProps) => { const [is_checked, setChecked] = React.useState(false) const [email, setEmail] = React.useState('') const [is_submitting, setIsSubmitting] = React.useState(false) From e05fbef0f3b9061fd95735fc0d8fca498d0bd201 Mon Sep 17 00:00:00 2001 From: Mohammad Hashemi Date: Sat, 22 Jan 2022 15:37:55 +0330 Subject: [PATCH 8/8] fix: revert header image height to it's default --- src/pages/landing/ebooks/components/_header-section.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/landing/ebooks/components/_header-section.tsx b/src/pages/landing/ebooks/components/_header-section.tsx index 7bcf712014d..79e1b041577 100644 --- a/src/pages/landing/ebooks/components/_header-section.tsx +++ b/src/pages/landing/ebooks/components/_header-section.tsx @@ -85,7 +85,7 @@ const HeaderImage = styled(QueryImage)` @media ${device.tabletS} { width: ${(props) => (props.imgWidth < 600 ? '115%' : '105%')}; - height: ${(props) => (props.imgWidth < 600 ? '115%' : '105%')}; + height: ${(props) => props.imgWidth < 600 && '105%'}; margin-left: ${(props) => (props.imgWidth < 600 ? '-110px' : '-50px')}; } @media ${device.mobileS} {