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/addofficeG #2421

Merged
merged 3 commits into from
Jan 3, 2022
Merged

nikolai.berestevich/feat/addofficeG #2421

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
2de7edb
nikolai.berestevich/feat/addofficeG
Dec 31, 2021
8a5d68c
nikolai.berestevich/feat/addofficeG
Dec 31, 2021
11fbced
nikolai.berestevich/feat/addofficeG
Dec 31, 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
48 changes: 30 additions & 18 deletions src/pages/about-us/_OurOffices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const OurOffices = () => {
return (
<StyledSectionContainer padding="0 16px 120px" background="var(--color-white)">
<StyledHeader as="h2" size="32px" align="center" type="page-title">
{localize('Our international offices')}
{localize('Our global offices')}
</StyledHeader>

<Flex>
Expand Down Expand Up @@ -207,20 +207,20 @@ const OurOffices = () => {
link="/careers/locations/dubai"
/>
<MapPin
left="73.5%"
top="58.5%"
left="73.3%"
top="57.5%"
title={localize('Ipoh')}
link="/careers/locations/ipoh"
/>
<MapPin
left="74%"
top="59.2%"
left="74.2%"
top="58.5%"
title={localize('Cyberjaya')}
link="/careers/locations/cyberjaya"
/>
<MapPin
left="74.2%"
top="60.4%"
top="60.6%"
title={localize('Melaka')}
link="/careers/locations/melaka"
/>
Expand All @@ -230,9 +230,15 @@ const OurOffices = () => {
title={localize('Labuan')}
link="/careers/locations/labuan"
/>
<MapPin left="45.8%" top="28%" title={localize('London')} link="" />
<MapPin left="47.4%" top="30.9%" title={localize('Paris')} link="" />
<MapPin left="44.5%" top="30.9%" title={localize('Guernsey')} link="" />
{/* Uncomment after new offices will be shown and add links! */}
{/* <MapPin left="45.8%" top="28%" title={localize('London')} link="" />
<MapPin left="47.4%" top="30.9%" title={localize('Paris')} link="" /> */}
<MapPin
left="44.5%"
top="30.9%"
title={localize('Guernsey')}
link="/careers/locations/guernsey"
/>
</MapImage>
</Show.Desktop>
<Show.Mobile min_width="tablet">
Expand Down Expand Up @@ -274,20 +280,20 @@ const OurOffices = () => {
link="/careers/locations/dubai"
/>
<MapPin
left="72%"
top="53.2%"
left="72.3%"
top="51.2%"
title={localize('Ipoh')}
link="/careers/locations/ipoh"
/>
<MapPin
left="72%"
left="71%"
top="55%"
title={localize('Cyberjaya')}
link="/careers/locations/cyberjaya"
/>
<MapPin
left="73%"
top="56.2%"
top="56.7%"
title={localize('Melaka')}
link="/careers/locations/melaka"
/>
Expand All @@ -297,9 +303,15 @@ const OurOffices = () => {
title={localize('Labuan')}
link="/careers/locations/labuan"
/>
<MapPin left="44.3%" top="24%" title={localize('London')} link="" />
<MapPin left="45.9%" top="26.9%" title={localize('Paris')} link="" />
<MapPin left="43%" top="26.9%" title={localize('Guernsey')} link="" />
{/* Uncomment after new offices will be shown and add links! */}
{/* <MapPin left="44.3%" top="24%" title={localize('London')} link="" />
<MapPin left="45.9%" top="26.9%" title={localize('Paris')} link="" /> */}
<MapPin
left="43%"
top="26.9%"
title={localize('Guernsey')}
link="/careers/locations/guernsey"
/>
</MapImage>
</Show.Mobile>
</Flex>
Expand All @@ -318,13 +330,13 @@ const OurOffices = () => {
</NumberText>
</StyledFlex>
<StyledFlex fd="column">
<NumberHeader size="32px">{localize('13')}</NumberHeader>
<NumberHeader size="32px">{localize('11')}</NumberHeader>
<NumberText size="20px" align="center">
{localize('offices')}
</NumberText>
</StyledFlex>
<StyledFlex fd="column">
<NumberHeader size="32px">{localize('10')}</NumberHeader>
<NumberHeader size="32px">{localize('8')}</NumberHeader>
<NumberText size="20px" align="center">
{localize('countries')}
</NumberText>
Expand Down
11 changes: 8 additions & 3 deletions src/pages/careers/_model/_locations/_locations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import BelarusFlagIcon from 'images/svg/careers/flag_belarus.svg'
import FranceFlagIcon from 'images/svg/careers/flag_france.svg'
import UKFlagIcon from 'images/svg/careers/flag_uk.svg'
import ChannelIslandsFlagIcon from 'images/svg/careers/flag._channel_islands.svg'
import { locationsTypes } from './_locations.types'

export const cyberjaya = {
name: 'cyberjaya',
Expand Down Expand Up @@ -347,14 +348,17 @@ export const guernsey = {
name: 'guernsey',
link: '/careers/locations/guernsey/',
display_name: 'Guernsey',
img_alt: 'Guernsey alt img',
map_office_name: '(Guernsey)',
country: 'Channel Islands',
flagIcon: ChannelIslandsFlagIcon,
thumbnail: 'thumbnail_guernsey',
first_p:
'Our office at Guernsey focuses on compliance. A team of dedicated experts provide oversight so that Deriv offices across the world comply with legislative and regulatory requirements. With their vast knowledge in corporate law, anti-money laundering, and other related legislations, they will anticipate and mitigate regulatory risks.',
first_img: 'living_in_guernsey',
first_img_alt: 'living_in_guernsey alt img',
grid_images: ['guernsey_grid_1', 'guernsey_grid_2', 'guernsey_grid_3', 'guernsey_grid_4'],
grid_img_alt: ['guernsey grid 1', 'guernsey grid 2', 'guernsey grid 3', 'guernsey grid 4'],
map: 'M8p55z3Wu4EKhQ3A7',
map_text:
'At Deriv (Guernsey), we study regulatory landscapes in different Deriv jurisdictions to ensure the right thing is done at all times. We seek self-motivation, attention to detail, and a strong interest in law. Deriv (Guernsey) gives you the opportunity to analyse regulatory policies, predict changes in fintech regulations, and formulate plans to ensure the efficiency of Deriv Group’s compliance strategies.',
Expand All @@ -363,13 +367,13 @@ export const guernsey = {
google_map_link: 'https://goo.gl/maps/M8p55z3Wu4EKhQ3A7',
has_iframe: false,
}
export const all_offices = [
export const all_offices: locationsTypes[] = [
// london,
dubai,
// paris,
malta,
cyprus,
// guernsey,
guernsey,
cyberjaya,
labuan,
ipoh,
Expand All @@ -378,6 +382,7 @@ export const all_offices = [
rwanda,
minsk,
]

export const locations = {
cyberjaya: `${cyberjaya.display_name}, ${cyberjaya.country}`,
malta: `${malta.display_name}`,
Expand All @@ -391,5 +396,5 @@ export const locations = {
belarus: `${minsk.display_name}, ${minsk.country}`,
// france: `${paris.display_name}, ${paris.country}`,
// uk: `${london.display_name}, ${london.country}`,
// guernsey: `${guernsey.display_name}, ${guernsey.country}`,
guernsey: `${guernsey.display_name}, ${guernsey.country}`,
}
32 changes: 16 additions & 16 deletions src/pages/careers/_model/_locations/_locations.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
export type locationsTypes = {
name?: string
link?: string
display_name?: string
img_alt?: string
map_office_name?: string
country?: string
flagIcon?: string
thumbnail?: string
first_p?: string
first_img?: string
first_img_alt?: string
grid_images?: string[]
grid_img_alt?: string[]
map?: string
name: string
link: string
display_name: string
img_alt: string
map_office_name: string
country: string
flagIcon: string
thumbnail: string
first_p: string
first_img: string
first_img_alt: string
grid_images: string[]
grid_img_alt: string[]
map: string
map_img?: string
map_text?: string
address?: string[]
map_text: string
address: string[]
google_map_link?: string
has_iframe?: boolean
}
21 changes: 14 additions & 7 deletions src/pages/careers/locations/_location-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,14 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {

return (
<>
<Hero
display_name={display_name}
name={location.name}
img_data={images[location.name]}
/>
<Hero display_name={display_name} img_data={images[location.name]} />
<FirstSection>
<SecondStyledHeader align="center" as="h2" size="var(--text-size-header-5)">
<SecondStyledHeader
type="unset"
align="center"
as="h2"
size="var(--text-size-header-5)"
>
Deriv in {display_name}
</SecondStyledHeader>
<Flex tablet_direction="column">
Expand All @@ -378,7 +379,13 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => {
</FirstSection>
<SecondSection padding="0px 16px">
<SectionContainer padding="0">
<Header align="center" as="h2" size="var(--text-size-header-5)" mb="4rem">
<Header
type="unset"
align="center"
as="h2"
size="var(--text-size-header-5)"
mb="4rem"
>
Our office
</Header>
<StyledFlex>
Expand Down
0 ...ges/careers/locations/guernsey/_index.tsx → ...ages/careers/locations/guernsey/index.tsx
View file
Open in desktop
File renamed without changes.