Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit b00cec6

Browse files
TorinAsakuraTorinAsakura
authored
Merge pull request #20 from atls-academy/feat/landing-5
feat/landing-5
2 parents 9cadd9b + c0a8d18 commit b00cec6

Some content is hidden

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

43 files changed

+713
-121
lines changed

‎.pnp.cjs‎

Lines changed: 275 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎landing/entrypoints/renderer/src/public/font/gella-display.otf‎

70.2 KB
Binary file not shown.

‎landing/fragments/landing-courses/src/cards/card-details/card-details.component.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const CardDetails: FC<CardDetailsProps> = ({ info, quantity, desc }) => (
5555
</Box>
5656
<Box width={64} height={64} display={['flex', 'none']}>
5757
<Layout flexBasis={65} flexShrink='0' />
58-
<ImageBlock src='/courses-icon-sphere.png' />
58+
<ImageBlock src='/sphere-pink.png' />
5959
</Box>
6060
</Box>
6161
</Column>

‎landing/fragments/landing-courses/src/cards/cards-component.tsx‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ const Cards = () => {
5353
/>
5454
<Layout flexBasis={[20, 40]} />
5555
<Box display={['flex', 'none']}>
56-
<Swiper spaceBetween={10} slidesPerView={1.22} slidesOffsetAfter={-10}>
56+
<Swiper
57+
spaceBetween={10}
58+
slidesPerView={1.22}
59+
slidesOffsetAfter={-10}
60+
className='CardSlider'
61+
>
5762
<SwiperSlide>
5863
<CardShort
5964
category={intl.formatMessage({ id: '/', defaultMessage: 'Учебный материал' })}
@@ -83,7 +88,7 @@ const Cards = () => {
8388
/>
8489
</Box>
8590
</Column>
86-
<Layout flexBasis={[0, 40]} />
91+
<Layout flexBasis={[0, 40]} flexShrink='0' />
8792
<Column order={[0, 1]}>
8893
<CardDetails
8994
info={intl.formatMessage({
@@ -102,12 +107,12 @@ const Cards = () => {
102107
<Button
103108
size='longButtonSmallPaddingMediumHeight'
104109
variant='darkPurpleBackground'
105-
gap={117}
110+
gap='28%'
106111
iconSVG={<IconPlus />}
107112
iconWidth={48}
108113
iconHeight={48}
109114
iconRadius='normal'
110-
fill
115+
buttonFill
111116
>
112117
<Text fontSize='regular' lineHeight='regular'>
113118
<FormattedMessage id='/' defaultMessage='Процесс поступления' />
@@ -123,7 +128,7 @@ const Cards = () => {
123128
iconWidth={32}
124129
iconHeight={32}
125130
iconRadius='little'
126-
fill
131+
buttonFill
127132
>
128133
<Text fontSize='middle' lineHeight='small'>
129134
<FormattedMessage id='/' defaultMessage='Процесс поступления' />

‎landing/fragments/landing-courses/src/courses.component.tsx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { Space } from '@ui/text'
1414
import { Cards } from './cards'
1515

1616
export const Courses = () => (
17-
<Row>
18-
<Layout flexBasis={[20, 230]} />
19-
<Column width={['335px', '1460px']}>
17+
<Row width='100%' justifyContent='center'>
18+
<Layout flexBasis={[20, 230]} flexShrink='0' />
19+
<Column width={['335px', '1460px']} flexShrink='0'>
2020
<Layout flexBasis={[64, 160]} />
2121
<Box>
2222
<Box>
@@ -30,16 +30,16 @@ export const Courses = () => (
3030
</Text>
3131
</Box>
3232
<Layout flexBasis={[0, 344]} />
33-
<Box display={['none', 'flex']} width={253} alignItems='center'>
33+
<Box display={['none', 'flex']} width={253} alignItems='center' flexShrink='0'>
3434
<Button
3535
size='longButtonSmallPaddingMediumHeight'
3636
variant='darkPurpleBackground'
37-
gap={23}
37+
gap='8%'
3838
iconSVG={<IconArrowRight />}
3939
iconWidth={48}
4040
iconHeight={48}
4141
iconRadius='medium'
42-
fill
42+
buttonFill
4343
>
4444
<Text fontSize='regular' lineHeight='regular'>
4545
<FormattedMessage id='/' defaultMessage='Все материалы' />
@@ -51,7 +51,7 @@ export const Courses = () => (
5151
<Divider weight={1} backgroundColor='divider.lightGray' />
5252
<Layout flexBasis={[40, 80]} />
5353
<Box flexDirection={['column', 'row']}>
54-
<Box width={[335, 710]} display='inline'>
54+
<Box width={[335, 710]} display='inline' flexShrink='0'>
5555
<Text color='text.indigo' fontSize={['averaged', 'normal']} lineHeight='medium'>
5656
<FormattedMessage id='/' defaultMessage='Являясь серым кардиналом,' />
5757
</Text>
@@ -97,7 +97,7 @@ export const Courses = () => (
9797
</Text>
9898
</Box>
9999
<Layout flexBasis={[20, 191]} />
100-
<Box width={[335, 559]} display='inline'>
100+
<Box width={[335, 559]} display='inline' flexShrink='0'>
101101
<Text
102102
fontSize={['averaged', 'normal']}
103103
display='inline'
@@ -136,7 +136,7 @@ export const Courses = () => (
136136
iconWidth={32}
137137
iconHeight={32}
138138
iconRadius='little'
139-
fill
139+
buttonFill
140140
>
141141
<Text fontSize='middle' lineHeight='regular'>
142142
<FormattedMessage id='/' defaultMessage='Все материалы' />
@@ -145,5 +145,6 @@ export const Courses = () => (
145145
</Box>
146146
<Layout flexBasis={[64, 0]} />
147147
</Column>
148+
<Layout flexBasis={[20, 230]} flexShrink='0' />
148149
</Row>
149150
)

‎landing/fragments/landing-hero/src/about-us/about-us.component.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Row } from '@ui/layout'
1111
import { Text } from '@ui/text'
1212

1313
export const AboutUs = () => (
14-
<Column width={[335, 1166]}>
14+
<Column width={[335, 1166]} flexShrink='0'>
1515
<Box>
1616
<Text fontSize={['large', 'huge']} lineHeight='normal' color='text.white'>
1717
<FormattedMessage

‎landing/fragments/landing-hero/src/hero.component.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,24 @@ import { SocialLink } from './social-links'
1010
export const Hero = () => (
1111
<Box width='100%' flexDirection='column'>
1212
<Layout flexBasis={[172, 415]} />
13-
<Box width='100%' flexDirection={['column', 'row']}>
14-
<Layout flexBasis={[0, 230]} />
15-
<Box>
13+
<Box width='100%' flexDirection={['column', 'row']} justifyContent='center'>
14+
<Layout flexBasis={[0, 230]} flexShrink='0' />
15+
<Box justifyContent='center'>
1616
<Layout flexBasis={[20, 0]} flexShrink='0' />
1717
<AboutUs />
1818
<Layout flexBasis={[20, 0]} flexShrink='0' />
1919
</Box>
20-
<Layout flexBasis={[24, 394]} />
21-
<Box>
20+
<Layout flexBasis={[24, 434]} flexShrink='0' />
21+
<Box justifyContent='center'>
2222
<Layout flexBasis={[20, 0]} flexShrink='0' />
2323
<Column>
2424
<Layout flexBasis={['none', 297]} flexShrink='0' />
2525
<SocialLink />
2626
</Column>
2727
<Layout flexBasis={[20, 0]} flexShrink='0' />
2828
</Box>
29+
<Layout flexBasis={[0, 40]} flexShrink='0' />
2930
</Box>
30-
<Layout flexBasis={[20, 48]} />
31+
<Layout flexBasis={[0, 48]} />
3132
</Box>
3233
)

‎landing/fragments/landing-info/src/info.component.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import { Sphere } from './sphere'
1111

1212
export const Info = () => (
1313
<Box width='100%' flexDirection='column'>
14-
<Layout flexBasis={[64, 160]} flexShrink='0' />
15-
<Box>
14+
<Layout flexBasis={[84, 160]} flexShrink='0' />
15+
<Box justifyContent='center'>
1616
<Layout flexBasis={[20, 230]} flexShrink='0' />
1717
<Column>
1818
<Box width={['335px', '1460px']} flexShrink='0' display='inline'>

‎landing/fragments/landing-navigation/src/navigation.component.tsx‎

Lines changed: 59 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,69 +23,66 @@ export const Navigation = () => {
2323
<Drawer active={visible} onClose={() => setVisible(false)} />
2424
<Column>
2525
<Layout flexBasis={[20, 35]} />
26-
<Row>
26+
<Row width='100%' justifyContent='center'>
2727
<Layout flexBasis={[20, 40]} flexShrink='0' />
28-
<Row>
29-
<Box width={[40, 56]} flexShrink={0} alignItems='center'>
30-
<Logo color='white' />
31-
</Box>
32-
<Layout flexBasis={[195, 241]} />
33-
<Box display={['flex', 'none']} width={100} alignItems='center'>
34-
<Button
35-
size='wideButtonSmallPaddingMediumHeight'
36-
variant='transparentLightBackground'
37-
gap={12}
38-
iconSVG={<IconArrowDown />}
39-
iconWidth={28}
40-
iconHeight={28}
41-
iconRadius='micro'
42-
onClick={() => setVisible(true)}
43-
fill
44-
>
45-
<Text fontSize='medium'>
46-
<FormattedMessage id='/' defaultMessage='Курсы' />
47-
</Text>
48-
</Button>
49-
</Box>
50-
<Box display={['none', 'flex']} alignItems='end'>
51-
<NavBlock
52-
title={intl.formatMessage({ id: '/', defaultMessage: 'Academy' })}
53-
link='/'
54-
/>
55-
<Layout flexBasis={20} flexShrink='0' />
56-
<NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Курсы' })} link='/' />
57-
<Layout flexBasis={20} flexShrink='0' />
58-
<NavBlock
59-
title={intl.formatMessage({ id: '/', defaultMessage: 'Обучение' })}
60-
link='/'
61-
/>
62-
<Layout flexBasis={20} flexShrink='0' />
63-
<NavBlock
64-
title={intl.formatMessage({ id: '/', defaultMessage: 'Стипендия' })}
65-
link='/'
66-
/>
67-
<Layout flexBasis={20} flexShrink='0' />
68-
<NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'FAQ' })} link='/' />
69-
</Box>
70-
<Layout display={['none', 'flex']} flexBasis={310} />
71-
<Box display={['none', 'flex']} width={136} alignItems='center'>
72-
<Button
73-
size='wideButtonSmallPaddingNormalHeight'
74-
variant='transparentLightBackground'
75-
gap={20}
76-
iconSVG={<IconArrowDown />}
77-
iconWidth={40}
78-
iconHeight={40}
79-
iconRadius='normal'
80-
onClick={() => setVisible(true)}
81-
fill
82-
>
83-
<Text fontSize='middle' lineHeight='small'>
84-
<FormattedMessage id='/' defaultMessage='Курсы' />
85-
</Text>
86-
</Button>
87-
</Box>
88-
</Row>
28+
<Box width={[40, 56]} flexShrink={0} alignItems='center'>
29+
<Logo color='white' />
30+
</Box>
31+
<Layout flexBasis={[195, 241]} />
32+
<Box display={['flex', 'none']} width={100} alignItems='center' flexShrink='0'>
33+
<Button
34+
size='wideButtonSmallPaddingMediumHeight'
35+
variant='transparentLightBackground'
36+
gap='12%'
37+
iconSVG={<IconArrowDown />}
38+
iconWidth={28}
39+
iconHeight={28}
40+
iconRadius='micro'
41+
onClick={() => setVisible(true)}
42+
buttonFill
43+
>
44+
<Text fontSize='medium'>
45+
<FormattedMessage id='/' defaultMessage='Курсы' />
46+
</Text>
47+
</Button>
48+
</Box>
49+
<Layout flexBasis={[20, 0]} />
50+
<Box display={['none', 'flex']} alignItems='end'>
51+
<NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Academy' })} link='/' />
52+
<Layout flexBasis={20} flexShrink='0' />
53+
<NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Курсы' })} link='/' />
54+
<Layout flexBasis={20} flexShrink='0' />
55+
<NavBlock
56+
title={intl.formatMessage({ id: '/', defaultMessage: 'Обучение' })}
57+
link='/'
58+
/>
59+
<Layout flexBasis={20} flexShrink='0' />
60+
<NavBlock
61+
title={intl.formatMessage({ id: '/', defaultMessage: 'Стипендия' })}
62+
link='/'
63+
/>
64+
<Layout flexBasis={20} flexShrink='0' />
65+
<NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'FAQ' })} link='/' />
66+
</Box>
67+
<Layout flexBasis={[0, 310]} />
68+
<Box display={['none', 'flex']} width={136} alignItems='center' flexShrink='0'>
69+
<Button
70+
size='wideButtonSmallPaddingNormalHeight'
71+
variant='transparentLightBackground'
72+
gap='14%'
73+
iconSVG={<IconArrowDown />}
74+
iconWidth={40}
75+
iconHeight={40}
76+
iconRadius='normal'
77+
onClick={() => setVisible(true)}
78+
buttonFill
79+
>
80+
<Text fontSize='middle' lineHeight='small'>
81+
<FormattedMessage id='/' defaultMessage='Курсы' />
82+
</Text>
83+
</Button>
84+
</Box>
85+
<Layout flexBasis={[0, 40]} flexShrink='0' />
8986
</Row>
9087
</Column>
9188
</>

‎landing/fragments/landing-process/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"main": "src/index.ts",
55
"dependencies": {
66
"@ui/divider": "workspace:0.0.1",
7+
"@ui/image": "workspace:0.0.1",
78
"@ui/layout": "workspace:0.0.1",
89
"@ui/text": "workspace:0.0.1"
910
},

0 commit comments

Comments
 (0)