Merge pull request #578 from Studio-Yandex-Practicum/bugfix-project-d…

…escription Bugfix project description
Studio-Yandex-Practicum · Sep 8, 2024 · 1a21723 · 1a21723
2 parents 65ea086 + d761557
commit 1a21723
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/__generated__/api-typings/models/Project.ts b/src/__generated__/api-typings/models/Project.ts
diff --git a/src/components/project-layout/description/project-layout-description.tsx b/src/components/project-layout/description/project-layout-description.tsx
@@ -5,21 +5,22 @@ import { ProjectLayoutStorey } from '../storey';
 import styles from './project-layout-description.module.css';
 
 interface IProjectLayoutDescriptionProps {
-  children: string
+  descriptionCaption: string
+  description: string
 }
 
 const cx = classNames.bind(styles);
 
-export const ProjectLayoutDescription = ({ children }: IProjectLayoutDescriptionProps): JSX.Element => {
+export const ProjectLayoutDescription = ({ descriptionCaption, description }: IProjectLayoutDescriptionProps): JSX.Element => {
 
   return (
     <ProjectLayoutStorey type="description">
       <section>
         <h2 className={cx('title')}>
-          О проекте
+          {descriptionCaption}
         </h2>
         <p className={cx('text')}>
-          {children}
+          {description}
         </p>
       </section>
     </ProjectLayoutStorey>

diff --git a/src/core/project/types.ts b/src/core/project/types.ts
@@ -10,6 +10,7 @@ export type Project = {
 export type ProjectDetailed = {
   title: string
   intro: string
+  descriptionCaption: string
   description: string
   image: string
   contents: BaseContent[]

diff --git a/src/pages/projects/[id].tsx b/src/pages/projects/[id].tsx
@@ -16,6 +16,7 @@ const Project = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
   const {
     title,
     intro,
+    descriptionCaption,
     description,
     image,
     contents,
@@ -39,9 +40,7 @@ const Project = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
           intro={intro}
           image={image}
         />
-        <ProjectLayout.Description>
-          {description}
-        </ProjectLayout.Description>
+        <ProjectLayout.Description {...{ descriptionCaption, description }}/>
         <ConstructorContent
           variant="project"
           // @ts-expect-error: TODO: В документации API нет описания ответов с блоками конструктора

diff --git a/src/services/api/projects.ts b/src/services/api/projects.ts
@@ -25,6 +25,7 @@ function mapDTOtoProjectDetailed(dto: ProjectDTO): ProjectDetailed {
     title: dto.title,
     intro: dto.intro,
     description: dto.description,
+    descriptionCaption: dto.description_caption,
     image: dto.image,
     contents: dto.contents,
   };