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

add task solution #1616

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
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
18 changes: 4 additions & 14 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,10 @@ 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>
<Person person={misha} />

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

<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={alex} />
</div>
);
17 changes: 0 additions & 17 deletions src/App.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
45 changes: 44 additions & 1 deletion src/components/Person/Person.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,44 @@
// export const Person = ({ person }) => ();
import './Person.scss';

export const Person = ({ person }) => {
const WOMAN_GENDER = 'f';
const MAN_GENDER = 'm';

Choose a reason for hiding this comment

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

Such constants are better defined outside the component.

const {
name,
age,
isMarried,
sex,
partnerName,
} = person;

function getMarriedInfo() {
if (sex === MAN_GENDER && isMarried) {

Choose a reason for hiding this comment

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

Such a function can also be taken outside the component definition.

return <>{`${partnerName} is my wife`}</>;
}

Choose a reason for hiding this comment

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

Do we really need to wrap everything in a fragment here?


if (sex === WOMAN_GENDER && isMarried) {
return <>{`${partnerName} is my husband`}</>;
}

Choose a reason for hiding this comment

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

Do we really need to wrap everything in a fragment here?


return <>I am not married</>;
}

Choose a reason for hiding this comment

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

Do we really need to wrap everything in a fragment here?


return (
<section className="Person">
<h2 className="Person__name">{`My name is ${name}`}</h2>

<>
{age && (

Choose a reason for hiding this comment

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

Do we really need to wrap everything in a fragment here?

<p className="Person__age">
{`I am ${age}`}
</p>
)}
</>

<p className="Person__partner">
{getMarriedInfo()}
</p>
</section>
);
};
16 changes: 16 additions & 0 deletions src/components/Person/Person.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
Loading