Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Suthesh/market-news-data #2016

Merged
6 commits merged into from
Aug 24, 2021
Merged

Suthesh/market-news-data #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b130d4e
updated data source
suthesank Aug 16, 2021
b844d9d
Merge branch 'blog' of github.com:binary-com/deriv-com into suthesh/m…
Aug 17, 2021
574cbc4
fixed key prop
Aug 23, 2021
10a90b9
sort based on published date
Aug 24, 2021
5c73b7a
resolved conflict
Aug 24, 2021
95a38b0
Merge branch 'blog' of github.com:binary-com/deriv-com into suthesh/m…
Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 0 additions & 75 deletions src/pages/blog/_markets-news.js
View file
Open in desktop

This file was deleted.

113 changes: 113 additions & 0 deletions src/pages/blog/components/_markets-news.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import { SectionContainer, Container, Flex } from 'components/containers'
import { Header, QueryImage } from 'components/elements'
import { LocalizedLink } from 'components/localization'
import EyeIcon from 'images/svg/eye.svg'
import device from 'themes/device'

const MarketsNewsWrapper = styled.div`
display: grid;
grid-template-columns: auto auto auto;
grid-gap: 30px;
padding: 10px;
max-height: 211px;

@media ${device.tabletL} {
grid-template-columns: auto auto;
max-height: 330px;
}

@media ${device.tabletS} {
grid-template-columns: auto;
margin: 0 auto;
max-height: 668px;
}
`

const StyledSpan = styled.span`
background-color: var(--color-blue-10);
padding: 3px 8px 1px;
border-radius: 8px;
`

const StyledFlex = styled(Flex)`
max-height: 83px;
`

const StyledLocalizedLink = styled(LocalizedLink)`
text-decoration: none;
`

// Can modify this for second phase to get the tag name
// const getTagName = (tags) => {
// for (let i = 0; i < tags.length; i++){
// if (tags[i].tags_id.tag_name !== 'Market News') return tags[i].tags_id.tag_name
// }
// return 'Market News'
// }

const MarketNews = ({ data }) => {
return (
<SectionContainer>
<Container>
<Flex fd="column">
<Header mb="20px" align="center" type="heading-3" as="h3">
Market news
</Header>
<MarketsNewsWrapper>
{data.map((data) => {
return (
<StyledLocalizedLink
key={data.id}
to={`/academy/blog/${data.slug}`}
>
<StyledFlex>
<QueryImage
data={data.main_image.imageFile}
width="104px"
height="78px"
/>
<Flex ml="8px" fd="column">
<Header type="paragraph-2" color="blue-9">
{/* We'll stick to just weekly report for phase 1 */}
<StyledSpan>Weekly report</StyledSpan>
</Header>
<Header mt="8px" type="paragraph-1" weight="bold">
{data.blog_title}
</Header>
<Flex
mt="auto"
height="fit-content"
jc="center"
ai="center"
>
<img src={EyeIcon} width="16px" height="11px" />
<Header
ml="4px"
mt="3px"
type="small"
weight="normal"
color="grey-5"
>
{data.read_time_in_minutes} min read
</Header>
</Flex>
</Flex>
</StyledFlex>
</StyledLocalizedLink>
)
})}
</MarketsNewsWrapper>
</Flex>
</Container>
</SectionContainer>
)
}

export default MarketNews

MarketNews.propTypes = {
data: PropTypes.object,
}
24 changes: 24 additions & 0 deletions src/pages/blog/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Subscribe from './components/_subscribe'
import RecentFeaturedPosts from './_recent-featured-posts'
import DVideoBanner from './video-banner'
import Hero from './components/_hero'
import MarketNews from './components/_markets-news'
import Layout from 'components/layout/layout'
import { Container, SEO, Flex } from 'components/containers'
import { localize, WithIntl, LocalizedLink } from 'components/localization'
Expand Down Expand Up @@ -33,6 +34,27 @@ export const query = graphql`
id
}
}
blog(
filter: { tags: { tags_id: { tag_name: { _contains: "Market News" } } } }
limit: 6
sort: "-published_date"
) {
id
blog_title
slug
tags {
tags_id {
tag_name
}
}
read_time_in_minutes
main_image {
imageFile {
...fadeIn
}
id
}
}
}
}
`
Expand All @@ -55,6 +77,7 @@ const DerivBlog = ({ data }) => {
},
}
const homepage_banner_data = data.directus.homepage_banners
const market_news_data = data.directus.blog
return (
<Layout type="blog" is_ppc_redirect={true}>
<SEO
Expand Down Expand Up @@ -89,6 +112,7 @@ const DerivBlog = ({ data }) => {
</MainWrapper>
<RecentFeaturedPosts />
<DVideoBanner />
<MarketNews data={market_news_data} />
<Container>
<Flex direction="column" ai="flex-start" jc="space-between">
<Subscribe />
Expand Down
14 changes: 0 additions & 14 deletions src/pages/blog/markets-news/index.js
View file
Open in desktop

This file was deleted.