Skip to content

Commit

Permalink
merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Пётр Безденежных authored and Пётр Безденежных committed Jan 21, 2024
2 parents 07af20d + bf827f5 commit 50edf57
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 69 deletions.
55 changes: 31 additions & 24 deletions src/app/education/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,42 @@
'use client';

import { Flex, Text, Box, Link } from '@chakra-ui/react';
import NextLink from 'next/link';
import Image from 'next/image';
import { Flex, VStack, HStack, Box, Text } from '@chakra-ui/react';

import Footer from '../footer';
import { HoveredStyledLink } from '../footer-link';
import Header from '../header';
import Image from 'next/image';

export default function Home() {
return (
<Flex direction="column">
<Header/>
<Flex direction="column" align="center" p="1.5rem">
<Image src="Group_72.jpg" width="200" height="200" alt="logo" />
</Flex>
<Flex direction="row" mb="1.5rem" justify="center">
<Flex direction="column">
<Box p="1rem">
<Box sx={{width: 100, height:'100px', background: 'black'}}></Box>
</Box>
</Flex>
<Flex direction="column">
<Box p="1rem" sx={{ borderLeft: '1px solid black' }}>
<Link as={NextLink} title="" href=""><Text>Образование</Text></Link>
<Link as={NextLink} title="" href=""><Text>Поступление</Text></Link>
<Link as={NextLink} title="" href=""><Text>Проекты</Text></Link>
<Link as={NextLink} title="" href=""><Text>О Школе</Text></Link>
<Link as={NextLink} title="" href=""><Text>Контакты</Text></Link>
</Box>
</Flex>
</Flex>
<Header page="Коммерческое образование"/>
<VStack align="center" p="1.5rem">
<Box borderWidth='2px' borderRadius='lg' w='70%' p={4}>
<Flex direction="row">
<Flex direction="column">
<HStack mb="1rem" spacing="1rem" sx={{flexWrap: 'wrap'}}>
<HoveredStyledLink url="#" text="#нейросети" />
<HoveredStyledLink url="#" text="#дизайн" />
<HoveredStyledLink url="#" text="#стиль" />
<HoveredStyledLink url="#" text="мода" />
<HoveredStyledLink url="#" text="дизайнер" />
<HoveredStyledLink url="#" text="стилист" />
</HStack>
<Text textStyle="h4">Курс: Нейросети для дизайнеров и стилистов (3 месяца)</Text>
<VStack align="left" p="1.5rem">
<Text>Уровень: ИИ и нейросети, 1 ступень</Text>
<Text>Профессия: контент менеджер, промпт инженер</Text>
<Text>Документ: удостоверение о повышении квалификации</Text>
</VStack>
</Flex>
<Flex direction="column">
<Image src="Group_72.jpg" width='100' height="100" alt="logo" />
</Flex>
</Flex>
</Box>
</VStack>
<Footer/>
</Flex>
)
}
}
17 changes: 16 additions & 1 deletion src/app/footer-link.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,19 @@ export const StyledLink = ({text, href="#", textStyles = 'footerText', textProps
{...linkProps}>
<Text textStyle={textStyles} {...textProps}>{text}</Text>
</Link>;
};
};

export const HoveredStyledLink = ({text, href}:{text: string; href: string}) => {
return (<StyledLink
text={text}
href={href}
textProps={{
sx: {
textDecoration: 'underline',
_hover: {
textDecoration: 'none',
color: 'rgb(87,143,163)'
}
}
}}/>)
}
72 changes: 29 additions & 43 deletions src/app/footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Box, Flex, HStack, ListItem, Stack, Text, UnorderedList, useMediaQuery
import { PiTelegramLogoThin, PiWhatsappLogoThin, PiYoutubeLogoThin } from "react-icons/pi";
import { SlSocialVkontakte } from "react-icons/sl";
import { SocialButton } from "./buttons/social-button";
import { StyledLink } from './footer-link';
import { StyledLink, HoveredStyledLink } from './footer-link';
import { IconProvider } from "./icon-provider";
import { SocialIcon } from './buttons/social-icon';

