Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solution #1511

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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://reseneweb.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>
);
26 changes: 25 additions & 1 deletion src/components/Person/Person.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
// export const Person = ({ person }) => ();
export const Person = ({ person }) => (
<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">
{(() => {
if (person.isMarried) {
return person.sex === 'm'
? `${person.partnerName} is my wife`
: `${person.partnerName} is my husband`;
}

return 'I am not married';
})()}
</p>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid ternary nesting (even if you used if instead of one). Move this expression (person.sex === 'm'
? ${person.partnerName} is my wife
: ${person.partnerName} is my husband;) to variable, and then use interpolation

Suggested change
{(() => {
if (person.isMarried) {
return person.sex === 'm'
? `${person.partnerName} is my wife`
: `${person.partnerName} is my husband`;
}
return 'I am not married';
})()}
{person.isMarried ? yourAwesomeVariableName : 'I am not married'}

</section>
);
Loading