From 777b8eda31cb37978b3840071a202d390a741090 Mon Sep 17 00:00:00 2001 From: habib-binary Date: Tue, 17 Aug 2021 16:36:49 +0600 Subject: [PATCH 1/9] add query implementation --- src/pages/blog/index.js | 87 +++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 38 deletions(-) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index 11ff82a40a8..ce7284e041e 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -1,5 +1,5 @@ import React from 'react' -import { graphql, useStaticQuery } from 'gatsby' +import { graphql, StaticQuery } from 'gatsby' import styled from 'styled-components' import Subscribe from './components/_subscribe' import RecentFeaturedPosts from './_recent-featured-posts' @@ -10,19 +10,19 @@ import { Container, SEO, Flex } from 'components/containers' import { localize, WithIntl } from 'components/localization' import { Carousel } from 'components/elements' -const query = graphql` - query { - hero_image_one: file(relativePath: { eq: "blog/blog-bg1.png" }) { - ...fadeIn - } - hero_image_two: file(relativePath: { eq: "blog/blog-bg2.png" }) { - ...fadeIn - } - hero_image_three: file(relativePath: { eq: "blog/blog-bg3.png" }) { - ...fadeIn - } - } -` +// const query = graphql` +// query { +// hero_image_one: file(relativePath: { eq: "blog/blog-bg1.png" }) { +// ...fadeIn +// } +// hero_image_two: file(relativePath: { eq: "blog/blog-bg2.png" }) { +// ...fadeIn +// } +// hero_image_three: file(relativePath: { eq: "blog/blog-bg3.png" }) { +// ...fadeIn +// } +// } +// ` const MainWrapper = styled(Flex)` background-color: var(--color-white); flex-direction: column; @@ -46,34 +46,45 @@ const DerivBlog = () => { nav_color: '--color-grey-5', }, } - const data = useStaticQuery(query) + + // const data = useStaticQuery(query) return ( - - - - - + ( + + {console.log(data, '12')} + + + )} + /> From 842b137bf9838bb5e949d8dab1d8e89e876acc9e Mon Sep 17 00:00:00 2001 From: habib-binary Date: Wed, 18 Aug 2021 20:32:01 +0600 Subject: [PATCH 2/9] add data fro m graphql --- id_rsa_binary | 49 ++++++++++++++++++++++++++++ id_rsa_binary.pub | 1 + src/pages/blog/index.js | 72 +++++++++++++++++++---------------------- 3 files changed, 84 insertions(+), 38 deletions(-) create mode 100644 id_rsa_binary create mode 100644 id_rsa_binary.pub diff --git a/id_rsa_binary b/id_rsa_binary new file mode 100644 index 00000000000..68f88b860d4 --- /dev/null +++ b/id_rsa_binary @@ -0,0 +1,49 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +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 +-----END OPENSSH PRIVATE KEY----- diff --git a/id_rsa_binary.pub b/id_rsa_binary.pub new file mode 100644 index 00000000000..946dc0b5ebc --- /dev/null +++ b/id_rsa_binary.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqGeIopS1xyUSTg2koeyWliMl4YZmMyE5DpmZtoa5y/lsDud7ND0PwqneInbCCGniAlEV8+F/FN/BlX0nv1jc2MEmi+dJX0ZZmL76Wt6z77h/uDHX8dAvS13luvUT+OvMpTIQ1d6lE3S6l02wmZ2uw2qNnYJPRNC33DmNP6wB3/k8sWB2ZxU8k1hJxX89ww93r6rYDmNaVggCOIB+yQVQlbQJltyA80jbT04dw9gf8byG/JAh2L1lBpNgrfOK4+b9enOGZIb894cFAGjhVipLEdhF3d8E7I5Wi5Kr1mRoV2o6dYKInl6oo54lymhk0DkGTOljkpELWXvMsjIxEvDAUn5Mqd5rMVkpR6Mm/dJRceZflHbLNW8LAPzJsQShd+nxc2PoGUsbE80+dlmUaGb0FTbQaSTRj2oxVmnH15PNgiRDGSBwYTGyxNMVZt7oe5g2Lex8+DOxWgs8DYpZszegsy0M0AiaIHIcxKYxzV6CESNo/lm3OXRgo0d2OKeoJPQ0NFBYc1vWDG5HU7tBifQpcFxuJp3k0MTL4hMhiLAeCiYj1BLDvA2W/PEUKgnSGpuWM56xhhAYcYQ4QaLbrdZSOG3n8ELH5OI/DmrH1/KaV9OZRdCFwoSCQK3b2I1SNANKWTnKXioDbQUKKxCOm2NreW4GBb2OX3kBmsL+nH8c35w== habib@deriv.com diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index ce7284e041e..c5dafe9063d 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -1,14 +1,15 @@ -import React from 'react' +import React, { useState } from 'react' import { graphql, StaticQuery } from 'gatsby' +// import { graphql, StaticQuery, useStaticQuery } from 'gatsby' import styled from 'styled-components' import Subscribe from './components/_subscribe' import RecentFeaturedPosts from './_recent-featured-posts' import DVideoBanner from './video-banner' -import Hero from './components/_hero' +// import Hero from './components/_hero' import Layout from 'components/layout/layout' import { Container, SEO, Flex } from 'components/containers' import { localize, WithIntl } from 'components/localization' -import { Carousel } from 'components/elements' +// import { Carousel } from 'components/elements' // const query = graphql` // query { @@ -30,63 +31,58 @@ const MainWrapper = styled(Flex)` ` const DerivBlog = () => { - const settings = { - options: { - loop: true, - }, - container_style: { - maxWidth: '100%', - margin: '0 auto', - }, - slide_style: { - minWidth: '100%', - position: 'relative', - }, - navigation_style: { - nav_color: '--color-grey-5', - }, - } - + // const settings = { + // options: { + // loop: true, + // }, + // container_style: { + // maxWidth: '100%', + // margin: '0 auto', + // }, + // slide_style: { + // minWidth: '100%', + // position: 'relative', + // }, + // navigation_style: { + // nav_color: '--color-grey-5', + // }, + // } + const [header, setheader] = useState('') // const data = useStaticQuery(query) return ( + + +

