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.

Commit 788c790

Browse files
nikolaiberestevich-derivNikolai Berestevichpavel-latyshou-deriv“pavel-latyshou-deriv”virtualpowwa
authored
About us v2 (#2533)
* Nikolai.berestevich/feat/add about us page (#2310) * dasfs * nikolai.berestevich/feat:add new about-us page, make links in footer and header * nikolai.berestevich/feat/add header and footer * nikolai.berestevich/fix/SEO Co-authored-by: Nikolai Berestevich <[email protected]> * nikolai.berestevich/feat: add 1st section about-us (#2314) * nikolai.berestevich/feat: add 1st section about-us * nikolai.berestevich/feat: add 1st section about-us Co-authored-by: Nikolai Berestevich <[email protected]> * About us 2nd section (#2318) * nikolai.berestevich/feat: add 1st section about-us * nikolai.berestevich/feat: add 1st section about-us * nikolai.berestevich/feat:add /ourValues section Co-authored-by: Nikolai Berestevich <[email protected]> * nikolai.berestevich/feat/ add our principles section (#2329) * nikolai.berestevich/feat/ add our principles section * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring Co-authored-by: Nikolai Berestevich <[email protected]> * Pavel-Latyshou/Our principle page (#2358) * create Principles page * typescypt * svg optimize Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * Nikolai.berestevich/feat/add 4th section (#2355) * nikolai.berestevich/feat/ add our principles section * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring * nikolai.berestevich/feat/ about-us -refactoring * nikolai.berestevich/feat/ about-us -refactoring Co-authored-by: Nikolai Berestevich <[email protected]> * Kevin/NJ - about us hero (#2320) * about us pt1 * ver1.1 * ver1.2 * ver 1.4 * ver 1.5 * changed the hero layout * changed the padding for hero * fix blinking language switcher * refactor * remove index.js * header styling * more styling * changed the nav height to rem * changed the nav height to rem * remove unused nav file * change to tsx Co-authored-by: njazuli <[email protected]> * Deriv numbers block (#2364) * create Principles page * typescypt * svg optimize * update branch * Deriv numbers block Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * fix about us hero (#2371) Co-authored-by: Suthesan <[email protected]> * Nikolai.berestevich/feat/add banner (#2361) * nikolai.berestevich/feat/ add our principles section * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring +ts * nikolai.berestevich/feat/ about-us -refactoring * nikolai.berestevich/feat/ about-us -refactoring * nikolai.berestevich/feat/ about-us -refactoring * nikolai.berestevich/feat:add banner for about-us page * nikolai.berestevich/feat:add banner for about-us page * nikolai.berestevich/feat:add leaderpopup * nikolai.berestevich/feat:add leaderpopup * nikolai.berestevich/feat:leader popup * nikolai.berestevich/feat:leader banner * nikolai.berestevich/fix:leader banner * nikolai.berestevich/fix:leader banner * nikolai.berestevich/fix:load large leaders images * nikolai.berestevich/fix:paddings Co-authored-by: Nikolai Berestevich <[email protected]> * Pavel-Latyshou/Carousel (#2384) * laptop width * update branch#2 * refactor ts * eslint * fix photos sequense Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * add tsconfig fix * Kevin/about us office (#2387) * our office v1 * mobile pin improvement * Nikolai.berestevich/feat/lead del (#2392) * fix:props * fix: lelete leadersthip * fix: lelete leadersthip Co-authored-by: Nikolai Berestevich <[email protected]> * add fix scroll issue * fix safari - office numbers bug (#2396) * update new content (#2397) * Nikolai.berestevich/about us fix bugs (#2401) * nikolai.berestevich/fix:about us * nikolai.berestevich/fix:about us * nikolai.berestevich/fix:about us * nikolai.berestevich/fix:our principles images Co-authored-by: Nikolai Berestevich <[email protected]> * Pavel/text-fix our principles (#2400) * text-fix our principles * fix after 3100px carousel * fix banner about us * line height fix Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * nikolai.berestevich/fix: order and text (#2412) Co-authored-by: Nikolai Berestevich <[email protected]> * Kevin/fix: description, font styling on mobile (#2411) * fix: description, font styling on mobile * fix map + left aligned header * remove unnecessary css line * Nikolai.berestevich/fix/about us tom fix +refactoring (#2415) * nikolai.berestevich/fix/tom-linkedin * nikolai.berestevich/fix/tom-linkedin * nikolai.berestevich/fix/refactoring * nikolai.berestevich/fix/refactoring * nikolai.berestevich/fix/refactoring Co-authored-by: Nikolai Berestevich <[email protected]> * Kevin/fix about us lang (#2419) * fix about us language bug * fix v2 * update * fix links on careers offices (#2422) Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * nikolai.berestevich/feat/addofficeG (#2421) * nikolai.berestevich/feat/addofficeG * nikolai.berestevich/feat/addofficeG * nikolai.berestevich/feat/addofficeG Co-authored-by: Nikolai Berestevich <[email protected]> * update guernsey office info (#2429) * update guernsey office info * add lint fix Co-authored-by: habib-binary <[email protected]> * nikolai.berestevich/fix/tom2 (#2431) * nikolai.berestevich/fix/tom2 * nikolai.berestevich/fix/tom2 Co-authored-by: Nikolai Berestevich <[email protected]> * Nikolai.berestevich/fix/blue bg (#2442) * nikolai.berestevich/fix/color * nikolai.berestevich/fix/color Co-authored-by: Nikolai Berestevich <[email protected]> * Kevin/refactor who we are nav (#2471) * update show to use desktop/mobile wrapper * refactor flex and header * solve comment * nikolai.berestevich/fix/whoweare (#2461) * nikolai.berestevich/fix/whatweare * nikolai.berestevich/fix/about-us * nikolai.berestevich/fix/who-we-are * nikolai.berestevich/fix/who-we-are-title * nikolai.berestevich/fix/who-we-are-map Co-authored-by: Nikolai Berestevich <[email protected]> * Nikolai.berestevich/fix/whoweare bugs (#2492) * nikolai.berestevich/fix/who-we-are-leaders * nikolai.berestevich/fix/who-we-are-banner * nikolai.berestevich/fix/who-we-are-banner * nikolai.berestevich/fix/who-we-are-correction * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are Co-authored-by: Nikolai Berestevich <[email protected]> * uncomment offices (#2474) * uncomment offices * add links * delete _ from locations pages * merge commint * ready for QA * fix paris, photo and size * delete prop types * delete prop types that left * delete margin Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * Nikolai.berestvich/fix/who we are bugs 3 (#2501) * nikolai.berestevich/fix/who-we-are-leaders * nikolai.berestevich/fix/who-we-are-banner * nikolai.berestevich/fix/who-we-are-banner * nikolai.berestevich/fix/who-we-are-correction * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are-desctop- img * nikolai.berestevich/fix/who-we-are * nikolai.berestevich/fix/who-we-are-fixes * nikolai.berestevich/fix/who-we-are-fixes Co-authored-by: Nikolai Berestevich <[email protected]> * Pavel-Latyshov/fixes to locations (#2506) * fixes to locations * fix border radius * add border radius to hero Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> * Nikolai.berestevich/refactor/use map (#2510) * nikolai.berestevich/refactoring/map * nikolai.berestevich/refactoring/map * nikolai.berestevich/refactoring/map * nikolai.berestevich/refactoring/map Co-authored-by: Nikolai Berestevich <[email protected]> * master was merged Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: pavel-latyshou-deriv <[email protected]> Co-authored-by: “pavel-latyshou-deriv” <“[email protected]”> Co-authored-by: Kevin <[email protected]> Co-authored-by: njazuli <[email protected]> Co-authored-by: Suthesan Kanagasabai <[email protected]> Co-authored-by: Suthesan <[email protected]> Co-authored-by: habib-binary <[email protected]> Co-authored-by: Habib Deriv <[email protected]>
1 parent 82dbb42 commit 788c790

File tree

115 files changed

+2472
-2115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2472
-2115
lines changed

gatsby-node.js

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ exports.onCreatePage = ({ page, actions }) => {
1616
const is_story = /story/g.test(page.path)
1717
const is_market = /markets/g.test(page.path)
1818
const is_cfds = /cfds/g.test(page.path)
19-
const is_landing_ebooks =/landing\/ebooks/g.test(page.path)
20-
21-
if (is_landing_ebooks) {
22-
createRedirect({
23-
fromPath: `/landing/ebooks/`,
24-
toPath: `/404/`,
25-
redirectInBrowser: true,
26-
isPermanent: true,
27-
})
28-
createRedirect({
29-
fromPath: `/landing/ebooks`,
30-
toPath: `/404`,
31-
redirectInBrowser: true,
32-
isPermanent: true,
33-
})
34-
}
3519

3620
if (is_responsible_trading) {
3721
createRedirect({
@@ -87,13 +71,13 @@ exports.onCreatePage = ({ page, actions }) => {
8771
if (is_story) {
8872
createRedirect({
8973
fromPath: `/about/`,
90-
toPath: `/story/`,
74+
toPath: `/who-we-are/`,
9175
redirectInBrowser: true,
9276
isPermanent: true,
9377
})
9478
createRedirect({
9579
fromPath: `/about`,
96-
toPath: `/story/`,
80+
toPath: `/who-we-are/`,
9781
redirectInBrowser: true,
9882
isPermanent: true,
9983
})
@@ -191,20 +175,6 @@ exports.onCreatePage = ({ page, actions }) => {
191175
isPermanent: true,
192176
})
193177
}
194-
if (is_landing_ebooks) {
195-
createRedirect({
196-
fromPath: `/${lang}/landing/ebooks/`,
197-
toPath: `/${lang}/404/`,
198-
redirectInBrowser: true,
199-
isPermanent: true,
200-
})
201-
createRedirect({
202-
fromPath: `/${lang}/landing/ebooks`,
203-
toPath: `/${lang}/404`,
204-
redirectInBrowser: true,
205-
isPermanent: true,
206-
})
207-
}
208178

209179
if (is_contact_us) {
210180
createRedirect({
@@ -245,13 +215,13 @@ exports.onCreatePage = ({ page, actions }) => {
245215
if (is_story) {
246216
createRedirect({
247217
fromPath: `/${lang}/about/`,
248-
toPath: `/${lang}/story/`,
218+
toPath: `/${lang}/who-we-are/`,
249219
redirectInBrowser: true,
250220
isPermanent: true,
251221
})
252222
createRedirect({
253223
fromPath: `/${lang}/about`,
254-
toPath: `/${lang}/story/`,
224+
toPath: `/${lang}/who-we-are/`,
255225
redirectInBrowser: true,
256226
isPermanent: true,
257227
})

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/utility.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ export const addScript = (settings) => {
315315
// Function to get the user selected language, can be used in the future once need to check other languages
316316
export const isChoosenLanguage = () => ({ english: getLanguage() === 'en' })
317317

318-
// Function to manually replace server's locale ("zh_tw" or "zh_cn") to "zh-tw"/"zh-cn"
318+
// Function to manually replace server's locale ("zh_tw" or "zh_cn") to "zh-tw"/"zh-cn"
319319
export const replaceLocale = (locale) => {
320320
let checked_locale = locale
321321
if (locale === 'zh_tw') {

src/components/custom/other-platforms.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg'
3030
import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg'
3131
import Forex from 'images/svg/custom/forex-nav.svg'
3232
import Help from 'images/svg/menu/help-center.svg'
33-
import Leadership from 'images/svg/menu/leadership.svg'
3433
import CFD from 'images/svg/custom/margin-trading-nav.svg'
3534
import Multipliers from 'images/svg/custom/multipliers-nav.svg'
3635
import Options from 'images/svg/custom/options-nav.svg'
@@ -470,15 +469,9 @@ export const NavCompany = ({ onClick }) => (
470469
<Flex direction="column" wrap="wrap" jc="flex-start" max_width="42rem">
471470
<CardLink
472471
icon={() => <img src={Story} alt="" width="24" height="24" />}
473-
title={localize('Our story')}
472+
title={localize('Who we are')}
474473
onClick={onClick}
475-
to="/story/"
476-
/>
477-
<CardLink
478-
icon={() => <img src={Leadership} alt="" width="24" height="24" />}
479-
title={localize('Our leadership')}
480-
onClick={onClick}
481-
to="/leadership/"
474+
to="/who-we-are/"
482475
/>
483476
<CardLink
484477
icon={() => <img src={RegulatoryInfo} alt="" width="24" height="24" />}

src/components/elements/off-canvas-menu.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg'
2424
import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg'
2525
import Forex from 'images/svg/custom/forex-nav.svg'
2626
import Help from 'images/svg/menu/help-center.svg'
27-
import Leadership from 'images/svg/menu/leadership.svg'
2827
import CFD from 'images/svg/custom/margin-trading-nav.svg'
2928
import Multipliers from 'images/svg/custom/multipliers-nav.svg'
3029
import Options from 'images/svg/custom/options-nav.svg'
@@ -377,17 +376,11 @@ export const OffCanvasMenuWrapper = (props) => {
377376
header_style={header_style}
378377
style={content_style}
379378
>
380-
<StyledLink to="/story/" onClick={handleArrowClick}>
379+
<StyledLink to="/who-we-are/" onClick={handleArrowClick}>
381380
<div>
382381
<img src={Story} alt="" width="24" height="24" />
383382
</div>
384-
<span>{localize('Our story')}</span>
385-
</StyledLink>
386-
<StyledLink to="/leadership/" onClick={handleArrowClick}>
387-
<div>
388-
<img src={Leadership} alt="" width="24" height="24" />
389-
</div>
390-
<span>{localize('Our leadership')}</span>
383+
<span>{localize('Who we are')}</span>
391384
</StyledLink>
392385
<StyledLink to="/partners/" onClick={handleArrowClick}>
393386
<div>

src/components/elements/query-image.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type QueryImageProps = {
1212
loading?: 'eager' | 'lazy'
1313
}
1414

15-
type ImageWrapperProps = {
15+
export type ImageWrapperProps = {
1616
width: string
1717
height: string
1818
className?: string

src/components/form/button.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export const SharedButtonStyle = css`
101101
padding: 17px 24px;
102102
font-size: 20px;
103103
line-height: 30px;
104+
border-radius: 8px;
104105
105106
&:hover {
106107
background-color: var(--color-red-3);

src/components/layout/footer/main-links.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
1515
<Title>{localize('ABOUT')}</Title>
1616
</LinkWrapper>
1717
<LinkWrapper first_child="true">
18-
<Link to="/story/">{localize('Our story')}</Link>
19-
</LinkWrapper>
20-
<LinkWrapper>
21-
<Link to="/leadership/">{localize('Our leadership')}</Link>
18+
<Link to="/who-we-are/">{localize('Who we are')}</Link>
2219
</LinkWrapper>
2320
<LinkWrapper>
2421
<Link to="/why-choose-us/">{localize('Why choose us?')}</Link>

src/components/layout/layout.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
44
import styled from 'styled-components'
55
import useGTMData from '../hooks/use-gtm-data'
66
import Copyright from './copyright'
7-
import { Nav, NavStatic, NavPartners, NavInterim } from './nav'
7+
import { Nav, NavStatic, NavPartners, NavInterim, NavSticky } from './nav'
88
import JumpIndicesNav from './jump-indices/nav'
99
import { NavCareers } from './nav-careers'
1010
import { LocationProvider } from './location-context'
@@ -209,6 +209,10 @@ const Layout = ({
209209
Navigation = <NavCareers />
210210
FooterNav = <Footer no_language={true} type={type} />
211211
break
212+
case 'about-us':
213+
Navigation = <NavSticky is_ppc_redirect={is_ppc_redirect} is_ppc={is_ppc} />
214+
FooterNav = <Footer is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />
215+
break
212216
default:
213217
Navigation = <Nav is_ppc_redirect={is_ppc_redirect} is_ppc={is_ppc} />
214218
FooterNav = <Footer is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />

0 commit comments

Comments
 (0)