Skip to content

Commit

Permalink
solution
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreaTkachuk committed Dec 6, 2024
1 parent 7b51afd commit c29b4d5
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 @@ -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 `<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://AndreaTkachuk.github.io/react_person/) and add it to the PR description.
20 changes: 4 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,8 @@ 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>
);
21 changes: 20 additions & 1 deletion src/components/Person/Person.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
// export const Person = ({ person }) => ();
export const Person = ({ person }) => {
const { name, age, partnerName, isMarried, sex } = person;
let partner = <p className="Person__partner">{partnerName} is my husband</p>;

if (sex === 'm') {
partner = <p className="Person__partner">{partnerName} is my wife</p>;
}

return (
<section className="Person">
<h2 className="Person__name">My name is {name}</h2>
{age && <p className="Person__age">I am {age}</p>}
{isMarried ? (
partner
) : (
<p className="Person__partner">I am not married</p>
)}
</section>
);
};

0 comments on commit c29b4d5

Please sign in to comment.