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 #15 from atls-academy/feat/landing-fourth-step
Browse files Browse the repository at this point in the history
feat/landing-fourth-step
  • Loading branch information
TorinAsakura authored Sep 11, 2023
2 parents b33f75f + 95680bb commit 6e21f65
Show file tree
Hide file tree
Showing 137 changed files with 3,997 additions and 2,447 deletions.
2,217 changes: 1,220 additions & 997 deletions .pnp.cjs

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions landing/entrypoints/renderer/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,19 @@
"courses.sidebar.number": "5",
"courses.sidebar.sign": "студентов обучаются в одной практической группе",
"courses.sidebar.subtitle": "Вы изучите фундаментальные знания в IT и прокачаете нужные для сферы навыки. Мы не собираем большие группы, что позволяет курировать работу каждого студента.",
"courses.subtitle.advantage-of-learning": "Эффективность обучения заметно вырастает из-за",
"courses.subtitle.advantage-of-learning": "Эффективность обучения",
"courses.subtitle.visibly": "заметно",
"courses.subtitle.grow": "вырастает из-за",
"courses.subtitle.practice": "практики",
"courses.subtitle.on-existing-projects": "на существующих проектах.",
"courses.subtitle.on": "на",
"courses.subtitle.existing-projects": "существующих проектах.",
"courses.subtitle.power-broker": "Являясь серым кардиналом,",
"courses.subtitle.atlantis": "Atlantis",
"courses.subtitle.has-an-impact-on": "имеет влияние на",
"courses.subtitle.has": "имеет",
"courses.subtitle.impact-on": "влияние на",
"courses.subtitle.it": "сферу IT",
"courses.subtitle.unlimited-possibilities": "и неограниченные возможности в",
"courses.subtitle.unlimited": "и неограниченные",
"courses.subtitle.possibilities": "возможности в",
"courses.subtitle.use-skills": "применении навыков",
"courses.subtitle.point": ".",
"courses.title": "Курсы и материалы",
Expand All @@ -33,10 +38,6 @@
"hero.title.it": "IT",
"hero.title.text": "Обучаем профессионалов для революции в",
"navigation.button": "Курсы",
"navigation.item.academy": "academy",
"navigation.item.courses": "курсы",
"navigation.item.teaching": "обучение",
"navigation.item.faq": "faq",
"process.item.text": "Являясь серым кардиналом Atlantis имеет влияние на сферу IT.",
"process.item.create-environment": "Создание среды",
"process.item.practical-work": "Практика изученого",
Expand Down
3 changes: 3 additions & 0 deletions landing/entrypoints/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"start": "yarn next start src"
},
"dependencies": {
"@emotion/css": "11.11.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"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.
5 changes: 3 additions & 2 deletions landing/fragments/landing-about/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
"version": "0.0.1",
"main": "src/index.ts",
"dependencies": {
"@ui/background": "workspace: 0.0.1",
"@ui/condition": "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"
},
"devDependencies": {
"@types/react": "18.2.9",
"@types/react-dom": "18.2.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intl": "6.0.8"
},
"peerDependencies": {
Expand Down
24 changes: 12 additions & 12 deletions landing/fragments/landing-about/src/about.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import { useWindowWidth } from '@ui/utils'
import { Delimiter } from './delimiter'

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

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

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

<Column flexBasis={[335, 1460]} flexGrow='1'>
<Condition match={isDesktop}>
<Condition match={!isMobile}>
<Box display='inline'>
<Text
display='inline'
Expand Down Expand Up @@ -59,53 +59,53 @@ export const About = () => {

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

<Box>
<Text color='text.white' fontSize='small' lineHeight='normal'>
<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='normal'>
<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='normal'>
<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='normal'>
<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='normal'>
<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='normal'>
<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={isDesktop}>
<Condition match={!isMobile}>
<Box display='inline'>
<Text
display='inline'
Expand All @@ -127,7 +127,7 @@ export const About = () => {
<Layout flexBasis={[20, 230]} />
</Row>

<Layout flexBasis={[64, 160]} />
<Layout flexBasis={[128, 240]} />
</Column>
)
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
import React from 'react'
import React from 'react'

import { Image } from '@ui/image'
import { Box } from '@ui/layout'
import { Background } from '@ui/background'
import { Image } from '@ui/image'
import { Box } from '@ui/layout'

export const Delimiter = () => (
<Box
<Background
backgroundColor='ghostTransparentGradient'
borderRadius='little'
display='inline-flex'
backgroundColor='background.whiteTransparent'
width={76}
height={52}
alignItems='center'
justifyContent='center'
>
<Image src='./image/Default.png' width={40} height={40} />
</Box>
<Box
width={76}
height={52}
alignItems='center'
justifyContent='center'
borderRadius='little'
border='thinnestGhost'
backgroundColor='background.whiteTransparent'
>
<Image src='./image/Default.png' width={40} height={40} />
</Box>
</Background>
)
4 changes: 2 additions & 2 deletions landing/fragments/landing-courses/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"@ui/utils": "workspace: 0.0.1"
},
"devDependencies": {
"@types/react": "18.2.9",
"@types/react-dom": "18.2.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intl": "6.0.8"
},
"peerDependencies": {
Expand Down
42 changes: 0 additions & 42 deletions landing/fragments/landing-courses/src/cards-list/cards-list.ts

This file was deleted.

1 change: 0 additions & 1 deletion landing/fragments/landing-courses/src/cards-list/index.ts

This file was deleted.

Loading

0 comments on commit 6e21f65

Please sign in to comment.