From a186679f87240a447fb8676c7d8d16d65aa91d59 Mon Sep 17 00:00:00 2001 From: Bohdan Shumylo Date: Tue, 15 Aug 2023 22:30:59 +0300 Subject: [PATCH] Solution --- README.md | 2 +- src/App.jsx | 20 ++++---------------- src/components/Person/Person.jsx | 23 ++++++++++++++++++++++- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 3424ccb86..eae2a3ef0 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ and use it 3 times inside the `App` instead of static markup. ## Instructions - 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://92BS.github.io/react_person/) and add it to the PR description. diff --git a/src/App.jsx b/src/App.jsx index dcf8509c8..a99bec98d 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..d5a30e997 100644 --- a/src/components/Person/Person.jsx +++ b/src/components/Person/Person.jsx @@ -1 +1,22 @@ -// export const Person = ({ person }) => (); +export const Person = ({ person }) => ( +
+

+ My name is + {' '} + {person.name} +

+ {person.age && ( +

+ I am + {' '} + {person.age} +

+ )} +

+ {person.isMarried + ? `${person.partnerName} is my ${person.sex === 'f' + ? 'husband' : 'wife'}` + : `I am not married`} +

+
+);