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

feat/landing-fourth-step #15

Merged
merged 51 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
2b9b944
refactor: remove needless wrapper in item component in process sectio…
Mirved64 Aug 13, 2023
7307bba
feat: add radii in theme, add border radius props in ui/button, add b…
Mirved64 Aug 13, 2023
8eac678
refactor: rework box IT in hero section
Mirved64 Aug 14, 2023
1015838
Merge branch 'feat/landing-third-step' into feat/landing-fourth-step
Mirved64 Aug 14, 2023
8287803
fix: rework social component
Mirved64 Aug 14, 2023
bd7535a
feat: add borders
Mirved64 Aug 14, 2023
8433f85
feat: add toolbars in slider section
Mirved64 Aug 14, 2023
612b43e
Merge branch 'feat/landing-third-step' into feat/landing-fourth-step
Mirved64 Aug 15, 2023
e0c0446
feat: add background color gradient
Mirved64 Aug 15, 2023
3fe5f91
feat: add border radius to sections
Mirved64 Aug 15, 2023
84b8d98
fix: sections match the design
Mirved64 Aug 16, 2023
50395c5
Merge branch 'feat/landing-third-step' into feat/landing-fourth-step
Mirved64 Aug 21, 2023
e19ad66
fix: tune top props in index page
Mirved64 Aug 21, 2023
15e82bb
feat: add ui/accordion, ui/drawer, hover hook, rework faq section
Mirved64 Aug 21, 2023
6f76555
feat: add hover to accordion
Mirved64 Aug 22, 2023
6c62e00
fix: resolve console warning, fix hover in faq section
Mirved64 Aug 22, 2023
e5b23f9
feat: add ui/slider, rework process to steps component, rework slider…
Mirved64 Aug 23, 2023
eaa455c
feat: add hover to ui/card
Mirved64 Aug 23, 2023
5a374b8
fix: check framer-motion versions, check layout of ui/accordion
Mirved64 Aug 23, 2023
3dd9b8a
feat: add hover to links in navigation section
Mirved64 Aug 23, 2023
365d8fe
feat: add ui/navbar with scrollspy in project
Mirved64 Aug 24, 2023
17b9fe9
feat: add drawer to navigation section, rework navigation section, ad…
Mirved64 Aug 24, 2023
4e3d8dc
feat: add cards to drawer in navigation section, rework ui/card
Mirved64 Aug 24, 2023
9811852
fix: create items for drawer in navigation section, check layout of c…
Mirved64 Aug 24, 2023
ab0b22b
feat: add hover and pressed props and styles in ui/button
Mirved64 Aug 25, 2023
e6dd03e
refactor: check layout in faq, navigation sections and ui/accordion
Mirved64 Aug 25, 2023
0115f1b
refactor: remove needless layout, check layout in project
Mirved64 Aug 29, 2023
d4d47dd
chore: replace divider.color to background.color
Mirved64 Aug 29, 2023
6a0d360
chore: replace lineHeight in px to lineHeight in percents
Mirved64 Aug 29, 2023
ea19453
refactor: change width of answer box in accordion
Mirved64 Aug 29, 2023
0d3b702
refactor: rework ui/condition
Mirved64 Aug 29, 2023
64727e3
refactor: add text color of answer in mobile
Mirved64 Aug 29, 2023
7bfa4c6
refactor: change indent in card desktop
Mirved64 Aug 29, 2023
58acd6d
refactor: check background color in hero and delimiter in about section
Mirved64 Aug 29, 2023
5ed22c8
refactor: change font color and text in cards mobile
Mirved64 Aug 30, 2023
cb2f12c
refactor: check font size and line height in hero section
Mirved64 Aug 30, 2023
8bf112f
refactor: swap inline to flex in courses section
Mirved64 Aug 31, 2023
7060877
feat: add necessary interfaces
Mirved64 Sep 1, 2023
041779f
refactor: change "Column width='100%'" to "Column fill", replace ()=>…
Mirved64 Sep 1, 2023
7c9a7ea
refactor: check dependencies in packages
Mirved64 Sep 1, 2023
f0b54d0
refactor: use enum in cards interface
Mirved64 Sep 1, 2023
5d2cb5f
refactor: chande string to enum in filter function in courses section
Mirved64 Sep 4, 2023
ca76bec
refactor: remove isDesktop, rework handleClose and handleOpen in navi…
Mirved64 Sep 7, 2023
ddcfdb5
refactor: check type of props
Mirved64 Sep 7, 2023
b055fff
refactor: rework drawer and navigation section
Mirved64 Sep 7, 2023
b0e7428
refactor: use DRY pattern
Mirved64 Sep 7, 2023
ed67fb7
refactor: devide some components
Mirved64 Sep 8, 2023
4d55719
refactor: rename item to navlink in navigation section
Mirved64 Sep 11, 2023
a2c8a9e
refactor: rename item to step in process section, rename items to que…
Mirved64 Sep 11, 2023
62d1933
refactor: remove needless types of props
Mirved64 Sep 11, 2023
95680bb
refactor: rename navlink to navlinkitem in navigation section
Mirved64 Sep 11, 2023
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
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