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.

Sign up for GitHub

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

React props task 2 #1770

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

React props task 2 #1770

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c49d62
React props task 2
ElenaGrasovskaya Oct 7, 2023
401987f
Fixing line templates
ElenaGrasovskaya Oct 7, 2023
a8bc2a0
Added DEMO LINK
ElenaGrasovskaya Oct 9, 2023
0355a2c
Style improvements
ElenaGrasovskaya Oct 10, 2023
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
26 changes: 7 additions & 19 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import React from 'react';
import './App.scss';
import { Person } from './components/Person/Person';

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

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

export const alex = {
const alex = {
name: 'Alex',
age: 25,
sex: 'm',
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
View file
Open in desktop
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;
}
}
16 changes: 15 additions & 1 deletion src/components/Person/Person.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
// export const Person = ({ person }) => ();
import './Person.scss';

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>}
Copy link

Choose a reason for hiding this comment

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

Suggested change
<section className="Person">
<h2 className="Person__name">{`My name is ${person.name}`}</h2>
{person.age && <p className="Person__age">{`I am ${person.age}`}</p>}
<section className="Person">
<h2 className="Person__name">
{`My name is ${person.name}`}
</h2>
{person.age && (
<p className="Person__age">
{`I am ${person.age}`}
</p>
}

Fix formatting for better readability

Copy link
Author

Choose a reason for hiding this comment

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

Fixed that

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

Choose a reason for hiding this comment

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

Avoid nesting ternary operators. Let's create a variable for wife/husband
image

Copy link
Author

Choose a reason for hiding this comment

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

created isMale boolean variable

</p>
) : (
<p className="Person__partner">I am not married</p>
)}
</section>
);
16 changes: 16 additions & 0 deletions src/components/Person/Person.scss
View file
Open in desktop
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;
}
}