Hello world

( - - {console.log(data, '12')} - - - )} + render={(data) => setheader(data.directus.homepage_banners)} /> - + + {/* */} + {header && header.map((x) =>

{localize(x.heading)}

)} + {/*
*/} From d70539446717672ec9a0f1e27bea8991a4c3e428 Mon Sep 17 00:00:00 2001 From: habib-binary Date: Wed, 18 Aug 2021 21:01:09 +0600 Subject: [PATCH 3/9] remove binary files --- id_rsa_binary | 49 ----------------------------------------------- id_rsa_binary.pub | 1 - 2 files changed, 50 deletions(-) delete mode 100644 id_rsa_binary delete mode 100644 id_rsa_binary.pub diff --git a/id_rsa_binary b/id_rsa_binary deleted file mode 100644 index 68f88b860d4..00000000000 --- a/id_rsa_binary +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/id_rsa_binary.pub b/id_rsa_binary.pub deleted file mode 100644 index 946dc0b5ebc..00000000000 --- a/id_rsa_binary.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqGeIopS1xyUSTg2koeyWliMl4YZmMyE5DpmZtoa5y/lsDud7ND0PwqneInbCCGniAlEV8+F/FN/BlX0nv1jc2MEmi+dJX0ZZmL76Wt6z77h/uDHX8dAvS13luvUT+OvMpTIQ1d6lE3S6l02wmZ2uw2qNnYJPRNC33DmNP6wB3/k8sWB2ZxU8k1hJxX89ww93r6rYDmNaVggCOIB+yQVQlbQJltyA80jbT04dw9gf8byG/JAh2L1lBpNgrfOK4+b9enOGZIb894cFAGjhVipLEdhF3d8E7I5Wi5Kr1mRoV2o6dYKInl6oo54lymhk0DkGTOljkpELWXvMsjIxEvDAUn5Mqd5rMVkpR6Mm/dJRceZflHbLNW8LAPzJsQShd+nxc2PoGUsbE80+dlmUaGb0FTbQaSTRj2oxVmnH15PNgiRDGSBwYTGyxNMVZt7oe5g2Lex8+DOxWgs8DYpZszegsy0M0AiaIHIcxKYxzV6CESNo/lm3OXRgo0d2OKeoJPQ0NFBYc1vWDG5HU7tBifQpcFxuJp3k0MTL4hMhiLAeCiYj1BLDvA2W/PEUKgnSGpuWM56xhhAYcYQ4QaLbrdZSOG3n8ELH5OI/DmrH1/KaV9OZRdCFwoSCQK3b2I1SNANKWTnKXioDbQUKKxCOm2NreW4GBb2OX3kBmsL+nH8c35w== habib@deriv.com From 0fd56eb517a18b431fda623bd0596c3558a2fda8 Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 00:05:55 +0600 Subject: [PATCH 4/9] add data from cms --- src/pages/blog/components/_hero.js | 5 +- src/pages/blog/index.js | 139 ++++++++++++++++------------- 2 files changed, 76 insertions(+), 68 deletions(-) diff --git a/src/pages/blog/components/_hero.js b/src/pages/blog/components/_hero.js index d5b2e81477d..bb079af02ab 100644 --- a/src/pages/blog/components/_hero.js +++ b/src/pages/blog/components/_hero.js @@ -4,7 +4,6 @@ import styled from 'styled-components' import { TextWrapper, Title } from './_common' import device from 'themes/device.js' import { Flex } from 'components/containers' -import { QueryImage } from 'components/elements' const MainWrapper = styled.div` width: 100%; @@ -75,9 +74,7 @@ const Hero = ({ heroImage, title, description }) => ( {description} - - - + {heroImage} ) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index c5dafe9063d..a1b18ced490 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -1,88 +1,95 @@ -import React, { useState } from 'react' -import { graphql, StaticQuery } from 'gatsby' -// import { graphql, StaticQuery, useStaticQuery } from 'gatsby' +import React from 'react' +import PropTypes from 'prop-types' +import { graphql } from 'gatsby' import styled from 'styled-components' import Subscribe from './components/_subscribe' import RecentFeaturedPosts from './_recent-featured-posts' import DVideoBanner from './video-banner' -// import Hero from './components/_hero' +import Hero from './components/_hero' import Layout from 'components/layout/layout' import { Container, SEO, Flex } from 'components/containers' import { localize, WithIntl } from 'components/localization' -// import { Carousel } from 'components/elements' +import { Carousel, QueryImage } from 'components/elements' -// const query = graphql` -// query { -// hero_image_one: file(relativePath: { eq: "blog/blog-bg1.png" }) { -// ...fadeIn -// } -// hero_image_two: file(relativePath: { eq: "blog/blog-bg2.png" }) { -// ...fadeIn -// } -// hero_image_three: file(relativePath: { eq: "blog/blog-bg3.png" }) { -// ...fadeIn -// } -// } -// ` const MainWrapper = styled(Flex)` background-color: var(--color-white); flex-direction: column; overflow: hidden; ` +export const query = graphql` + query MyQuery { + directus { + homepage_banners { + id + heading + sub_heading + image { + imageFile { + childImageSharp { + gatsbyImageData + } + } + id + } + } + } + } +` -const DerivBlog = () => { - // const settings = { - // options: { - // loop: true, - // }, - // container_style: { - // maxWidth: '100%', - // margin: '0 auto', - // }, - // slide_style: { - // minWidth: '100%', - // position: 'relative', - // }, - // navigation_style: { - // nav_color: '--color-grey-5', - // }, - // } - const [header, setheader] = useState('') - // const data = useStaticQuery(query) +const DerivBlog = ({ data }) => { + const settings = { + options: { + loop: true, + }, + container_style: { + maxWidth: '100%', + margin: '0 auto', + }, + slide_style: { + minWidth: '100%', + position: 'relative', + }, + navigation_style: { + nav_color: '--color-grey-5', + }, + } + const homepage_banner_data = data.directus.homepage_banners return ( - - -

