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

feat/landing-4 #18

Merged
merged 9 commits into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1,354 changes: 711 additions & 643 deletions .pnp.cjs

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const CardDetails: FC<CardDetailsProps> = ({ info, quantity, desc }) => (
<Layout flexBasis={[0, 74]} />
<Box width={[240]} height={[240]} display={['none', 'flex']}>
<Layout flexBasis={55} flexShrink='0' />
<ImageBlock src='/courses-icon-sphere.png' />
<ImageBlock src='/sphere-pink.png' />
</Box>
<Layout flexBasis={[20, 62]} />
<Box flexDirection={['row', 'column']} alignItems={['center', 'start']}>
Expand Down
6 changes: 3 additions & 3 deletions landing/fragments/landing-info/src/info.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Info = () => (
alignItems='center'
>
<Box width={[28, 40]} height={[28, 40]}>
<ImageBlock src='/info-icon-sphere.png' />
<ImageBlock src='/sphere-white.png' />
</Box>
</Box>
<Space count={3} />
Expand Down Expand Up @@ -79,7 +79,7 @@ const Info = () => (
alignItems='center'
>
<Box width={[28, 40]} height={[28, 40]}>
<ImageBlock src='/info-icon-sphere.png' />
<ImageBlock src='/sphere-white.png' />
</Box>
</Box>
</Box>
Expand Down Expand Up @@ -149,7 +149,7 @@ const Info = () => (
alignItems='center'
>
<Box width={[28, 40]} height={[28, 40]}>
<ImageBlock src='/info-icon-sphere.png' />
<ImageBlock src='/sphere-white.png' />
</Box>
</Box>
</Box>
Expand Down
23 changes: 20 additions & 3 deletions landing/fragments/landing-navigation/src/navigation.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ const Navigation = () => (
<Column width='100%'>
<Layout flexBasis={[22, 35]} />
<Row>
<Layout flexBasis={[20, 40]} />
<Layout flexBasis={[20, 40]} flexShrink='0' />
<Row>
<Box width={[40, 56]} flexShrink={0} alignItems='center'>
<Logo />
</Box>
<Layout flexBasis={[195, 241]} />
<Box display={['flex', 'none']} width={100}>
<Box display={['flex', 'none']} width={100} alignItems='center'>
<Button
size='wideButtonSmallPaddingMediumHeight'
variant='transparentLightBackground'
Expand All @@ -37,7 +37,7 @@ const Navigation = () => (
</Text>
</Button>
</Box>
<Box display={['none', 'flex']}>
<Box display={['none', 'flex']} width={1166} alignItems='end'>
TorinAsakura marked this conversation as resolved.
Show resolved Hide resolved
<Box
width={217}
height={55}
Expand Down Expand Up @@ -113,6 +113,23 @@ const Navigation = () => (
</Link>
</Box>
</Box>
<Layout display={['none', 'flex']} flexBasis={241} flexShrink='0' />
<Box display={['none', 'flex']} width={136} alignItems='center'>
<Button
size='wideButtonSmallPaddingNormalHeight'
variant='transparentLightBackground'
gap={20}
iconSVG={<IconArrowDown />}
iconWidth={40}
iconHeight={40}
iconRadius='normal'
fill
>
<Text fontSize='middle' lineHeight='small'>
<FormattedMessage id='/' defaultMessage='Курсы' />
</Text>
</Button>
</Box>
</Row>
</Row>
</Column>
Expand Down
19 changes: 19 additions & 0 deletions landing/fragments/landing-process/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "@landing/process-fragment",
"version": "0.0.1",
"main": "src/index.ts",
"dependencies": {
"@ui/divider": "workspace:0.0.1",
"@ui/layout": "workspace:0.0.1",
"@ui/text": "workspace:0.0.1"
},
"devDependencies": {
"react": "^18.2.0",
"react-intl": "^6.4.2"
},
"peerDependencies": {
"react": "*",
"react-dom": "*",
"react-intl": "*"
}
}
1 change: 1 addition & 0 deletions landing/fragments/landing-process/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './process.component'
1 change: 1 addition & 0 deletions landing/fragments/landing-process/src/items/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './items.component'
51 changes: 51 additions & 0 deletions landing/fragments/landing-process/src/items/items.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import React from 'react'
import { FC } from 'react'
import { FormattedMessage } from 'react-intl'

import { Layout } from '@ui/layout'
import { Box } from '@ui/layout'
import { Text } from '@ui/text'

import { ItemsProps } from './items.interface'

const Items: FC<ItemsProps> = ({ quantity, title }) => (
<Box>
TorinAsakura marked this conversation as resolved.
Show resolved Hide resolved
<Box
width={[35, 64]}
height={[35, 64]}
borderRadius={['normal', 'large']}
backgroundColor='background.transparent'
border='lightWhite'
justifyContent='center'
alignItems='center'
>
<Text fontSize={['standart', 'enlarged']} color='white'>
{quantity}
</Text>
</Box>
<Layout flexBasis={[12, 32]} />
<Box flexDirection={['column', 'row']} alignItems='center'>
<Box width={[288, 420]} flexShrink='0'>
<Text color='white' fontSize={['enlarged', 'large']}>
{title}
</Text>
</Box>
<Layout flexBasis={[0, 684]} flexShrink='0' />
<Box width={[288, 560]} flexShrink='0' alignItems='center'>
<Text
color='white'
fontSize={['medium', 'enlarged']}
lineHeight='medium'
opacity={['0.7', '1']}
>
<FormattedMessage
id='/'
defaultMessage='Являясь серым кардиналом Atlantis имеет влияние на сферу IT и неограниченные.'
/>
</Text>
</Box>
</Box>
</Box>
)

export { Items }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export interface ItemsProps {
quantity: string
title: string
}
54 changes: 54 additions & 0 deletions landing/fragments/landing-process/src/process.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React from 'react'
import { useIntl } from 'react-intl'

import { Divider } from '@ui/divider'
import { Layout } from '@ui/layout'
import { Column } from '@ui/layout'
import { Box } from '@ui/layout'

import { Items } from './items'

export const Process = () => {
const intl = useIntl()
return (
<Box>
<Layout flexBasis={[20, 80]} />
<Column width={[335, 1760]}>
<Layout flexBasis={[64, 160]} />
<Items
quantity={intl.formatMessage({ id: '/', defaultMessage: '1' })}
title={intl.formatMessage({ id: '/', defaultMessage: 'Интеграция в команду' })}
/>
<Layout flexBasis={[28, 48]} />
<Divider weight={1} backgroundColor='divider.transparent' />
<Layout flexBasis={[28, 48]} />
<Items
quantity={intl.formatMessage({ id: '/', defaultMessage: '2' })}
title={intl.formatMessage({ id: '/', defaultMessage: 'Создание среды' })}
/>
<Layout flexBasis={[28, 48]} />
<Divider weight={1} backgroundColor='divider.transparent' />
<Layout flexBasis={[28, 48]} />
<Items
quantity={intl.formatMessage({ id: '/', defaultMessage: '3' })}
title={intl.formatMessage({ id: '/', defaultMessage: 'Изучение технологий' })}
/>
<Layout flexBasis={[28, 48]} />
<Divider weight={1} backgroundColor='divider.transparent' />
<Layout flexBasis={[28, 48]} />
<Items
quantity={intl.formatMessage({ id: '/', defaultMessage: '4' })}
title={intl.formatMessage({ id: '/', defaultMessage: 'Практика изученого' })}
/>
<Layout flexBasis={[28, 48]} />
<Divider weight={1} backgroundColor='divider.transparent' />
<Layout flexBasis={[28, 48]} />
<Items
quantity={intl.formatMessage({ id: '/', defaultMessage: '5' })}
title={intl.formatMessage({ id: '/', defaultMessage: 'Интеграция в проект' })}
/>
<Layout flexBasis={[24, 160]} />
</Column>
</Box>
)
}
1 change: 1 addition & 0 deletions landing/pages/index-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@landing/hero-fragment": "workspace:0.0.1",
"@landing/info-fragment": "workspace:0.0.1",
"@landing/navigation-fragment": "workspace:0.0.1",
"@landing/process-fragment": "workspace:0.0.1",
"@ui/background": "workspace:0.0.1"
},
"devDependencies": {
Expand Down
18 changes: 14 additions & 4 deletions landing/pages/index-page/src/index.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import { Courses } from '@landing/courses-fragment'
import { Hero } from '@landing/hero-fragment'
import { Info } from '@landing/info-fragment'
import { Navigation } from '@landing/navigation-fragment'
import { Process } from '@landing/process-fragment'
import { Background } from '@ui/background'

export const IndexPage = () => (
<>
<Background
position='relative'
gradient='bgPurpleGradientTransitionSymbol'
gradient='purpleGradientTransitionSymbol'
backgroundSize={[
'0,736px 240px,170%,cover,0,0,0',
'100% 400px,contain,90%,0,contain,100% 1080px,100% 690px',
Expand All @@ -27,13 +28,22 @@ export const IndexPage = () => (
</Background>
<Background
position='relative'
gradient='bgDecorativeElement'
backgroundSize='contein'
gradient='decorativeElement'
backgroundSize='100%'
backgroundRepeat='no-repeat'
backgroundPosition={['0 -500px', '0 600px']}
backgroundPosition={['0 -500px', '0 650px']}
>
<Courses />
</Background>
<Background
position='relative'
gradient='veryDarkPurpleAndDecorativeElement'
backgroundSize={['0,100%,cover', '400px,100%,cover']}
backgroundRepeat='no-repeat'
backgroundPosition={['0,0 215px,0 0', '750px 310px,0 200px,0 0']}
>
<Process />
</Background>
</>
)

Expand Down
1 change: 1 addition & 0 deletions ui/button/src/button.interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export type ButtonSize =
| 'wideButtonSmallPaddingMediumHeight'
| 'longButtonSmallPaddingMediumHeight'
| 'longButtonNormalPaddingMediumHeight'
| 'wideButtonSmallPaddingNormalHeight'

export interface ButtonProps extends BaseButtonProps {
variant?: ButtonVariant
Expand Down
8 changes: 8 additions & 0 deletions ui/button/src/button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ import { getBaseStyles } from './styles'

export const fillStyles: styleFn = ifProp(prop('fill', false), { width: '100%' })

const wideButtonSmallPaddingNormalHeightStyles = createShapeStyles({
size: 56,
paddingRight: 8,
paddingLeft: 20,
rounding: prop('theme.radii.medium') as unknown as number,
})

const wideButtonSmallPaddingMediumHeightStyles = createShapeStyles({
size: 40,
paddingRight: 6,
Expand Down Expand Up @@ -78,4 +85,5 @@ export const shapeStyles = switchProp(prop('size', 'normal'), {
longButtonSmallPaddingMediumHeight: longButtonSmallPaddingMediumHeightStyles,
wideButtonSmallPaddingMediumHeight: wideButtonSmallPaddingMediumHeightStyles,
longButtonNormalPaddingMediumHeight: longButtonNormalPaddingMediumHeightStyles,
wideButtonSmallPaddingNormalHeight: wideButtonSmallPaddingNormalHeightStyles,
})
8 changes: 5 additions & 3 deletions ui/theme/src/theme/backgrounds.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const backgrounds = {
bgPurpleGradientTransitionSymbol:
'linear-gradient(180deg, #3D24EC 0%, rgba(61, 36, 236, 0) 100%),url("/hero-bg-element-triangular.png"),url("/hero-bg-symbol.png"),url("/page-bg-mobile.png"),url("/hero-bg-desktop-transition.png"), url("/hero-bg-desktop.png"),linear-gradient(91.07deg, #7E6AFF 0%, #716DFF 33.86%, #696AFE 65.4%, #3A1FEA 98.16%)',
bgDecorativeElement: 'url("/courses-bg-bend-line.png")',
purpleGradientTransitionSymbol:
'linear-gradient(180deg, #3D24EC 0%, rgba(61, 36, 236, 0) 100%),url("/bg-triangular-element.png"),url("/bg-symbol.png"),url("/bg-mobile.png"),url("/bg-transition.png"), url("/bg-desktop.png"),linear-gradient(91.07deg, #7E6AFF 0%, #716DFF 33.86%, #696AFE 65.4%, #3A1FEA 98.16%)',
decorativeElement: 'url("/bg-bend-line.png")',
lightPurpleTransparent:
'radial-gradient(19.48% 113.78% at 80.52% 39.27%, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), radial-gradient(50% 50% at 50% 50%, rgba(36, 0, 254, 0) 63.7%, rgba(36, 0, 254, 0.01) 100%), linear-gradient(96.17deg, #F4F2FF 28.22%, #F4F3FF 68.73%, #E1E2FF 122.28%), linear-gradient(96.17deg, #F7F5FF 28.22%, #ECECFF 122.28%)',
transparentWhite:
'linear-gradient(0deg, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.03)), rgba(255, 255, 255, 0.08)',
veryDarkPurpleAndDecorativeElement:
'url("/sphere-purple.png"), url("/bg-bend-line.png"), rgba(39, 37, 59, 1)',
}

export { backgrounds }
1 change: 1 addition & 0 deletions ui/theme/src/theme/borders.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const borders = {
transparentWhite: '1px solid rgba(255, 255, 255, 0.25)',
lightGray: '1px solid rgba(27, 26, 51, 0.15)',
lightWhite: '1px solid rgba(255, 255, 255, 0.13)',
}

export { borders }
1 change: 1 addition & 0 deletions ui/theme/src/theme/radii.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const radii = {
small: 10,
normal: 12,
medium: 16,
large: 20,
big: 24,
}

Expand Down
17 changes: 17 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@ __metadata:
"@landing/hero-fragment": "workspace:0.0.1"
"@landing/info-fragment": "workspace:0.0.1"
"@landing/navigation-fragment": "workspace:0.0.1"
"@landing/process-fragment": "workspace:0.0.1"
"@ui/background": "workspace:0.0.1"
react: "npm:^18.2.0"
peerDependencies:
Expand Down Expand Up @@ -787,6 +788,22 @@ __metadata:
languageName: unknown
linkType: soft

"@landing/process-fragment@workspace:0.0.1, @landing/process-fragment@workspace:landing/fragments/landing-process":
version: 0.0.0-use.local
resolution: "@landing/process-fragment@workspace:landing/fragments/landing-process"
dependencies:
"@ui/divider": "workspace:0.0.1"
"@ui/layout": "workspace:0.0.1"
"@ui/text": "workspace:0.0.1"
react: "npm:^18.2.0"
react-intl: "npm:^6.4.2"
peerDependencies:
react: "*"
react-dom: "*"
react-intl: "*"
languageName: unknown
linkType: soft

"@landing/renderer-entrypoint@workspace:landing/entrypoints/renderer":
version: 0.0.0-use.local
resolution: "@landing/renderer-entrypoint@workspace:landing/entrypoints/renderer"
Expand Down