Skip to content

Commit

Permalink
build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Пётр Безденежных authored and Пётр Безденежных committed Feb 7, 2024
1 parent 0a678b4 commit 9c57901
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
12 changes: 7 additions & 5 deletions src/app/course/components/list-items.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,28 @@ export const UnorderList = memo(({children, props}:{children: any; [key: string]
)
})

export const PointList = (props) => {
export const PointList = (props: {
type: string;
content: any; isMax959:boolean }) => {
const { type, content, isMax959 } = props;
return type === 'column' ?
<UnorderList>
{content?.length ? content.map((item, i) => (<ListItem key={i}>
{content.map ? content.map((item:string, i:number) => (<ListItem key={i}>
<Text key={i} textStyle="Regular16">
{item}
{`${item}`}
</Text>
</ListItem>)) : null}
</UnorderList>
: <Flex direction={isMax959 ? "column" : "row"} mb="md">
<Flex direction="column" alignItems="flex-start" justify="flex-start" w={isMax959 ? '100%' : '50%'} mr={isMax959 ? 0 : '2rem'}>
{content?.['1column'] ? content?.['1column'].map((item, i) =>
{content?.['1column'] ? content?.['1column'].map((item:any, i:number) =>
<Stack direction={!isMax959 ? 'row' : 'column'} key={i} spacing={isMax959 ? '0.5rem' : '1rem'} mb="xs">
{ item['1part'] ? <Text textStyle="Bold16">{item['1part']}</Text> : null }
{ item['2part'] ? <TextDescription mb={0} text={item['2part']} /> : null }
</Stack> ) : null}
</Flex>
<Flex direction="column" alignItems="flex-start" justify="flex-start" w={isMax959 ? '100%' : '50%'}>
{content?.['2column'] ? content?.['2column'].map((item, i) =>
{content?.['2column'] ? content?.['2column'].map((item:any, i:number) =>
<Stack direction={!isMax959 ? 'row' : 'column'} key={i} spacing={isMax959 ? '0.5rem' : '1rem'} mb="xs">
{ item['1part'] ? <Text textStyle="Bold16">{item['1part']}</Text> : null }
{ item['2part'] ? <TextDescription mb={0} text={item['2part']} /> : null }
Expand Down
14 changes: 7 additions & 7 deletions src/app/course/course-grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const CourseGrid = memo(function CourseGrid(props: any) {
const [isMax667] = useMediaQuery('(max-width: 628px)');
const [isMax959] = useMediaQuery('(max-width: 959px)')
const {
title1, title2, description, details,
title, title2, description, details,
tags, startDate, duration, points } = props;
return (<>
<Flex direction="column" w="100%" p={isMax959 ? '1rem 2rem' : "3rem 6rem"}>
Expand All @@ -23,19 +23,19 @@ export const CourseGrid = memo(function CourseGrid(props: any) {
</Box> : null }

<VStack align="flex-start" w="calc(100% - 2rem)" >
<Text as="h1" textStyle="h1">{title1}</Text>
<Text as="h1" textStyle="h1">{title}</Text>
<Text as="h2" textStyle="h2" mb="xs">{title2}</Text>
<TextDescription
mb={0}
text={description}
/>
<HStack spacing={isMax959 ? "0.5rem" : "1.5rem"} mb={isMax959 ? 'md' : undefined}>
{tags.map((tag, i) => (
{tags.map((tag: {id: string; text: string}, i: number) => (
<HoveredStyledLink key={i} text={tag.text} href={`#${tag.id}`} />
))}
</HStack>
{
details && details.length ? details.map((text, i) =>
details && details.length ? details.map((text: string, i: number) =>
<TextDescription
key={i}
mb={0}
Expand Down Expand Up @@ -72,7 +72,7 @@ export const CourseGrid = memo(function CourseGrid(props: any) {
// здесь расположить картинку
</Box>

{ points && points.length ? points.map((point, i) => <Box key={i}>
{ points && points.length ? points.map((point: any, i:number) => <Box key={i}>
<Flex direction="column" w="100%" p={isMax959 ? '1rem 2rem' : "3rem 6rem"}>
<RedSquareTitle id={point.id} displayRed={ !isMax667 ? true : false }>
<Flex direction="column" align="flex-start">
Expand All @@ -82,7 +82,7 @@ export const CourseGrid = memo(function CourseGrid(props: any) {
</RedSquareTitle>
<TextContainer>
{
point.content && point.content.length ? point.content.map((item, i) =>
point.content && point.content.length ? point.content.map((item: {mb: string; text: string}, i: number) =>
<TextDescription
key={i}
mb={item.mb}
Expand All @@ -105,7 +105,7 @@ export const CourseGrid = memo(function CourseGrid(props: any) {
</Box> : null
}
{
point.details && point.details.length ? point.details.map((detail, i) =>
point.details && point.details.length ? point.details.map((detail: string, i: number) =>
<TextDescription
key={i}
text={detail}
Expand Down
2 changes: 1 addition & 1 deletion src/app/education/style-consultant/course-data.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"startDate": "20 февраля 2024г",
"title1": "Консультант по стилю",
"title": "Консультант по стилю",
"title2": "Быстрый старт",
"description": "В этом курсе мы собрали самые нужные знания, чтобы вы могли учиться с нуля, в любом возрасте, в любом городе, получая нужный результат: для себя, для карьеры дипломированного стилиста, для бизнеса.",
"duration": "2 месяца",
Expand Down

0 comments on commit 9c57901

Please sign in to comment.