From b17c80ff2b52507bd233f7bc0bf7d9d802f8a9d8 Mon Sep 17 00:00:00 2001 From: suthesan Date: Fri, 20 Nov 2020 10:27:35 +0800 Subject: [PATCH 1/2] update seo descriptions, title and remove keywords tag from all pages --- src/components/containers/seo.js | 18 +-- src/pages/help-centre/account.js | 63 +++++----- src/pages/help-centre/dbot.js | 109 ++++++++++-------- .../help-centre/deposits-and-withdrawals.js | 75 ++++++------ src/pages/help-centre/dmt5.js | 66 ++++++----- src/pages/help-centre/dtrader.js | 29 +++-- src/pages/help-centre/security.js | 35 +++--- src/pages/help-centre/trading.js | 73 +++++++----- src/pages/markets/index.js | 2 +- src/pages/trade-types/margin/index.js | 4 +- src/pages/trade-types/multiplier/index.js | 4 +- src/pages/trade-types/options/index.js | 4 +- 12 files changed, 269 insertions(+), 213 deletions(-) diff --git a/src/components/containers/seo.js b/src/components/containers/seo.js index afbdad134ed..cc6a001707c 100644 --- a/src/components/containers/seo.js +++ b/src/components/containers/seo.js @@ -2,7 +2,7 @@ import React from 'react' import PropTypes from 'prop-types' import { Helmet } from 'react-helmet' import { useStaticQuery, graphql } from 'gatsby' -import { LocaleContext, localize } from '../localization' +import { LocaleContext } from '../localization' import language_config from '../../../i18n-config' import TradingImage from 'images/common/practice.png' @@ -82,12 +82,6 @@ const SEO = ({ description, meta, title, no_index, has_organization_schema }) => name: 'description', content: metaDescription, }, - { - name: 'keywords', - content: localize( - 'digital options, forex, forex trading, online trading, financial trading, digitals trading, index trading, trading indices, forex trades, trading commodities, digital options strategy, binary broker, binary bet, digital options trading platform, binary strategy, finance, investment, trading', - ), - }, { name: 'google', content: 'notranslate', @@ -154,11 +148,11 @@ const SEO = ({ description, meta, title, no_index, has_organization_schema }) => }, ...(no_index || no_index_staging || is_ach_page ? [ - { - name: 'robots', - content: 'noindex', - }, - ] + { + name: 'robots', + content: 'noindex', + }, + ] : []), ].concat(meta)} > diff --git a/src/pages/help-centre/account.js b/src/pages/help-centre/account.js index 1d7c53d5456..faa9cd44a67 100644 --- a/src/pages/help-centre/account.js +++ b/src/pages/help-centre/account.js @@ -4,6 +4,7 @@ import { Article } from './_article' import { ArticleWrapper, ExternalLink, StyledHeader, StyledText } from './_help-centre-style' import { deriv_app_url } from 'common/utility' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { localize, Localize, WithIntl } from 'components/localization' const StyledList = styled.ul` @@ -145,35 +146,43 @@ const DormantFee = () => ( const AccountArticle = () => { return ( -
- - - - + - - - -
+
+ + + + + + + +
+ ) } diff --git a/src/pages/help-centre/dbot.js b/src/pages/help-centre/dbot.js index 74c8bb7047f..9db74ca2754 100644 --- a/src/pages/help-centre/dbot.js +++ b/src/pages/help-centre/dbot.js @@ -3,6 +3,7 @@ import styled from 'styled-components' import { Article } from './_article' import { ArticleWrapper, StyledHeader, StyledText } from './_help-centre-style' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { localize, Localize, WithIntl } from 'components/localization' import device from 'themes/device' // Images @@ -702,56 +703,64 @@ const ViewChart = () => ( const DBotArticle = () => { return ( -
- - - - - - - - - - - - - - - -
+
+ +
+ + + + + + + + + + + + + + + +
+
) } diff --git a/src/pages/help-centre/deposits-and-withdrawals.js b/src/pages/help-centre/deposits-and-withdrawals.js index efbc5ca2179..40b01171657 100644 --- a/src/pages/help-centre/deposits-and-withdrawals.js +++ b/src/pages/help-centre/deposits-and-withdrawals.js @@ -3,6 +3,7 @@ import { Article } from './_article' import { ArticleWrapper, ExternalLink, StyledHeader, StyledText } from './_help-centre-style' import { deriv_app_url } from 'common/utility' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { Localize, localize, WithIntl } from 'components/localization' const PaymentMethods = () => ( @@ -123,40 +124,48 @@ const WithdrawMaestroMastercard = () => ( const DepositsAndWithdrawalArticle = () => { return ( -
- + - - - - - - - -
+
+ + + + + + + + +
+ ) } diff --git a/src/pages/help-centre/dmt5.js b/src/pages/help-centre/dmt5.js index fccfe6a0e2e..82e6c0f3a62 100644 --- a/src/pages/help-centre/dmt5.js +++ b/src/pages/help-centre/dmt5.js @@ -3,6 +3,7 @@ import { Article } from './_article' import { ArticleWrapper, ExternalLink, StyledHeader, StyledText } from './_help-centre-style' import { deriv_app_url } from 'common/utility' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { localize, Localize, WithIntl } from 'components/localization' const WhatIsDMT5 = () => ( @@ -142,37 +143,44 @@ const ResetDMT5Password = () => ( const DMT5Article = () => { return ( -
- - - - - + - - -
+
+ + + + + + + +
+ ) } diff --git a/src/pages/help-centre/dtrader.js b/src/pages/help-centre/dtrader.js index ed1c1bf5bcd..9eca035c6ad 100644 --- a/src/pages/help-centre/dtrader.js +++ b/src/pages/help-centre/dtrader.js @@ -2,6 +2,7 @@ import React from 'react' import { Article } from './_article' import { ArticleWrapper, StyledHeader } from './_help-centre-style' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { localize, WithIntl } from 'components/localization' const WhatIsDMT5 = () => ( @@ -37,17 +38,25 @@ const DTraderContracts = () => ( const DTraderArticle = () => { return ( -
- - + - -
+
+ + + +
+ ) } diff --git a/src/pages/help-centre/security.js b/src/pages/help-centre/security.js index 84b02be4eac..89f6dac818c 100644 --- a/src/pages/help-centre/security.js +++ b/src/pages/help-centre/security.js @@ -2,6 +2,7 @@ import React from 'react' import { Article } from './_article' import { ArticleWrapper, StyledHeader } from './_help-centre-style' import { Text } from 'components/elements' +import { SEO } from 'components/containers' import { localize, WithIntl } from 'components/localization' const VerifyAccount = () => ( @@ -43,20 +44,28 @@ const DocumentsDeclined = () => ( const SecurityArticle = () => { return ( -
- + - - -
+
+ + + +
+ ) } diff --git a/src/pages/help-centre/trading.js b/src/pages/help-centre/trading.js index a125274c5e5..5918cece57d 100644 --- a/src/pages/help-centre/trading.js +++ b/src/pages/help-centre/trading.js @@ -4,6 +4,7 @@ import { ArticleWrapper, ExternalLink, StyledHeader } from './_help-centre-style import { deriv_app_url } from 'common/utility' import { Text } from 'components/elements' import { localize, Localize, WithIntl } from 'components/localization' +import { SEO } from 'components/containers' const Forex = () => ( @@ -115,39 +116,47 @@ const WeekendContracts = () => ( const TradingArticle = () => { return ( -
- - - + - - - - - - - -
+
+ + + + + + + + + + +
+ ) } diff --git a/src/pages/markets/index.js b/src/pages/markets/index.js index e7e81e586ff..0f85259be9e 100644 --- a/src/pages/markets/index.js +++ b/src/pages/markets/index.js @@ -120,7 +120,7 @@ const TabsContainer = styled(Flex)` const Markets = () => ( - + diff --git a/src/pages/trade-types/margin/index.js b/src/pages/trade-types/margin/index.js index b00f1bd2c5e..80042bb0942 100644 --- a/src/pages/trade-types/margin/index.js +++ b/src/pages/trade-types/margin/index.js @@ -17,9 +17,9 @@ const Margin = () => { return ( diff --git a/src/pages/trade-types/multiplier/index.js b/src/pages/trade-types/multiplier/index.js index d52eb1a8151..5e61cddbaec 100644 --- a/src/pages/trade-types/multiplier/index.js +++ b/src/pages/trade-types/multiplier/index.js @@ -23,9 +23,9 @@ const Multipliers = () => { return ( diff --git a/src/pages/trade-types/options/index.js b/src/pages/trade-types/options/index.js index fd59e31b970..74d1e608d08 100644 --- a/src/pages/trade-types/options/index.js +++ b/src/pages/trade-types/options/index.js @@ -19,9 +19,9 @@ const Options = () => { return !is_eu_country ? ( From 9034873c00d53e3217b34c4f97291d544ebec805 Mon Sep 17 00:00:00 2001 From: suthesan Date: Mon, 23 Nov 2020 14:07:56 +0800 Subject: [PATCH 2/2] fix seo description in help centre --- src/pages/help-centre/_article.js | 6 ++++-- src/pages/help-centre/account.js | 9 +-------- src/pages/help-centre/dbot.js | 9 +-------- src/pages/help-centre/deposits-and-withdrawals.js | 9 +-------- src/pages/help-centre/dmt5.js | 11 +++-------- src/pages/help-centre/dtrader.js | 9 +-------- src/pages/help-centre/security.js | 9 +-------- src/pages/help-centre/trading.js | 9 +-------- 8 files changed, 13 insertions(+), 58 deletions(-) diff --git a/src/pages/help-centre/_article.js b/src/pages/help-centre/_article.js index de16100cebd..7aac313582c 100644 --- a/src/pages/help-centre/_article.js +++ b/src/pages/help-centre/_article.js @@ -25,10 +25,10 @@ const TabWrapper = styled.div` const ContactContainer = styled.div` margin-top: 8rem; ` -export const Article = ({ children, header }) => { +export const Article = ({ children, header, title, description }) => { return ( - + { Article.propTypes = { children: PropTypes.node, + description: PropTypes.string, header: PropTypes.string, + title: PropTypes.string, } diff --git a/src/pages/help-centre/account.js b/src/pages/help-centre/account.js index faa9cd44a67..d5bbbe1eabd 100644 --- a/src/pages/help-centre/account.js +++ b/src/pages/help-centre/account.js @@ -4,7 +4,6 @@ import { Article } from './_article' import { ArticleWrapper, ExternalLink, StyledHeader, StyledText } from './_help-centre-style' import { deriv_app_url } from 'common/utility' import { Text } from 'components/elements' -import { SEO } from 'components/containers' import { localize, Localize, WithIntl } from 'components/localization' const StyledList = styled.ul` @@ -147,13 +146,7 @@ const DormantFee = () => ( const AccountArticle = () => { return (
- -
+
( const DBotArticle = () => { return (
- -
+
( @@ -125,13 +124,7 @@ const WithdrawMaestroMastercard = () => ( const DepositsAndWithdrawalArticle = () => { return (
- -
+
( @@ -144,13 +143,9 @@ const ResetDMT5Password = () => ( const DMT5Article = () => { return (
- -
+
( @@ -39,13 +38,7 @@ const DTraderContracts = () => ( const DTraderArticle = () => { return (
- -
+
( @@ -45,13 +44,7 @@ const DocumentsDeclined = () => ( const SecurityArticle = () => { return (
- -
+
( @@ -117,13 +116,7 @@ const WeekendContracts = () => ( const TradingArticle = () => { return (
- -
+