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

feat/landing-second-step #11

Merged
merged 60 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
88c7145
feat: add ui/button
Mirved64 Jul 17, 2023
16c656c
feat: add divider to navigation items
Mirved64 Jul 17, 2023
17508ea
feat: add button to navigation section
Mirved64 Jul 18, 2023
34e498f
feat: add buttons to hero section
Mirved64 Jul 18, 2023
a748013
feat: add buttons to courses section, add cards component, info compo…
Mirved64 Jul 18, 2023
280c85c
fix: fix imposition in process section
Mirved64 Jul 18, 2023
c965f82
feat: add borders to theme, add borders to slider section
Mirved64 Jul 18, 2023
043de1b
feat: add button to faq section
Mirved64 Jul 18, 2023
1c1251b
feat: add buttons to slider section
Mirved64 Jul 18, 2023
4f8cea9
fix: remove display props in card-small component
Mirved64 Jul 19, 2023
dd39936
fix: rename card-small and card-big components, fix markup in courses…
Mirved64 Jul 19, 2023
a6ad0b1
fix: check markup
Mirved64 Jul 19, 2023
fd8da08
fix: change @ui/button files, change buttons in sections
Mirved64 Jul 19, 2023
747b074
fix: remove links from hero section
Mirved64 Jul 19, 2023
4268789
fix: remove margin 0 auto from courses section
Mirved64 Jul 19, 2023
00d5f65
fix: remove card-letning-material and cards-lerning-and-courses, add …
Mirved64 Jul 20, 2023
9080f00
fix: remove card factory, add Ui/card
Mirved64 Jul 21, 2023
8c936d9
fix: change some depencies in yarnrc
Mirved64 Jul 21, 2023
840ac39
fix: change structure of ui/card directory
Mirved64 Jul 22, 2023
0ea3387
fix: check fonts
Mirved64 Jul 22, 2023
9ddd98c
fix: resolve error in tsconfig.json
Mirved64 Jul 24, 2023
583b5be
fix: rework ui/card, add custom card in landing courses, add cards in…
Mirved64 Jul 24, 2023
a4470c2
refactor: add condition to card.component
Mirved64 Jul 25, 2023
069f313
refactor: wrap card in NextLink in ui/card, remove backdrop
Mirved64 Jul 25, 2023
b2c5e07
fix: resolve error in tsconfig
Mirved64 Jul 25, 2023
f56800c
refactor: check fonts, rename mobail to mobile
Mirved64 Jul 25, 2023
cc34043
chore: rename gaps to gapBasis in card
Mirved64 Jul 25, 2023
207564f
feat: add ui/swiper
Mirved64 Jul 26, 2023
34f8748
refactor: change markup in courses component, card component, add swi…
Mirved64 Jul 26, 2023
29ca0c4
refactor: change markup in navigation and courses sections
Mirved64 Jul 26, 2023
0adb7f9
feat: wrap socials to nextlink in hero section, check markup
Mirved64 Jul 26, 2023
1620211
refactor: remove some flexShrink in about section
Mirved64 Jul 26, 2023
15ca889
refactor: check markup in process section
Mirved64 Jul 26, 2023
bc5ba44
refactor: check markup in technologies section
Mirved64 Jul 26, 2023
87aa57b
refactor: check markup in slider section
Mirved64 Jul 26, 2023
bef01b0
refactor: check markup in faq section, remove nextLinks
Mirved64 Jul 26, 2023
c709edd
style: use yarn format
Mirved64 Jul 26, 2023
83c8614
chore: remove margin 0 auto
Mirved64 Jul 27, 2023
44fdc45
chore: change NextLink to Link in hero section
Mirved64 Jul 27, 2023
59459f4
chore: add flexShrink to markup
Mirved64 Jul 27, 2023
7bb16ac
feat: add @ui/utils, add useWindowWidth hook
Mirved64 Jul 28, 2023
338f790
chore: remove display, add condition
Mirved64 Jul 28, 2023
ddade8c
reafactor: add isMobile and isDesktop in useWindowWidth hook. check m…
Mirved64 Jul 28, 2023
5c68ad2
refactor: separate box and column, check display=none, make responsiv…
Mirved64 Jul 29, 2023
6c3bd2c
refactor: rename gap prop, change width=100% to flexGrow in courses s…
Mirved64 Aug 1, 2023
38172a8
refactor: change width=100% to flexGrow, remove needless wrapper in …
Mirved64 Aug 1, 2023
ff48362
refactor: change width=100% to flexGrow in about, hero, process sections
Mirved64 Aug 1, 2023
0252940
refactor: remove needless wrapper, check layout in technology section
Mirved64 Aug 1, 2023
4e0151f
refactor: check depencies of swiper
Mirved64 Aug 1, 2023
adb01ac
refactor: change ui/card files, check layout in coursess section
Mirved64 Aug 3, 2023
24730c4
refactor: rename props in item component in process section
Mirved64 Aug 3, 2023
854d9c7
refactor: change layout in navigation section
Mirved64 Aug 3, 2023
a5b32a4
fix: resolve warnings in console
Mirved64 Aug 4, 2023
eb98255
chore: rename colors in project
Mirved64 Aug 4, 2023
7cba243
refactor: make adaptive layout, change space-between to layout
Mirved64 Aug 4, 2023
e9cb28e
refactor: change layout in about section
Mirved64 Aug 4, 2023
be27855
chore: check version of dependencies in packages
Mirved64 Aug 4, 2023
6bd8405
refactor: check some depencies in project
Mirved64 Aug 7, 2023
8bd77d2
fix: add width to wrapper of Layout, Divider and Layout elements in I…
Mirved64 Aug 7, 2023
cd94a88
refactor: remove needless flexShrink
Mirved64 Aug 7, 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
260 changes: 257 additions & 3 deletions .pnp.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ packageExtensions:
react: '^17.0.1'

