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

Commit

Permalink
Merge pull request #19 from atls-academy/feat/landing-sixth-step
Browse files Browse the repository at this point in the history
feat/landing-sixth-step
  • Loading branch information
TorinAsakura authored Oct 15, 2023
2 parents 74f4f86 + 47dc5ae commit 9b45b38
Show file tree
Hide file tree
Showing 178 changed files with 5,809 additions and 2,484 deletions.
2,500 changes: 1,767 additions & 733 deletions .pnp.cjs

Large diffs are not rendered by default.

22 changes: 13 additions & 9 deletions landing/entrypoints/renderer/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,32 @@
"about.central-idea-architects-mobile": "и архитекторов,",
"about.central-idea-not-programmers-mobile": "а не программистов и дизайнеров",
"about.intro-digital-mobile": "Digital становится всё более многолюдным, востребованность по направлениям при этом",
"about.intro-not-decrease-mobile": "не снижается. Но специалистов, готовых нести ответсвенность",
"about.intro-not-decrease-mobile": "не снижается. Но специалистов, готовых нести ответственность",
"about.intro-for-your-decisions-mobile": "за свои решения по-прежнему мало.",
"about.intro-desktop": "Digital становится всё более многолюдным, востребованность по направлениям при этом не снижается",
"about.problem-desktop": "Но специалистов, готовых нести ответсвенность за свои решения по-прежнему мало",
"about.problem-desktop": "Но специалистов, готовых нести ответственность за свои решения по-прежнему мало",
"courses.button.all-materials": "Все материалы",
"courses.sidebar.button-desktop": "Процесс поступления",
"courses.sidebar.number": "5",
"courses.sidebar.sign": "студентов обучаются в одной практической группе",
"courses.sidebar.subtitle": "Вы изучите фундаментальные знания в IT и прокачаете нужные для сферы навыки. Мы не собираем большие группы, что позволяет курировать работу каждого студента.",
"courses.subtitle.advantage-of-learning": "Эффективность обучения",
"courses.subtitle.visibly": "заметно",
"courses.subtitle.grow": "вырастает из-за",
"courses.subtitle.grow": "вырастает",
"courses.subtitle.because-desktop": "из-за",
"courses.subtitle.because-mobile": "благодаря",
"courses.subtitle.practice": "практики",
"courses.subtitle.on": "на",
"courses.subtitle.existing-projects": "существующих проектах.",
"courses.subtitle.on-desktop": "на",
"courses.subtitle.existing-projects-desktop": "существующих проектах.",
"courses.subtitle.existing-projects-mobile": "на существующих проектах.",
"courses.subtitle.power-broker": "Являясь серым кардиналом,",
"courses.subtitle.atlantis": "Atlantis",
"courses.subtitle.has": "имеет",
"courses.subtitle.impact-on": "влияние на",
"courses.subtitle.impact-on": "влияние на ",
"courses.subtitle.it": "сферу IT",
"courses.subtitle.unlimited": "и неограниченные",
"courses.subtitle.possibilities": "возможности в",
"courses.subtitle.unlimited": "и неограниченные",
"courses.subtitle.possibilities": "возможности",
"courses.subtitle.in": "в ",
"courses.subtitle.use-skills": "применении навыков",
"courses.subtitle.point": ".",
"courses.title": "Курсы и материалы",
Expand All @@ -53,7 +57,7 @@
"navigation.button": "Курсы",
"process.item.text": "Являясь серым кардиналом Atlantis имеет влияние на сферу IT.",
"process.item.create-environment": "Создание среды",
"process.item.practical-work": "Практика изученого",
"process.item.practical-work": "Практика изученного",
"process.item.project-integration": "Интеграция в проект",
"process.item.studies-of-technologies": "Изучение технологий",
"process.item.team-integration": "Интеграция в команду",
Expand Down
7 changes: 4 additions & 3 deletions landing/entrypoints/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
"start": "yarn next start src"
},
"dependencies": {
"@emotion/css": "11.11.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@emotion/css": "11.9.0",
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@ui/animate": "workspace:0.0.1",
"next": "12.3.4",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions landing/fragments/landing-about/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
"main": "src/index.ts",
"dependencies": {
"@ui/background": "workspace: 0.0.1",
"@ui/condition": "workspace: 0.0.1",
"@ui/delimiter": "workspace: 0.0.1",
"@ui/image": "workspace: 0.0.1",
"@ui/layout": "workspace: 0.0.1",
"@ui/text": "workspace: 0.0.1",
"@ui/utils": "workspace: 0.0.1"
"@ui/text": "workspace: 0.0.1"
},
"devDependencies": {
"react": "18.2.0",
Expand Down
186 changes: 63 additions & 123 deletions landing/fragments/landing-about/src/about.component.tsx
Original file line number Diff line number Diff line change
@@ -1,133 +1,73 @@
import React from 'react'
import { FormattedMessage } from 'react-intl'

import { Condition } from '@ui/condition'
import { Delimiter } from '@ui/delimiter'
import { Box } from '@ui/layout'
import { Row } from '@ui/layout'
import { Layout } from '@ui/layout'
import { Column } from '@ui/layout'
import { Text } from '@ui/text'
import { Space } from '@ui/text'
import { useWindowWidth } from '@ui/utils'

import { Delimiter } from './delimiter'

export const About = () => {
const { isMobile } = useWindowWidth()

return (
<Column flexGrow='1'>
<Layout flexBasis={[64, 160]} />

<Row>
<Layout flexBasis={[20, 230]} />

<Column flexBasis={[335, 1460]} flexGrow='1'>
<Condition match={!isMobile}>
<Box display='inline'>
<Text
display='inline'
color='text.white'
fontSize='common'
lineHeight='huge'
wordWrap='break-word'
>
<FormattedMessage id='about.intro-desktop' />
</Text>

<Space count='6' />

<Delimiter />

<Space count='6' />

<Text
display='inline'
color='text.white'
fontSize='common'
lineHeight='huge'
wordWrap='break-word'
>
<FormattedMessage id='about.problem-desktop' />
</Text>

<Space count='6' />

<Delimiter />
</Box>
</Condition>

<Condition match={isMobile}>
<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.intro-digital-mobile' />
</Text>
</Box>

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.intro-not-decrease-mobile' />
</Text>
</Box>

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.intro-for-your-decisions-mobile' />
</Text>
</Box>

<Layout flexBasis={28} />

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.central-idea-atlantis-teach-mobile' />
</Text>
</Box>

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.central-idea-make-engineers-mobile' />
</Text>
</Box>

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.central-idea-architects-mobile' />
</Text>
</Box>

<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id='about.central-idea-not-programmers-mobile' />
</Text>
</Box>
</Condition>

<Layout flexBasis={[0, 40]} />

<Condition match={!isMobile}>
<Box display='inline'>
<Text
display='inline'
color='text.white'
fontSize='common'
lineHeight='huge'
wordWrap='break-word'
>
<FormattedMessage id='about.central-idea-desktop' />
</Text>

<Space count='6' />

<Delimiter />
</Box>
</Condition>

import { DesktopTextBlock } from './text-block'
import { MobileTextBlock } from './text-block'

export const About = () => (
<Column flexGrow='1'>
<Layout flexBasis={[64, 160]} />

<Row>
<Layout flexBasis={[20, 230]} />

<Column flexBasis={[335, 1460]} flexGrow='1' flexShrink='0'>
<Box display={['none', 'inline']}>
<DesktopTextBlock id='about.intro-desktop' />

<Space count='6' />

<Delimiter />

<Space count='6' />

<DesktopTextBlock id='about.problem-desktop' />

<Space count='6' />

<Delimiter />
</Box>

<Column display={['flex', 'none']}>
<MobileTextBlock id='about.intro-digital-mobile' />

<MobileTextBlock id='about.intro-not-decrease-mobile' />

<MobileTextBlock id='about.intro-for-your-decisions-mobile' />

<Layout flexBasis={28} />

<MobileTextBlock id='about.central-idea-atlantis-teach-mobile' />

<MobileTextBlock id='about.central-idea-make-engineers-mobile' />

<MobileTextBlock id='about.central-idea-architects-mobile' />

<MobileTextBlock id='about.central-idea-not-programmers-mobile' />
</Column>

<Layout flexBasis={[20, 230]} />
</Row>
<Layout flexBasis={[0, 40]} />

<Box display={['none', 'inline']}>
<Box display='inline'>
<DesktopTextBlock id='about.central-idea-desktop' />

<Space count='6' />

<Delimiter />
</Box>
</Box>
</Column>

<Layout flexBasis={[20, 230]} />
</Row>

<Layout flexBasis={[128, 240]} />
</Column>
)
}
<Layout flexBasis={[128, 240]} />
</Column>
)
1 change: 1 addition & 0 deletions landing/fragments/landing-about/src/text-block/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './text-block.component'
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from 'react'
import { FC } from 'react'
import { FormattedMessage } from 'react-intl'

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

import { TextBlockProps } from './text-block.interfaces'

export const DesktopTextBlock: FC<TextBlockProps> = ({ id }) => (
<Text
display='inline'
color='text.white'
fontSize='common'
lineHeight='huge'
wordWrap='break-word'
>
<FormattedMessage id={id} />
</Text>
)

export const MobileTextBlock: FC<TextBlockProps> = ({ id }) => (
<Box>
<Text color='text.white' fontSize='small' lineHeight='huge'>
<FormattedMessage id={id} />
</Text>
</Box>
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface TextBlockProps {
id: string
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import React from 'react'

import { Card } from '@ui/card'
import { Condition } from '@ui/condition'
import { Layout } from '@ui/layout'
import { Box } from '@ui/layout'
import { useWindowWidth } from '@ui/utils'

import { CardCategory } from '../data'
import { CardsList } from '../data'

export const CardsLearning = () => {
const { isMobile } = useWindowWidth()

return (
<Box flexDirection={{ _: 'column', standard: 'column', wide: 'row' }}>
{CardsList.filter(
(card) => card.category === CardCategory.Teach || card.category === CardCategory.MiniCourse
).map((card, index, array) => (
<Box
key={card.id}
flexDirection={{ _: 'column', standard: 'column', wide: 'row' }}
width='100%'
>
<Condition match={index !== 0}>
<Layout flexBasis={[10, 20]} flexShrink='0' />
</Condition>

<Condition match={card.category === CardCategory.Teach && !isMobile}>
<Card
category={card.category}
titleDesktop={card.title}
description={card.descriptionDesktop}
indent={{ standard: 214, wide: 356, ultra: 222 }}
widthCategoryBox={{ standard: 104, wide: 156 }}
image={card.image}
/>
</Condition>

<Condition match={card.category === CardCategory.Teach && isMobile}>
<Card
category={card.category}
titleDesktop={card.title}
description={card.descriptionMobile}
indent={104}
widthCategoryBox={80}
/>
</Condition>

<Condition match={card.category === CardCategory.MiniCourse && !isMobile}>
<Card
category={card.category}
titleDesktop={card.title}
description={card.descriptionDesktop}
indent={{ standard: 56, wide: 356, ultra: 222 }}
widthCategoryBox={{ standard: 112, wide: 167 }}
image={card.image}
/>
</Condition>

<Condition match={card.category === CardCategory.MiniCourse && isMobile}>
<Card
category={card.category}
titleDesktop={card.title}
description={card.descriptionMobile}
indent={49}
widthCategoryBox={87}
/>
</Condition>

<Condition match={index !== array.length - 1}>
<Layout flexBasis={[10, 20]} flexShrink='0' />
</Condition>
</Box>
))}
</Box>
)
}
Loading

0 comments on commit 9b45b38

Please sign in to comment.