atls-academy · TorinAsakura · Jun 2, 2023 · May 26, 2023 · May 27, 2023 · May 27, 2023
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/landing/entrypoints/renderer/src/public/font/gella-display.otf b/landing/entrypoints/renderer/src/public/font/gella-display.otf
diff --git a/landing/fragments/landing-courses/src/cards/card-details/card-details.component.tsx b/landing/fragments/landing-courses/src/cards/card-details/card-details.component.tsx
@@ -55,7 +55,7 @@ export const CardDetails: FC<CardDetailsProps> = ({ info, quantity, desc }) => (
           </Box>
           <Box width={64} height={64} display={['flex', 'none']}>
             <Layout flexBasis={65} flexShrink='0' />
-            <ImageBlock src='/courses-icon-sphere.png' />
+            <ImageBlock src='/sphere-pink.png' />
           </Box>
         </Box>
       </Column>

diff --git a/landing/fragments/landing-courses/src/cards/cards-component.tsx b/landing/fragments/landing-courses/src/cards/cards-component.tsx
@@ -53,7 +53,12 @@ const Cards = () => {
         />
         <Layout flexBasis={[20, 40]} />
         <Box display={['flex', 'none']}>
-          <Swiper spaceBetween={10} slidesPerView={1.22} slidesOffsetAfter={-10}>
+          <Swiper
+            spaceBetween={10}
+            slidesPerView={1.22}
+            slidesOffsetAfter={-10}
+            className='CardSlider'
+          >
             <SwiperSlide>
               <CardShort
                 category={intl.formatMessage({ id: '/', defaultMessage: 'Учебный материал' })}
@@ -83,7 +88,7 @@ const Cards = () => {
           />
         </Box>
       </Column>
-      <Layout flexBasis={[0, 40]} />
+      <Layout flexBasis={[0, 40]} flexShrink='0' />
       <Column order={[0, 1]}>
         <CardDetails
           info={intl.formatMessage({
@@ -102,12 +107,12 @@ const Cards = () => {
           <Button
             size='longButtonSmallPaddingMediumHeight'
             variant='darkPurpleBackground'
-            gap={117}
+            gap='28%'
             iconSVG={<IconPlus />}
             iconWidth={48}
             iconHeight={48}
             iconRadius='normal'
-            fill
+            buttonFill
           >
             <Text fontSize='regular' lineHeight='regular'>
               <FormattedMessage id='/' defaultMessage='Процесс поступления' />
@@ -123,7 +128,7 @@ const Cards = () => {
             iconWidth={32}
             iconHeight={32}
             iconRadius='little'
-            fill
+            buttonFill
           >
             <Text fontSize='middle' lineHeight='small'>
               <FormattedMessage id='/' defaultMessage='Процесс поступления' />

diff --git a/landing/fragments/landing-courses/src/courses.component.tsx b/landing/fragments/landing-courses/src/courses.component.tsx
@@ -14,9 +14,9 @@ import { Space }            from '@ui/text'
 import { Cards }            from './cards'
 
 export const Courses = () => (
-  <Row>
-    <Layout flexBasis={[20, 230]} />
-    <Column width={['335px', '1460px']}>
+  <Row width='100%' justifyContent='center'>
+    <Layout flexBasis={[20, 230]} flexShrink='0' />
+    <Column width={['335px', '1460px']} flexShrink='0'>
       <Layout flexBasis={[64, 160]} />
       <Box>
         <Box>
@@ -30,16 +30,16 @@ export const Courses = () => (
           </Text>
         </Box>
         <Layout flexBasis={[0, 344]} />
-        <Box display={['none', 'flex']} width={253} alignItems='center'>
+        <Box display={['none', 'flex']} width={253} alignItems='center' flexShrink='0'>
           <Button
             size='longButtonSmallPaddingMediumHeight'
             variant='darkPurpleBackground'
-            gap={23}
+            gap='8%'
             iconSVG={<IconArrowRight />}
             iconWidth={48}
             iconHeight={48}
             iconRadius='medium'
-            fill
+            buttonFill
           >
             <Text fontSize='regular' lineHeight='regular'>
               <FormattedMessage id='/' defaultMessage='Все материалы' />
@@ -51,7 +51,7 @@ export const Courses = () => (
       <Divider weight={1} backgroundColor='divider.lightGray' />
       <Layout flexBasis={[40, 80]} />
       <Box flexDirection={['column', 'row']}>
-        <Box width={[335, 710]} display='inline'>
+        <Box width={[335, 710]} display='inline' flexShrink='0'>
           <Text color='text.indigo' fontSize={['averaged', 'normal']} lineHeight='medium'>
             <FormattedMessage id='/' defaultMessage='Являясь серым кардиналом,' />
           </Text>
@@ -97,7 +97,7 @@ export const Courses = () => (
           </Text>
         </Box>
         <Layout flexBasis={[20, 191]} />
-        <Box width={[335, 559]} display='inline'>
+        <Box width={[335, 559]} display='inline' flexShrink='0'>
           <Text
             fontSize={['averaged', 'normal']}
             display='inline'
@@ -136,7 +136,7 @@ export const Courses = () => (
           iconWidth={32}
           iconHeight={32}
           iconRadius='little'
-          fill
+          buttonFill
         >
           <Text fontSize='middle' lineHeight='regular'>
             <FormattedMessage id='/' defaultMessage='Все материалы' />
@@ -145,5 +145,6 @@ export const Courses = () => (
       </Box>
       <Layout flexBasis={[64, 0]} />
     </Column>
+    <Layout flexBasis={[20, 230]} flexShrink='0' />
   </Row>
 )
diff --git a/landing/fragments/landing-hero/src/about-us/about-us.component.tsx b/landing/fragments/landing-hero/src/about-us/about-us.component.tsx
@@ -11,7 +11,7 @@ import { Row }              from '@ui/layout'
 import { Text }             from '@ui/text'
 
 export const AboutUs = () => (
-  <Column width={[335, 1166]}>
+  <Column width={[335, 1166]} flexShrink='0'>
     <Box>
       <Text fontSize={['large', 'huge']} lineHeight='normal' color='text.white'>
         <FormattedMessage

diff --git a/landing/fragments/landing-hero/src/hero.component.tsx b/landing/fragments/landing-hero/src/hero.component.tsx
@@ -10,23 +10,24 @@ import { SocialLink } from './social-links'
 export const Hero = () => (
   <Box width='100%' flexDirection='column'>
     <Layout flexBasis={[172, 415]} />
-    <Box width='100%' flexDirection={['column', 'row']}>
-      <Layout flexBasis={[0, 230]} />
-      <Box>
+    <Box width='100%' flexDirection={['column', 'row']} justifyContent='center'>
+      <Layout flexBasis={[0, 230]} flexShrink='0' />
+      <Box justifyContent='center'>
         <Layout flexBasis={[20, 0]} flexShrink='0' />
         <AboutUs />
         <Layout flexBasis={[20, 0]} flexShrink='0' />
       </Box>
-      <Layout flexBasis={[24, 394]} />
-      <Box>
+      <Layout flexBasis={[24, 434]} flexShrink='0' />
+      <Box justifyContent='center'>
         <Layout flexBasis={[20, 0]} flexShrink='0' />
         <Column>
           <Layout flexBasis={['none', 297]} flexShrink='0' />
           <SocialLink />
         </Column>
         <Layout flexBasis={[20, 0]} flexShrink='0' />
       </Box>
+      <Layout flexBasis={[0, 40]} flexShrink='0' />
     </Box>
-    <Layout flexBasis={[20, 48]} />
+    <Layout flexBasis={[0, 48]} />
   </Box>
 )
diff --git a/landing/fragments/landing-info/src/info.component.tsx b/landing/fragments/landing-info/src/info.component.tsx
@@ -11,8 +11,8 @@ import { Sphere }           from './sphere'
 
 export const Info = () => (
   <Box width='100%' flexDirection='column'>
-    <Layout flexBasis={[64, 160]} flexShrink='0' />
-    <Box>
+    <Layout flexBasis={[84, 160]} flexShrink='0' />
+    <Box justifyContent='center'>
       <Layout flexBasis={[20, 230]} flexShrink='0' />
       <Column>
         <Box width={['335px', '1460px']} flexShrink='0' display='inline'>

diff --git a/landing/fragments/landing-navigation/src/navigation.component.tsx b/landing/fragments/landing-navigation/src/navigation.component.tsx
@@ -23,69 +23,66 @@ export const Navigation = () => {
       <Drawer active={visible} onClose={() => setVisible(false)} />
       <Column>
         <Layout flexBasis={[20, 35]} />
-        <Row>
+        <Row width='100%' justifyContent='center'>
           <Layout flexBasis={[20, 40]} flexShrink='0' />
-          <Row>
-            <Box width={[40, 56]} flexShrink={0} alignItems='center'>
-              <Logo color='white' />
-            </Box>
-            <Layout flexBasis={[195, 241]} />
-            <Box display={['flex', 'none']} width={100} alignItems='center'>
-              <Button
-                size='wideButtonSmallPaddingMediumHeight'
-                variant='transparentLightBackground'
-                gap={12}
-                iconSVG={<IconArrowDown />}
-                iconWidth={28}
-                iconHeight={28}
-                iconRadius='micro'
-                onClick={() => setVisible(true)}
-                fill
-              >
-                <Text fontSize='medium'>
-                  <FormattedMessage id='/' defaultMessage='Курсы' />
-                </Text>
-              </Button>
-            </Box>
-            <Box display={['none', 'flex']} alignItems='end'>
-              <NavBlock
-                title={intl.formatMessage({ id: '/', defaultMessage: 'Academy' })}
-                link='/'
-              />
-              <Layout flexBasis={20} flexShrink='0' />
-              <NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Курсы' })} link='/' />
-              <Layout flexBasis={20} flexShrink='0' />
-              <NavBlock
-                title={intl.formatMessage({ id: '/', defaultMessage: 'Обучение' })}
-                link='/'
-              />
-              <Layout flexBasis={20} flexShrink='0' />
-              <NavBlock
-                title={intl.formatMessage({ id: '/', defaultMessage: 'Стипендия' })}
-                link='/'
-              />
-              <Layout flexBasis={20} flexShrink='0' />
-              <NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'FAQ' })} link='/' />
-            </Box>
-            <Layout display={['none', 'flex']} flexBasis={310} />
-            <Box display={['none', 'flex']} width={136} alignItems='center'>
-              <Button
-                size='wideButtonSmallPaddingNormalHeight'
-                variant='transparentLightBackground'
-                gap={20}
-                iconSVG={<IconArrowDown />}
-                iconWidth={40}
-                iconHeight={40}
-                iconRadius='normal'
-                onClick={() => setVisible(true)}
-                fill
-              >
-                <Text fontSize='middle' lineHeight='small'>
-                  <FormattedMessage id='/' defaultMessage='Курсы' />
-                </Text>
-              </Button>
-            </Box>
-          </Row>
+          <Box width={[40, 56]} flexShrink={0} alignItems='center'>
+            <Logo color='white' />
+          </Box>
+          <Layout flexBasis={[195, 241]} />
+          <Box display={['flex', 'none']} width={100} alignItems='center' flexShrink='0'>
+            <Button
+              size='wideButtonSmallPaddingMediumHeight'
+              variant='transparentLightBackground'
+              gap='12%'
+              iconSVG={<IconArrowDown />}
+              iconWidth={28}
+              iconHeight={28}
+              iconRadius='micro'
+              onClick={() => setVisible(true)}
+              buttonFill
+            >
+              <Text fontSize='medium'>
+                <FormattedMessage id='/' defaultMessage='Курсы' />
+              </Text>
+            </Button>
+          </Box>
+          <Layout flexBasis={[20, 0]} />
+          <Box display={['none', 'flex']} alignItems='end'>
+            <NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Academy' })} link='/' />
+            <Layout flexBasis={20} flexShrink='0' />
+            <NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'Курсы' })} link='/' />
+            <Layout flexBasis={20} flexShrink='0' />
+            <NavBlock
+              title={intl.formatMessage({ id: '/', defaultMessage: 'Обучение' })}
+              link='/'
+            />
+            <Layout flexBasis={20} flexShrink='0' />
+            <NavBlock
+              title={intl.formatMessage({ id: '/', defaultMessage: 'Стипендия' })}
+              link='/'
+            />
+            <Layout flexBasis={20} flexShrink='0' />
+            <NavBlock title={intl.formatMessage({ id: '/', defaultMessage: 'FAQ' })} link='/' />
+          </Box>
+          <Layout flexBasis={[0, 310]} />
+          <Box display={['none', 'flex']} width={136} alignItems='center' flexShrink='0'>
+            <Button
+              size='wideButtonSmallPaddingNormalHeight'
+              variant='transparentLightBackground'
+              gap='14%'
+              iconSVG={<IconArrowDown />}
+              iconWidth={40}
+              iconHeight={40}
+              iconRadius='normal'
+              onClick={() => setVisible(true)}
+              buttonFill
+            >
+              <Text fontSize='middle' lineHeight='small'>
+                <FormattedMessage id='/' defaultMessage='Курсы' />
+              </Text>
+            </Button>
+          </Box>
+          <Layout flexBasis={[0, 40]} flexShrink='0' />
         </Row>
       </Column>
     </>

diff --git a/landing/fragments/landing-process/package.json b/landing/fragments/landing-process/package.json
@@ -4,6 +4,7 @@
   "main": "src/index.ts",
   "dependencies": {
     "@ui/divider": "workspace:0.0.1",
+    "@ui/image": "workspace:0.0.1",
     "@ui/layout": "workspace:0.0.1",
     "@ui/text": "workspace:0.0.1"
   },

diff --git a/landing/fragments/landing-process/src/process.component.tsx b/landing/fragments/landing-process/src/process.component.tsx
@@ -1,18 +1,20 @@
-import React       from 'react'
-import { useIntl } from 'react-intl'
+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 { Row }     from '@ui/layout'
+import { Divider }    from '@ui/divider'
+import { ImageBlock } from '@ui/image'
+import { Layout }     from '@ui/layout'
+import { Column }     from '@ui/layout'
+import { Row }        from '@ui/layout'
+import { Box }        from '@ui/layout'
 
-import { Items }   from './items'
+import { Items }      from './items'
 
 export const Process = () => {
   const intl = useIntl()
   return (
-    <Row>
-      <Layout flexBasis={[20, 80]} />
+    <Row width='100%' justifyContent='center'>
+      <Layout flexBasis={[20, 80]} flexShrink='0' />
       <Column width={[335, 1760]}>
         <Layout flexBasis={[64, 160]} />
         <Items
@@ -33,6 +35,15 @@ export const Process = () => {
           quantity={intl.formatMessage({ id: '/', defaultMessage: '3' })}
           title={intl.formatMessage({ id: '/', defaultMessage: 'Изучение технологий' })}
         />
+        <Box
+          display={['none', 'flex']}
+          width={400}
+          position='absolute'
+          marginLeft='660px'
+          marginTop='320px'
+        >
+          <ImageBlock src='/sphere-purple.png' />
+        </Box>
         <Layout flexBasis={[28, 48]} />
         <Divider weight={1} backgroundColor='divider.transparent' />
         <Layout flexBasis={[28, 48]} />
@@ -47,8 +58,9 @@ export const Process = () => {
           quantity={intl.formatMessage({ id: '/', defaultMessage: '5' })}
           title={intl.formatMessage({ id: '/', defaultMessage: 'Интеграция в проект' })}
         />
-        <Layout flexBasis={[24, 160]} />
+        <Layout flexBasis={[56, 160]} />
       </Column>
+      <Layout flexBasis={[20, 80]} flexShrink='0' />
     </Row>
   )
 }
diff --git a/landing/fragments/landing-ticker/package.json b/landing/fragments/landing-ticker/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@landing/ticker-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",
+    "@ui/utils": "workspace:0.0.1"
+  },
+  "devDependencies": {
+    "@emotion/react": "11.11.0",
+    "@emotion/styled": "11.11.0",
+    "react": "18.2.0"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-dom": "*"
+  }
+}
diff --git a/landing/fragments/landing-ticker/src/index.ts b/landing/fragments/landing-ticker/src/index.ts
@@ -0,0 +1 @@
+export * from './ticker.component'