Expand All @@ -15,20 +15,6 @@ const TextTitle = ({text, textStyles = 'footerTitle', textProps }:{text: string;
return <Text textStyle={textStyles} {...textProps}>{text}</Text>
}

const HoveredStyledLink = ({text}:{text: string}) => {
return (<StyledLink
textProps={{
sx: {
textDecoration: 'underline',
_hover: {
textDecoration: 'none',
color: 'rgb(87,143,163)'
}
}
}}
href="/network-educational-programs" text={text} />)
}

export default function Footer(props: any) {
const [isMax959] = useMediaQuery('(max-width: 959px)')
const [isMax628] = useMediaQuery('(max-width: 628px)')
Expand Down Expand Up @@ -280,34 +266,34 @@ export default function Footer(props: any) {
</Flex>
<HStack mb="1rem" spacing="0.4rem" sx={{flexWrap: 'wrap'}}>
<Text sx={{textTransform: 'uppercase', color: 'black'}}>ТЕГИ</Text>
<HoveredStyledLink text="#аналитик" />
<HoveredStyledLink text="#бесплатные" />
<HoveredStyledLink text="#бизнес" />
<HoveredStyledLink text="#бренд" />
<HoveredStyledLink text="#город" />
<HoveredStyledLink text="#графический" />
<HoveredStyledLink text="#дизайн" />
<HoveredStyledLink text="#дизайнер" />
<HoveredStyledLink text="#дом" />
<HoveredStyledLink text="#имидж" />
<HoveredStyledLink text="#имиджмейкер" />
<HoveredStyledLink text="#индустрия" />
<HoveredStyledLink text="#интеллект" />
<HoveredStyledLink text="#интерьер" />
<HoveredStyledLink text="#контент" />
<HoveredStyledLink text="#личный" />
<HoveredStyledLink text="#менеджер" />
<HoveredStyledLink text="#мода" />
<HoveredStyledLink text="#модные" />
<HoveredStyledLink text="#нейросети" />
<HoveredStyledLink text="#одежда" />
<HoveredStyledLink text="#продукт" />
<HoveredStyledLink text="#профессия" />
<HoveredStyledLink text="#репутация" />
<HoveredStyledLink text="#среда" />
<HoveredStyledLink text="#стилист" />
<HoveredStyledLink text="#стиль" />
<HoveredStyledLink text="#управление" />
<HoveredStyledLink href="#" text="#аналитик" />
<HoveredStyledLink href="#" text="#бесплатные" />
<HoveredStyledLink href="#" text="#бизнес" />
<HoveredStyledLink href="#" text="#бренд" />
<HoveredStyledLink href="#" text="#город" />
<HoveredStyledLink href="#" text="#графический" />
<HoveredStyledLink href="#" text="#дизайн" />
<HoveredStyledLink href="#" text="#дизайнер" />
<HoveredStyledLink href="#" text="#дом" />
<HoveredStyledLink href="#" text="#имидж" />
<HoveredStyledLink href="#" text="#имиджмейкер" />
<HoveredStyledLink href="#" text="#индустрия" />
<HoveredStyledLink href="#" text="#интеллект" />
<HoveredStyledLink href="#" text="#интерьер" />
<HoveredStyledLink href="#" text="#контент" />
<HoveredStyledLink href="#" text="#личный" />
<HoveredStyledLink href="#" text="#менеджер" />
<HoveredStyledLink href="#" text="#мода" />
<HoveredStyledLink href="#" text="#модные" />
<HoveredStyledLink href="#" text="#нейросети" />
<HoveredStyledLink href="#" text="#одежда" />
<HoveredStyledLink href="#" text="#продукт" />
<HoveredStyledLink href="#" text="#профессия" />
<HoveredStyledLink href="#" text="#репутация" />
<HoveredStyledLink href="#" text="#среда" />
<HoveredStyledLink href="#" text="#стилист" />
<HoveredStyledLink href="#" text="#стиль" />
<HoveredStyledLink href="#" text="#управление" />
</HStack>
<Box w="100%">
<Text textStyle="footerText" align="center">&copy;&emsp;ВШСДТ 2011-2021 Российское академическое онлайн
Expand Down
2 changes: 1 addition & 1 deletion src/app/header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Header(props: any) {
<Flex direction="row" align="center" height="35" bg="#F9F9F9" color="black">
<HamburgerIcon w={10} h={10} p="0.5rem"/>
<Text>меню</Text>
<Text m="auto">{props?.name ? 'ВШСДТ • ' + props?.name : 'ВШСДТ'}</Text>
<Text m="auto">{props?.page ? 'ВШСДТ • ' + props?.page : 'ВШСДТ'}</Text>
<LockIcon w={10} h={10} p="0.5rem"/>
</Flex>
)
Expand Down

0 comments on commit 50edf57

Please sign in to comment.