yarnPath: .yarn/releases/yarn-0.0.1-git.20230217.hash-56aa982.cjs

checksumBehavior: update
7 changes: 5 additions & 2 deletions landing/entrypoints/renderer/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@
"aboutTextProblemFirstDesktop": "Но специалистов, готовых",
"aboutTextProblemSecondDesktop": "нести ответсвенность за свои решения по-прежнему мало",
"coursesButton": "Все материалы",
"coursesCardBasisCategory": "мини-курс",
"coursesCardBasisText": "Вы изучите фундаментальные знания в ИТ и прокачаетесь в направлении программирования. Получите востребованную профессию и возможность открыть бизнес в сфере информационных технологий",
"coursesCardBasisTitle": "Основы разработки",
"coursesCardFrontendCategory": "обучение",
"coursesCardFrontendText": "Вы изучите фундаментальные знания в ИТ и прокачаетесь в направлении программирования. Получите востребованную профессию и возможность открыть бизнес в сфере информационных технологий",
"coursesCardFrontendTitle": "Frontend Engineer",
"coursesSidebarButtonDesktop": "Процесс поступления",
"coursesSidebarNumber": "5",
"coursesSidebarSign": "студентов обучаются в одной практической группе",
"coursesSidebarSubtitle": "Вы изучите фундаментальные знания в IT и прокачаете нужные для сферы навыки. Мы не собираем большие группы, что позволяет курировать работу каждого студента.",
"coursesSmallCardDesign": "Дизайн, Figma, Математика",
"coursesSmallCardLibraries": "Как использовать библиотеки",
"coursesCardLearningMaterialDesign": "Дизайн, Figma, Математика",
"coursesCardLearningMaterial": "учебный материал",
"coursesCardLearningMaterialLibraries": "Как использовать библиотеки",
"coursesSubtitleAdvantageOfLearning": "Эффективность обучения заметно вырастает благодаря практики на существующих проектах.",
"coursesSubtitleAtlantisPowerBroker": "Являясь серым кардиналом, Atlantis имеет влияние на сферу IT и неограниченные возможности в применении навыков.",
"coursesTitle": "Курсы и материалы",
Expand Down
2 changes: 2 additions & 0 deletions landing/fragments/landing-about/src/about.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export const About = () => (
<FormattedMessage id='aboutTextProblemSecondDesktop' />
</Text>
</Box>

<Space count='14' />

<Box width={76} height={52} alignItems='center' justifyContent='center'>
Expand Down Expand Up @@ -131,6 +132,7 @@ export const About = () => (
<FormattedMessage id='aboutCentralIdeaSecondDesktop' />
</Text>
</Box>

<Space count='6' />

<Box width={76} height={52} alignItems='center' justifyContent='center'>
Expand Down
2 changes: 2 additions & 0 deletions landing/fragments/landing-courses/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "0.0.1",
"main": "src/index.ts",
"dependencies": {
"@ui/button": "workspace:^",
"@ui/divider": "workspace:^",
"@ui/icons": "workspace:^",
"@ui/image": "workspace:^",
"@ui/layout": "workspace: 0.0.1",
"@ui/link": "workspace:^",
Expand Down
178 changes: 178 additions & 0 deletions landing/fragments/landing-courses/src/cards/card.factory.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
import React from 'react'
TorinAsakura marked this conversation as resolved.
Show resolved Hide resolved
import { FC } from 'react'

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

type CardType = 'course' | 'miniCourse' | 'materials'

interface BaseCardProps {
cardCategory: string
cardTitle: string
cardText?: string // eslint-disable-line
}

interface CardProps extends BaseCardProps {
cardType: CardType
}

const CardCourse: FC<BaseCardProps> = ({ cardCategory, cardTitle, cardText }) => (
<Box>
<Layout flexBasis={[16, 42]} flexShrink='0' />

<Column flexBasis={[303, 1160]}>
<Layout flexBasis={[16, 42]} flexShrink='0' />

<Column flexGrow='1'>
<Box width={[80, 104]} height={[27, 38]} justifyContent='center' alignItems='center'>
<Text
color='text.courses.primary'
fontSize={['subAtom', 'tiny']}
fontWeight='normal'
lineHeight={['atom', 'tiny']}
textTransform='uppercase'
>
{cardCategory}
</Text>
</Box>

<Layout flexBasis={[104, 214]} flexShrink='0' />

<Box>
<Text
color='text.courses.primary'
fontSize={['medium', 'regular']}
fontWeight='normal'
lineHeight={['normal', 'mean']}
>
{cardTitle}
</Text>
</Box>

<Layout flexBasis={[12, 16]} flexShrink='0' />

<Box maxWidth={694} flexGrow={[1, 0]}>
<Text
color='text.courses.primary'
fontSize={['tiny', 'small']}
fontWeight='normal'
lineHeight={['small', 'normal']}
>
{cardText}
</Text>
</Box>
</Column>

<Layout flexBasis={[16, 40]} flexShrink='0' />
</Column>
</Box>
)

const CardMiniCourse: FC<BaseCardProps> = ({ cardCategory, cardTitle, cardText }) => (
<Box>
<Layout flexBasis={[16, 42]} flexShrink='0' />

<Column flexBasis={[303, 1160]}>
<Layout flexBasis={[16, 42]} flexShrink='0' />

<Column flexGrow='1'>
<Box width={[80, 104]} height={[27, 38]} justifyContent='center' alignItems='center'>
<Text
color='text.courses.primary'
fontSize={['subAtom', 'tiny']}
fontWeight='normal'
lineHeight={['atom', 'tiny']}
textTransform='uppercase'
>
{cardCategory}
</Text>
</Box>

<Layout flexBasis={[49, 54]} flexShrink='0' />

<Box>
<Text
color='text.courses.primary'
fontSize={['medium', 'regular']}
fontWeight='normal'
lineHeight={['normal', 'mean']}
>
{cardTitle}
</Text>
</Box>

<Layout flexBasis={[12, 16]} flexShrink='0' />

<Box maxWidth={694} flexGrow={[1, 0]}>
<Text
color='text.courses.primary'
fontSize={['tiny', 'small']}
fontWeight='normal'
lineHeight={['small', 'normal']}
>
{cardText}
</Text>
</Box>
</Column>

<Layout flexBasis={[16, 40]} flexShrink='0' />
</Column>
</Box>
)

const CardMaterials: FC<BaseCardProps> = ({ cardCategory, cardTitle }) => (
<Box flexBasis={[260, 560]} flexShrink={[0, 1]}>
<Layout flexBasis={[16, 32]} flexShrink='0' />

<Column>
<Layout flexBasis={[16, 32]} flexShrink='0' />

<Box width={[142, 179]} height={[27, 38]} justifyContent='center' alignItems='center'>
<Text
color='text.courses.primary'
fontSize={['subAtom', 'tiny']}
fontWeight='normal'
lineHeight={['atom', 'tiny']}
textTransform='uppercase'
>
{cardCategory}
</Text>
</Box>

<Layout flexBasis={[62, 126]} />

<Box>
<Text
color='text.courses.primary'
fontSize={['small', 'regular']}
fontWeight='normal'
lineHeight={['tiddly', 'mean']}
>
{cardTitle}
</Text>
</Box>

<Layout flexBasis={[16, 32]} />
</Column>

<Layout flexBasis={[16, 32]} flexShrink='0' />
</Box>
)

export const Card: FC<CardProps> = ({ cardType, ...props }) => {
const { cardCategory, cardTitle, cardText } = props

if (cardType === 'course') {
return <CardCourse cardCategory={cardCategory} cardTitle={cardTitle} cardText={cardText} />
}
if (cardType === 'miniCourse') {
return <CardMiniCourse cardCategory={cardCategory} cardTitle={cardTitle} cardText={cardText} />
}
if (cardType === 'materials') {
return <CardMaterials cardCategory={cardCategory} cardTitle={cardTitle} />
}

return null
}
1 change: 1 addition & 0 deletions landing/fragments/landing-courses/src/cards/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './card.factory'
Loading