Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ and use it 3 times inside the `App` instead of static markup.
- Install Prettier Extension 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://galina-palyukh.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>
);
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;
}
}
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 './Person.scss';

export const Person = ({ person }) => (
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This violates checklist item #1: Use destructuring for getting access to values of props object. The person object's properties (name, age, sex, isMarried, partnerName) should be destructured instead of accessing them via person.propertyName.

<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">
{person.isMarried
? `${person.partnerName} is my ${person.sex === 'm' ? 'wife' : 'husband'}`
Comment on lines +8 to +10
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This violates checklist item #3: Avoid putting several cases to conditional rendering. The nested ternary person.sex === 'm' ? 'wife' : 'husband' should be extracted to a separate variable before the return statement.

: 'I am not married'}
</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 {
font-weight: bold;
color: #00f;
}
}
Loading