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.

Nuri/fix :Change tags from market news to market report #2124

Merged
3 commits merged into from
Sep 21, 2021
Merged

Nuri/fix :Change tags from market news to market report #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3fb18f
change tags from market news to market report
njazuli-deriv Sep 21, 2021
d399977
change weekly report tag to market report
njazuli-deriv Sep 21, 2021
9629c5e
remove comments
njazuli-deriv Sep 21, 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
7 changes: 6 additions & 1 deletion src/pages/academy/blog/posts/_style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled, { css } from 'styled-components'
import { Box, Flex, Container } from 'components/containers'
import { LocalizedLinkText, Text } from 'components/elements'
import { LocalizedLinkText, Header, Text } from 'components/elements'
import device from 'themes/device'

export const Background = styled.div`
Expand Down Expand Up @@ -51,6 +51,11 @@ export const BreadcrumbsWrapper = styled(Container)`
flex-direction: column;
}
`
export const ArticleTitle = styled(Header)`
@media ${device.desktopS} {
font-size: 48px;
}
`
export const HeroLeftWrapper = styled(Box)`
max-width: 384px;
margin-right: 24px;
Expand Down
6 changes: 3 additions & 3 deletions src/pages/academy/blog/posts/preview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'
import PropTypes from 'prop-types'
import {
ArticleTitle,
Background,
HeroContainer,
BreadcrumbsWrapper,
Expand Down Expand Up @@ -33,7 +34,6 @@ import ArticleEmailBanner from '../../../components/_side-subscription-banner'
import { localize, WithIntl } from 'components/localization'
import Layout from 'components/layout/layout'
import { SEO, Show, Box, Flex, SectionContainer } from 'components/containers'
import { Header } from 'components/elements'
import { convertDate, isBrowser } from 'common/utility'
import { cms_assets_end_point } from 'common/constants'
import RightArrow from 'images/svg/black-right-arrow.svg'
Expand Down Expand Up @@ -134,9 +134,9 @@ const BlogPreview = () => {
{post_data?.published_date &&
convertDate(post_data?.published_date)}
</InfoText>
<Header as="h1" type="page-title">
<ArticleTitle as="h1" type="page-title">
{post_data?.blog_title}
</Header>
</ArticleTitle>
<InfoText size="14px" mt="16px">
{post_data?.read_time_in_minutes &&
post_data?.read_time_in_minutes +
Expand Down
3 changes: 1 addition & 2 deletions src/pages/academy/components/_markets-news.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ const MarketNews = ({ data }) => {
/>
<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>
<StyledSpan>Market report</StyledSpan>
</Header>
<Header mt="8px" type="paragraph-1" weight="bold">
{truncateString(data.blog_title, 38)}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/academy/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const query = graphql`
}
market_news: blog(
filter: {
tags: { tags_id: { tag_name: { _contains: "Market News" } } }
tags: { tags_id: { tag_name: { _contains: "Market report" } } }
status: { _eq: "published" }
}
limit: 6
Expand All @@ -64,7 +64,7 @@ export const query = graphql`
}
market_news_eu: blog(
filter: {
tags: { tags_id: { tag_name: { _contains: "Market News" } } }
tags: { tags_id: { tag_name: { _contains: "Market report" } } }
status: { _eq: "published" }
hide_for_eu: { _eq: false }
}
Expand Down
7 changes: 4 additions & 3 deletions src/templates/article.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
import PropTypes from 'prop-types'
import { graphql } from 'gatsby'
import {
ArticleTitle,
Background,
HeroContainer,
BreadcrumbsWrapper,
Expand Down Expand Up @@ -34,7 +35,7 @@ import SocialSharing from '../pages/academy/components/_social-sharing'
import { localize, WithIntl } from 'components/localization'
import Layout from 'components/layout/layout'
import { SEO, Show, Box, Flex, SectionContainer } from 'components/containers'
import { Header, QueryImage } from 'components/elements'
import { QueryImage } from 'components/elements'
import { convertDate } from 'common/utility'
import RightArrow from 'images/svg/black-right-arrow.svg'

Expand Down Expand Up @@ -121,9 +122,9 @@ const ArticlesTemplate = (props) => {
{post_data?.published_date &&
convertDate(post_data?.published_date)}
</InfoText>
<Header as="h1" type="page-title">
<ArticleTitle as="h1" type="page-title">
{post_data?.blog_title}
</Header>
</ArticleTitle>
<InfoText size="14px" mt="16px">
{post_data?.read_time_in_minutes &&
localize(post_data?.read_time_in_minutes + ' min read')}
Expand Down