Skip to content

Commit e86045d

Browse files
vkosinovverdel
vkosinov
authored and
verdel
committed
Антисанкционный up (#235)
* fix(footer): anti-sanctions fixes (COM-3886) * fix(header): anti-sanctions fixes (COM-3886)
1 parent 3fb6dcf commit e86045d

File tree

14 files changed

+36
-306
lines changed

14 files changed

+36
-306
lines changed

‎packages/core-design/src/components/Footer/BottomLinksAndLanguages/BottomLinksAndLanguages.styles.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const base = (props: ThemeProps) => {
99
return css`
1010
& {
1111
display: flex;
12-
flex-direction: row-reverse;
1312
justify-content: space-between;
1413
1514
& > li {
@@ -40,10 +39,6 @@ const base = (props: ThemeProps) => {
4039
margin: 0 ${calcRem(4)};
4140
}
4241
43-
.language-link {
44-
margin-left: ${calcRem(50)};
45-
}
46-
4742
.cookies-link {
4843
margin-left: 40px;
4944
}

‎packages/core-design/src/components/Footer/BottomLinksAndLanguages/BottomLinksAndLanguages.tsx‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Text from '../../Text'
88

99
/* tslint:disable */
1010
const Icon = require('../../../static/icons/footer/alliance.svg')
11-
const ArdaIcon = require('../../../static/icons/footer/arda.svg')
11+
1212
/* tslint:enable */
1313

1414
export interface Props {
@@ -19,7 +19,7 @@ export interface Props {
1919
href: string
2020
}
2121
preset?: string
22-
languageLink: {
22+
languageLink?: {
2323
text: string
2424
href: string
2525
}
@@ -48,7 +48,7 @@ const PrivacyAndLanguageLinks: React.FC<Props> = ({
4848

4949
return (
5050
<ul className={className}>
51-
<li>
51+
{languageLink && <li>
5252
<Link
5353
className="link lng-link"
5454
href={languageLink.href}
@@ -61,7 +61,7 @@ const PrivacyAndLanguageLinks: React.FC<Props> = ({
6161
size="s"
6262
/>
6363
</Link>
64-
</li>
64+
</li>}
6565

6666
<li>
6767
{privacyPolicyLink && (
@@ -103,10 +103,6 @@ const PrivacyAndLanguageLinks: React.FC<Props> = ({
103103
</a>
104104
)}
105105

106-
<span>
107-
<ArdaIcon className="arda" />
108-
</span>
109-
110106
{cookiesPolicyLink && (
111107
<CookiesPolicyComponent
112108
className="link cookies-link"

‎packages/core-design/src/components/Footer/DoubleBottom/DoubleBottom.styles.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const base = (props: ThemeProps) => {
4747
4848
&_estonia {
4949
top: 86px;
50-
right: 219px;
50+
right: 249px;
5151
}
5252
5353
&_singapore {
@@ -87,7 +87,7 @@ const base = (props: ThemeProps) => {
8787
8888
.pin_estonia {
8989
top: 15.7%;
90-
right: 36%;
90+
right: 40%;
9191
}
9292
9393
.pin_russia,
@@ -128,7 +128,7 @@ const base = (props: ThemeProps) => {
128128
129129
.pin_estonia {
130130
top: ${calcRem(32)};
131-
right: ${calcRem(135)};
131+
right: ${calcRem(170)};
132132
}
133133
134134
.pin_russia,
@@ -170,7 +170,7 @@ const base = (props: ThemeProps) => {
170170
171171
&_estonia {
172172
top: ${calcRem(37)};
173-
right: ${calcRem(119)};
173+
right: ${calcRem(143)};
174174
}
175175
176176
&_russia,

‎packages/core-design/src/components/Footer/DoubleBottom/DoubleBottom.tsx‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,41 @@ const Pin = require('../../../static/icons/footer/pin.svg')
1212

1313
import Addresses from './Addresses'
1414

15-
const pins = [
16-
{
17-
id: 'singapore',
18-
},
19-
{
20-
id: 'russia',
21-
},
22-
{
23-
id: 'russia_2',
24-
},
25-
{
26-
id: 'estonia',
27-
},
28-
]
29-
3015
export interface Props {
3116
className?: string
3217
isMobile: boolean
3318
addresses: AddressesProps[]
3419
theme?: ThemeProps
20+
preset?: '' | 'defaultEn' | 'defaultRu'
3521
}
3622

37-
const DoubleBottom: React.FC<Props> = ({ className, isMobile, addresses }) => {
23+
const DoubleBottom: React.FC<Props> = ({
24+
className,
25+
isMobile,
26+
addresses,
27+
preset = 'defaultEn',
28+
}) => {
3829
const [hoveredAddress, setHoveredAddress] = useState(null)
3930

31+
const pins =
32+
preset === 'defaultEn'
33+
? [
34+
{
35+
id: 'singapore',
36+
},
37+
{
38+
id: 'estonia',
39+
},
40+
]
41+
: [
42+
{
43+
id: 'russia',
44+
},
45+
{
46+
id: 'russia_2',
47+
},
48+
]
49+
4050
return (
4151
<div className={className} data-testid="Footer:block:DoubleBottom">
4252
<Addresses setHoveredAddress={setHoveredAddress} isMobile={isMobile} addresses={addresses} />

‎packages/core-design/src/components/Footer/Footer.tsx‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,6 @@ const Footer: React.FC<Props> = ({
164164
<CopyIcon className="copy-icon" />
165165
</button>
166166

167-
{isMobile && (
168-
<Link
169-
className="link-language"
170-
href={languageLink.href}
171-
data-testid="Footer:link:language"
172-
>
173-
<Text
174-
className="link-text"
175-
dangerouslySetInnerHTML={{ __html: languageLink.text }}
176-
type="perforator"
177-
size="s"
178-
/>
179-
</Link>
180-
)}
181167
</div>
182168

183169
{socialLinks && <SocialLinks links={socialLinks} />}
@@ -195,7 +181,7 @@ const Footer: React.FC<Props> = ({
195181
/>
196182
</div>
197183

198-
{IsDoubleBottomVisible && <DoubleBottom isMobile={isMobile} addresses={addresses} />}
184+
{IsDoubleBottomVisible && <DoubleBottom isMobile={isMobile} addresses={addresses} preset={preset}/>}
199185
</footer>
200186
)
201187
}

‎packages/core-design/src/data/footerLinks.ts‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -73,42 +73,6 @@ export const nav = {
7373
title: 'MVP',
7474
href: `${baseNavUrl}/en/service/mvp-development`,
7575
},
76-
// {
77-
// id: 'design',
78-
// title: 'DesignLab',
79-
// href: 'https://csssr.com/en/service/design',
80-
// },
81-
],
82-
},
83-
{
84-
id: 'portfolio',
85-
title: 'Portfolio',
86-
links: [
87-
{
88-
id: 'projects',
89-
title: 'Our projects',
90-
href: `${baseNavUrl}/en/projects`,
91-
},
92-
{
93-
id: 'fintech',
94-
title: 'Fintech',
95-
href: `${baseNavUrl}/en/industry/fintech`,
96-
},
97-
{
98-
id: 'information',
99-
title: 'IT companies',
100-
href: `${baseNavUrl}/en/industry/information-technology`,
101-
},
102-
{
103-
id: 'eCommerce',
104-
title: 'E-commerce',
105-
href: `${baseNavUrl}/en/industry/ecommerce`,
106-
},
107-
{
108-
id: 'mediaAndMarketing',
109-
title: 'Media and marketing',
110-
href: `${baseNavUrl}/en/industry/media-and-marketing`,
111-
},
11276
],
11377
},
11478
{
@@ -192,37 +156,6 @@ export const nav = {
192156
},
193157
],
194158
},
195-
{
196-
id: 'portfolio',
197-
title: 'Портфолио',
198-
links: [
199-
{
200-
id: 'projects',
201-
title: 'Наши проекты',
202-
href: `${baseNavUrl}/ru/projects`,
203-
},
204-
{
205-
id: 'fintech',
206-
title: 'Финтех',
207-
href: `${baseNavUrl}/ru/industry/fintech`,
208-
},
209-
{
210-
id: 'information',
211-
title: 'ИТ компании',
212-
href: `${baseNavUrl}/ru/industry/information-technology`,
213-
},
214-
{
215-
id: 'eCommerce',
216-
title: 'Электронная</br> коммерция',
217-
href: `${baseNavUrl}/ru/industry/ecommerce`,
218-
},
219-
{
220-
id: 'mediaAndMarketing',
221-
title: 'Медиа и&nbsp;маркетинг',
222-
href: `${baseNavUrl}/ru/industry/media-and-marketing`,
223-
},
224-
],
225-
},
226159
{
227160
id: 'howWeWork',
228161
title: 'Как мы&nbsp;работаем',
@@ -278,24 +211,11 @@ export const bottomLinks = {
278211
text: 'WEBSITE COOKIE POLICY',
279212
href: 'https://csssr.com/en/cookies-policy',
280213
},
281-
languageLink: {
282-
text: 'ru',
283-
href: '/ru',
284-
},
285214
},
286215
ru: {
287216
privacyPolicyLink: {
288217
text: 'ПОЛИТИКА КОНФИДЕНЦИАЛЬНОСТИ',
289218
href: 'https://csssr.com/ru/privacy-policy',
290219
},
291-
allianceLink: {
292-
text: 'часть альянса',
293-
title: 'FRONTEND.DIGITAL',
294-
href: 'https://frontend.digital',
295-
},
296-
languageLink: {
297-
text: 'en',
298-
href: '/en',
299-
},
300220
},
301221
}

‎packages/core-design/src/data/footerPresets.ts‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
11
import { nav, socials, bottomLinks } from './footerLinks'
22

3-
const email = 'elena.perezhogina@csssr.io'
3+
const email = 'sales@csssr.io'
44
const addresses = {
55
ru: [
6-
{
7-
id: 'singapore',
8-
title: 'Сингапур',
9-
address: '68 Circular Road,<br> #02-01,<br>Singapore, 049422',
10-
phone: '+65 3159 4531',
11-
status: 'Головной офис',
12-
timeZone: 'Asia/Singapore',
13-
},
146
{
157
id: 'russia',
168
title: 'Россия',
179
address: '30 Лесная ул.,<br>стр. 1, офис 303,<br> г. Дзержинский, 140090,<br>Россия',
1810
phone: '+7 (499) 113-16-17',
1911
timeZone: 'Europe/Moscow',
2012
},
21-
{
22-
id: 'estonia',
23-
title: 'Эстония',
24-
address: '26 Majaka St.,<br>bld.1, office 14,<br>Tallinn, 11412,<br>Estonia',
25-
timeZone: 'Europe/Tallinn',
26-
},
2713
],
2814
en: [
2915
{
@@ -34,13 +20,6 @@ const addresses = {
3420
status: 'Head Office',
3521
timeZone: 'Asia/Singapore',
3622
},
37-
{
38-
id: 'russia',
39-
title: 'Russia',
40-
address: '30 Lesnaya St.,<br>bld. 1, office 303,<br> Dzerzhinsky, 140090, <br>Russia',
41-
phone: '+7 (499) 113-16-17',
42-
timeZone: 'Europe/Moscow',
43-
},
4423
{
4524
id: 'estonia',
4625
title: 'Estonia',
@@ -57,11 +36,9 @@ const presets = {
5736
},
5837
email,
5938
actionPhrase: 'Let’s work together!',
60-
socialLinks: socials.slice(0, 4),
6139
nav: nav.en,
6240
privacyPolicyLink: bottomLinks.en.privacyPolicyLink,
6341
cookiesPolicyLink: bottomLinks.en.cookiesPolicyLink,
64-
languageLink: bottomLinks.en.languageLink,
6542
copyMessage: 'Copied!',
6643
addresses: addresses.en,
6744
},
@@ -74,8 +51,6 @@ const presets = {
7451
socialLinks: socials,
7552
nav: nav.ru,
7653
privacyPolicyLink: bottomLinks.ru.privacyPolicyLink,
77-
allianceLink: bottomLinks.ru.allianceLink,
78-
languageLink: bottomLinks.ru.languageLink,
7954
copyMessage: 'Скопировано!',
8055
addresses: addresses.ru,
8156
},

0 commit comments

Comments
 (0)