Hello world

- + {/* {homepage_banner_data.map((page_data)=>{ */} + + } + title={homepage_banner_data[0].heading} + description={homepage_banner_data[0].sub_heading} + /> + } - `} - render={(data) => setheader(data.directus.homepage_banners)} - /> + title={homepage_banner_data[1].heading} + description={homepage_banner_data[1].sub_heading} + /> + {/* })} */} + - - {/* */} - {header && header.map((x) =>

{localize(x.heading)}

)} - {/*
*/} + @@ -93,4 +100,8 @@ const DerivBlog = () => { ) } +DerivBlog.propTypes = { + data: PropTypes.object, +} + export default WithIntl()(DerivBlog) From 32ec6220fc1866f7b7a1904676981badb08495ef Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 00:11:07 +0600 Subject: [PATCH 5/9] add data from cms graphql published --- src/pages/blog/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index a1b18ced490..355915c8e4e 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -19,7 +19,7 @@ const MainWrapper = styled(Flex)` export const query = graphql` query MyQuery { directus { - homepage_banners { + homepage_banners(filter: { status: { _eq: "published" } }) { id heading sub_heading From 83e4c7f3f3fb3af9da74cdad843ae7762b9dc2da Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 01:33:02 +0600 Subject: [PATCH 6/9] add dynamic data --- src/pages/blog/index.js | 42 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index 355915c8e4e..245c7035e56 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -59,34 +59,24 @@ const DerivBlog = ({ data }) => { - {/* {homepage_banner_data.map((page_data)=>{ */} - { + return ( + } - alt={homepage_banner_data[0].image.description || ''} + title={page_data.heading} + description={page_data.sub_heading} /> - } - title={homepage_banner_data[0].heading} - description={homepage_banner_data[0].sub_heading} - /> - - } - title={homepage_banner_data[1].heading} - description={homepage_banner_data[1].sub_heading} - /> - {/* })} */} + ) + })} From afa11050a1c2e159b0ff4a28b17d0ba703a31bae Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 13:28:34 +0600 Subject: [PATCH 7/9] add queryimage fix --- src/pages/blog/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index 245c7035e56..28093eaadcd 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -56,7 +56,12 @@ const DerivBlog = ({ data }) => { const homepage_banner_data = data.directus.homepage_banners return ( - + {homepage_banner_data.map((page_data) => { @@ -65,10 +70,7 @@ const DerivBlog = ({ data }) => { key={page_data.id} heroImage={ } From bed77b2454f4d8f72b8bd83a6e30fb6444b99cb3 Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 13:33:37 +0600 Subject: [PATCH 8/9] width fix banner --- src/pages/blog/components/_hero.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/blog/components/_hero.js b/src/pages/blog/components/_hero.js index bb079af02ab..21a666fbca0 100644 --- a/src/pages/blog/components/_hero.js +++ b/src/pages/blog/components/_hero.js @@ -50,6 +50,9 @@ const Wrapper = styled(Flex)` @media screen and (min-width: 1980px) { max-width: 1900px; } + @media screen and (max-width: 500px) { + padding: 2rem 4rem; + } ` const Hero = ({ heroImage, title, description }) => ( From ac3b7fc9e746d65dfafcb8a69ca77ebeb3f97eca Mon Sep 17 00:00:00 2001 From: habib-binary Date: Thu, 19 Aug 2021 14:34:24 +0600 Subject: [PATCH 9/9] add links --- src/pages/blog/index.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/pages/blog/index.js b/src/pages/blog/index.js index 28093eaadcd..e3603f7157f 100644 --- a/src/pages/blog/index.js +++ b/src/pages/blog/index.js @@ -8,7 +8,7 @@ import DVideoBanner from './video-banner' import Hero from './components/_hero' import Layout from 'components/layout/layout' import { Container, SEO, Flex } from 'components/containers' -import { localize, WithIntl } from 'components/localization' +import { localize, WithIntl, LocalizedLink } from 'components/localization' import { Carousel, QueryImage } from 'components/elements' const MainWrapper = styled(Flex)` @@ -21,6 +21,7 @@ export const query = graphql` directus { homepage_banners(filter: { status: { _eq: "published" } }) { id + link heading sub_heading image { @@ -66,17 +67,22 @@ const DerivBlog = ({ data }) => { {homepage_banner_data.map((page_data) => { return ( - - } - title={page_data.heading} - description={page_data.sub_heading} - /> + to={page_data.link} + style={{ textDecoration: 'none' }} + > + + } + title={page_data.heading} + description={page_data.sub_heading} + /> + ) })}