diff --git a/gatsby-node.js b/gatsby-node.js index 24d093f4cb1..33ecaeadadf 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -16,22 +16,6 @@ exports.onCreatePage = ({ page, actions }) => { const is_story = /story/g.test(page.path) const is_market = /markets/g.test(page.path) const is_cfds = /cfds/g.test(page.path) - const is_landing_ebooks =/landing\/ebooks/g.test(page.path) - - if (is_landing_ebooks) { - createRedirect({ - fromPath: `/landing/ebooks/`, - toPath: `/404/`, - redirectInBrowser: true, - isPermanent: true, - }) - createRedirect({ - fromPath: `/landing/ebooks`, - toPath: `/404`, - redirectInBrowser: true, - isPermanent: true, - }) - } if (is_responsible_trading) { createRedirect({ @@ -87,13 +71,13 @@ exports.onCreatePage = ({ page, actions }) => { if (is_story) { createRedirect({ fromPath: `/about/`, - toPath: `/story/`, + toPath: `/who-we-are/`, redirectInBrowser: true, isPermanent: true, }) createRedirect({ fromPath: `/about`, - toPath: `/story/`, + toPath: `/who-we-are/`, redirectInBrowser: true, isPermanent: true, }) @@ -191,20 +175,6 @@ exports.onCreatePage = ({ page, actions }) => { isPermanent: true, }) } - if (is_landing_ebooks) { - createRedirect({ - fromPath: `/${lang}/landing/ebooks/`, - toPath: `/${lang}/404/`, - redirectInBrowser: true, - isPermanent: true, - }) - createRedirect({ - fromPath: `/${lang}/landing/ebooks`, - toPath: `/${lang}/404`, - redirectInBrowser: true, - isPermanent: true, - }) - } if (is_contact_us) { createRedirect({ @@ -245,13 +215,13 @@ exports.onCreatePage = ({ page, actions }) => { if (is_story) { createRedirect({ fromPath: `/${lang}/about/`, - toPath: `/${lang}/story/`, + toPath: `/${lang}/who-we-are/`, redirectInBrowser: true, isPermanent: true, }) createRedirect({ fromPath: `/${lang}/about`, - toPath: `/${lang}/story/`, + toPath: `/${lang}/who-we-are/`, redirectInBrowser: true, isPermanent: true, }) diff --git a/package-lock.json b/package-lock.json index ba514c46f80..946e39b588a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63483,4 +63483,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/src/common/utility.js b/src/common/utility.js index 4531dd9963f..f19751f69e7 100644 --- a/src/common/utility.js +++ b/src/common/utility.js @@ -315,7 +315,7 @@ export const addScript = (settings) => { // Function to get the user selected language, can be used in the future once need to check other languages export const isChoosenLanguage = () => ({ english: getLanguage() === 'en' }) -// Function to manually replace server's locale ("zh_tw" or "zh_cn") to "zh-tw"/"zh-cn" +// Function to manually replace server's locale ("zh_tw" or "zh_cn") to "zh-tw"/"zh-cn" export const replaceLocale = (locale) => { let checked_locale = locale if (locale === 'zh_tw') { diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js index 77dbc54abc2..cbf8616f080 100644 --- a/src/components/custom/other-platforms.js +++ b/src/components/custom/other-platforms.js @@ -30,7 +30,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg' import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg' import Forex from 'images/svg/custom/forex-nav.svg' import Help from 'images/svg/menu/help-center.svg' -import Leadership from 'images/svg/menu/leadership.svg' import CFD from 'images/svg/custom/margin-trading-nav.svg' import Multipliers from 'images/svg/custom/multipliers-nav.svg' import Options from 'images/svg/custom/options-nav.svg' @@ -470,15 +469,9 @@ export const NavCompany = ({ onClick }) => ( } - title={localize('Our story')} + title={localize('Who we are')} onClick={onClick} - to="/story/" - /> - } - title={localize('Our leadership')} - onClick={onClick} - to="/leadership/" + to="/who-we-are/" /> } diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js index ab64799ef88..fa428f3b1ec 100644 --- a/src/components/elements/off-canvas-menu.js +++ b/src/components/elements/off-canvas-menu.js @@ -24,7 +24,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg' import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg' import Forex from 'images/svg/custom/forex-nav.svg' import Help from 'images/svg/menu/help-center.svg' -import Leadership from 'images/svg/menu/leadership.svg' import CFD from 'images/svg/custom/margin-trading-nav.svg' import Multipliers from 'images/svg/custom/multipliers-nav.svg' import Options from 'images/svg/custom/options-nav.svg' @@ -377,17 +376,11 @@ export const OffCanvasMenuWrapper = (props) => { header_style={header_style} style={content_style} > - +
- {localize('Our story')} -
- -
- -
- {localize('Our leadership')} + {localize('Who we are')}
diff --git a/src/components/elements/query-image.tsx b/src/components/elements/query-image.tsx index bb60eaf6559..ebf85c60de1 100644 --- a/src/components/elements/query-image.tsx +++ b/src/components/elements/query-image.tsx @@ -12,7 +12,7 @@ type QueryImageProps = { loading?: 'eager' | 'lazy' } -type ImageWrapperProps = { +export type ImageWrapperProps = { width: string height: string className?: string diff --git a/src/components/form/button.js b/src/components/form/button.js index bb77fa24da4..1dae9325065 100644 --- a/src/components/form/button.js +++ b/src/components/form/button.js @@ -101,6 +101,7 @@ export const SharedButtonStyle = css` padding: 17px 24px; font-size: 20px; line-height: 30px; + border-radius: 8px; &:hover { background-color: var(--color-red-3); diff --git a/src/components/layout/footer/main-links.js b/src/components/layout/footer/main-links.js index 319f44f06e9..a77a63015f5 100644 --- a/src/components/layout/footer/main-links.js +++ b/src/components/layout/footer/main-links.js @@ -15,10 +15,7 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => { Codestin Search App - {localize('Our story')} - - - {localize('Our leadership')} + {localize('Who we are')} {localize('Why choose us?')} diff --git a/src/components/layout/layout.js b/src/components/layout/layout.js index 1f3d51a7852..70d5e311654 100644 --- a/src/components/layout/layout.js +++ b/src/components/layout/layout.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types' import styled from 'styled-components' import useGTMData from '../hooks/use-gtm-data' import Copyright from './copyright' -import { Nav, NavStatic, NavPartners, NavInterim } from './nav' +import { Nav, NavStatic, NavPartners, NavInterim, NavSticky } from './nav' import JumpIndicesNav from './jump-indices/nav' import { NavCareers } from './nav-careers' import { LocationProvider } from './location-context' @@ -209,6 +209,10 @@ const Layout = ({ Navigation = FooterNav =