diff --git a/README.md b/README.md index 3424ccb86..3f65b12f7 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://Wesses.github.io/react_person/) and add it to the PR description. diff --git a/src/App.jsx b/src/App.jsx index dcf8509c8..c09fddf21 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/App.scss b/src/App.scss index 223ec3872..c17d529f4 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,20 +1,3 @@ iframe { display: none; } - -.Person { - width: fit-content; - margin-bottom: 16px; - padding: 8px; - border: 1px solid #000; - border-radius: 8px; - - &__name { - margin-top: 8px; - } - - &__age { - color: #00f; - font-weight: bold; - } -} diff --git a/src/components/Person/Person.jsx b/src/components/Person/Person.jsx index eccf156a3..e63dbe407 100644 --- a/src/components/Person/Person.jsx +++ b/src/components/Person/Person.jsx @@ -1 +1,32 @@ -// export const Person = ({ person }) => (); +import './Person.scss'; + +const SEX_FEMALE = 'f'; + +const getPartnerStatus = sex => (sex === SEX_FEMALE ? 'husband' : 'wife'); + +export const Person = ({ person }) => { + const { + name, + sex, + age, + isMarried, + partnerName, + } = person; + + return ( +
+

{`My name is ${name}`}

+ + {!!age && ( +

+ {`I am ${age}`} +

+ )} + + { isMarried + ? (

{`${partnerName} is my ${getPartnerStatus(sex)}`}

) + : (

I am not married

) + } +
+ ); +}; diff --git a/src/components/Person/Person.scss b/src/components/Person/Person.scss new file mode 100644 index 000000000..295d86200 --- /dev/null +++ b/src/components/Person/Person.scss @@ -0,0 +1,16 @@ +.Person { + width: fit-content; + margin-bottom: 16px; + padding: 8px; + border: 1px solid #000; + border-radius: 8px; + + &__name { + margin-top: 8px; + } + + &__age { + color: #00f; + font-weight: bold; + } +}