Skip to content

Commit

Permalink
add task solution
Browse files Browse the repository at this point in the history
  • Loading branch information
kuzgan committed Aug 21, 2023
1 parent f3b767d commit 8b65b61
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_person/) and add it to the PR description.
- Replace `<your_account>` with your Github username in the [DEMO LINK](https://kuzgan.github.io/react_person/) and add it to the PR description.
26 changes: 10 additions & 16 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import './App.scss';
import { Person } from './components/Person/Person';

export const misha = {
name: 'Misha',
Expand All @@ -25,21 +26,14 @@ export const alex = {

export const App = () => (
<div className="App">
<section className="Person">
<h2 className="Person__name">My name is Misha</h2>
<p className="Person__age">I am 37</p>
<p className="Person__partner">Natasha is my wife</p>
</section>

<section className="Person">
<h2 className="Person__name">My name is Olya</h2>
<p className="Person__partner">Maksym is my husband</p>
</section>

<section className="Person">
<h2 className="Person__name">My name is Alex</h2>
<p className="Person__age">I am 25</p>
<p className="Person__partner">I am not married</p>
</section>
<Person
person={misha}
/>
<Person
person={olya}
/>
<Person
person={alex}
/>
</div>
);
15 changes: 14 additions & 1 deletion src/components/Person/Person.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
// export const Person = ({ person }) => ();
import React from 'react';

export const Person = ({ person }) => {
const partner = person.sex === 'f' ? 'husband' : 'wife';
const isMarriedStatus = person.isMarried ? `${person.partnerName} is my ${partner}` : 'I am not married';

return (
<section className="Person">
<h2 className="Person__name">{`My name is ${person.name}`}</h2>
{person.age && <p className="Person__age">{`I am ${person.age}`}</p>}
<p className="Person__partner">{isMarriedStatus}</p>
</section>
);
};

0 comments on commit 8b65b61

Please sign in to comment.