From c29b4d57a4a92a05bfe5187f76f6432be856651c Mon Sep 17 00:00:00 2001 From: Andrii Tkachuk Date: Fri, 6 Dec 2024 10:29:29 +0100 Subject: [PATCH] solution --- README.md | 2 +- src/App.jsx | 20 ++++---------------- src/components/Person/Person.jsx | 21 ++++++++++++++++++++- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 009a2977c..731ae6f78 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ and use it 3 times inside the `App` instead of static markup. - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline). - Open one more terminal and run tests with `npm test` to ensure your solution is correct. -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_person/) and add it to the PR description. +- Replace `` with your Github username in the [DEMO LINK](https://AndreaTkachuk.github.io/react_person/) and add it to the PR description. diff --git a/src/App.jsx b/src/App.jsx index dcf8509c8..43c3e3c8e 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,5 +1,6 @@ import React from 'react'; import './App.scss'; +import { Person } from './components/Person/Person'; export const misha = { name: 'Misha', @@ -25,21 +26,8 @@ export const alex = { export const App = () => (
-
-

My name is Misha

-

I am 37

-

Natasha is my wife

-
- -
-

My name is Olya

-

Maksym is my husband

-
- -
-

My name is Alex

-

I am 25

-

I am not married

-
+ + +
); diff --git a/src/components/Person/Person.jsx b/src/components/Person/Person.jsx index eccf156a3..466e19b56 100644 --- a/src/components/Person/Person.jsx +++ b/src/components/Person/Person.jsx @@ -1 +1,20 @@ -// export const Person = ({ person }) => (); +export const Person = ({ person }) => { + const { name, age, partnerName, isMarried, sex } = person; + let partner =

{partnerName} is my husband

; + + if (sex === 'm') { + partner =

{partnerName} is my wife

; + } + + return ( +
+

My name is {name}

+ {age &&

I am {age}

} + {isMarried ? ( + partner + ) : ( +

I am not married

+ )} +
+ ); +};