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.

nikolai.berestevich/feat/update links to blog page #1918

Merged
1 commit merged into from
Jul 14, 2021
Merged

nikolai.berestevich/feat/update links to blog page #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions src/components/custom/other-platforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,7 @@ export const NavResources = ({ onClick }) => (
icon={() => <img src={Blog} alt="blog" width="24" height="24" />}
title={localize('Blog')}
onClick={onClick}
to=""
type="blog"
external="true"
target="_blank"
rel="noopener noreferrer"
to="/blog"
/>
</Flex>
)
Expand Down
12 changes: 1 addition & 11 deletions src/components/elements/off-canvas-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,21 +501,11 @@ export const OffCanvasMenuWrapper = (props) => {
<img src={Diagonal} alt="diagonal" width="16" height="16" />
</SpanSvg>
</StyledLink>
<StyledLink
to=""
type="blog"
external="true"
target="_blank"
rel="noopener noreferrer"
onClick={handleArrowClick}
>
<StyledLink to="/blog" onClick={handleArrowClick}>
<div>
<img src={Blog} alt="blog" width="24" height="24" />
</div>
<Span>{localize('Blog')}</Span>
<SpanSvg>
<img src={Diagonal} alt="diagonal" width="16" height="16" />
</SpanSvg>
</StyledLink>
</AccordionItem>
<AccordionItem
Expand Down
67 changes: 17 additions & 50 deletions src/components/layout/footer/main-links.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import React from 'react'
import PropTypes from 'prop-types'
import {LinksWrapper, LinkWrapper, LinksCol, Title, Link } from './common/style.js'
import { LinksWrapper, LinkWrapper, LinksCol, Title, Link } from './common/style.js'
import { localize } from 'components/localization'
import { Flex, Show } from 'components/containers'
import {
deriv_status_page_url,
} from 'common/constants'

const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
import { deriv_status_page_url } from 'common/constants'

const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
return (
<LinksWrapper>
<Show.Desktop>
Expand All @@ -24,14 +21,10 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
<Link to="/leadership/">{localize('Our leadership')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/why-choose-us/">
{localize('Why choose us?')}
</Link>
<Link to="/why-choose-us/">{localize('Why choose us?')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/partners/">
{localize('Partnership programmes')}
</Link>
<Link to="/partners/">{localize('Partnership programmes')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/contact_us/">{localize('Contact us')}</Link>
Expand Down Expand Up @@ -78,21 +71,15 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
<Title>{localize('TRADE TYPES')}</Title>
</LinkWrapper>
<LinkWrapper first_child="true">
<Link to="/trade-types/margin/">
{localize('Margin trading')}
</Link>
<Link to="/trade-types/margin/">{localize('Margin trading')}</Link>
</LinkWrapper>
<Show.NonEU>
<LinkWrapper>
<Link to="/trade-types/options/">
{localize('Options')}
</Link>
<Link to="/trade-types/options/">{localize('Options')}</Link>
</LinkWrapper>
</Show.NonEU>
<LinkWrapper>
<Link to="/trade-types/multiplier/">
{localize('Multipliers')}
</Link>
<Link to="/trade-types/multiplier/">{localize('Multipliers')}</Link>
</LinkWrapper>
</LinksCol>
)}
Expand All @@ -111,24 +98,18 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
</LinkWrapper>
)}
<LinkWrapper>
<Link to="/markets/stock/">
{localize('Stock indices')}
</Link>
<Link to="/markets/stock/">{localize('Stock indices')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/markets/commodities/">
{localize('Commodities')}
</Link>
<Link to="/markets/commodities/">{localize('Commodities')}</Link>
</LinkWrapper>
</LinksCol>
<LinksCol>
<LinkWrapper>
<Title>{localize('LEGAL')}</Title>
</LinkWrapper>
<LinkWrapper first_child="true">
<Link to="/regulatory">
{localize('Regulatory information')}
</Link>
<Link to="/regulatory">{localize('Regulatory information')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/terms-and-conditions">
Expand All @@ -151,9 +132,7 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/partners/payment-agent/">
{localize('Payment agents')}
</Link>
<Link to="/partners/payment-agent/">{localize('Payment agents')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link
Expand Down Expand Up @@ -186,14 +165,10 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/trader-tools/">
{localize('Traders’ tools')}
</Link>
<Link to="/trader-tools/">{localize('Traders’ tools')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/payment-methods/">
{localize('Payment methods')}
</Link>
<Link to="/payment-methods/">{localize('Payment methods')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link
Expand All @@ -206,15 +181,7 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
</Link>
</LinkWrapper>
<LinkWrapper>
<Link
to=""
type="blog"
external="true"
target="_blank"
rel="noopener noreferrer"
>
{localize('Blog')}
</Link>
<Link to="/blog">{localize('Blog')}</Link>
</LinkWrapper>
</LinksCol>
</Flex>
Expand All @@ -223,11 +190,11 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
)
}

export default MainLinksSection;
export default MainLinksSection

MainLinksSection.propTypes = {
is_eu_country: PropTypes.bool,
is_ppc: PropTypes.bool,
is_ppc_redirect: PropTypes.bool,
type: PropTypes.string,
}
}