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
13 changes: 7 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@cypress/react18": "^2.0.1",
"@mate-academy/scripts": "^1.9.12",
"@mate-academy/scripts": "^2.1.3",
"@mate-academy/stylelint-config": "*",
"@vitejs/plugin-react": "^4.3.1",
"cypress": "^13.13.0",
Expand Down
64 changes: 26 additions & 38 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@
import React from 'react';
import './App.scss';

export const misha = {
name: 'Misha',
age: 37,
sex: 'm',
isMarried: true,
partnerName: 'Natasha',
};

export const olya = {
name: 'Olya',
sex: 'f',
isMarried: true,
partnerName: 'Maksym',
};

export const alex = {
name: 'Alex',
age: 25,
sex: 'm',
isMarried: false,
};
import { Person } from './components/Person/Person';

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={{
name: 'Misha',
age: 37,
sex: 'm',
isMarried: true,
partnerName: 'Natasha',
}}
/>
<Person
person={{
name: 'Olya',
sex: 'f',
isMarried: true,
partnerName: 'Maksym',
}}
/>
<Person
person={{
name: 'Alex',
age: 25,
sex: 'm',
isMarried: false,
}}
/>
</div>
);
18 changes: 17 additions & 1 deletion src/components/Person/Person.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
// export const Person = ({ person }) => ();
export const Person = ({
person: { name, age = 0, isMarried, sex, partnerName },
}) => (
<section className="Person">
<h2 className="Person__name">{`My name is ${name}`}</h2>

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

{isMarried ? (
<p className="Person__partner">
{`${partnerName} is my ${sex === 'm' ? 'wife' : 'husband'}`}

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 - create separate variable for the condition. The nested ternary sex === 'm' ? 'wife' : 'husband' is used directly in JSX. Consider creating a separate variable like const partnerLabel = sex === 'm' ? 'wife' : 'husband'; before the return statement and using it in the JSX instead.

</p>
) : (
<p className="Person__partner">I am not married</p>
)}
</section>
);
Loading