-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
finish solution #1619
base: master
Are you sure you want to change the base?
finish solution #1619
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1 +1,28 @@ | ||||||||
// export const Person = ({ person }) => (); | ||||||||
import './Person.scss'; | ||||||||
|
||||||||
const MALE_GENDER = 'm'; | ||||||||
|
||||||||
export const Person = (props) => { | ||||||||
const { name, age, sex, isMarried, partnerName } = props.person; | ||||||||
let partner = `I am not married`; | ||||||||
|
||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not clear why not marriage info string is stored in |
||||||||
if (isMarried) { | ||||||||
partner = sex === MALE_GENDER | ||||||||
? `${partnerName} is my wife` | ||||||||
: `${partnerName} is my husband`; | ||||||||
} | ||||||||
|
||||||||
return ( | ||||||||
<section className="Person"> | ||||||||
<h2 className="Person__name"> | ||||||||
{`My name is ${name}`} | ||||||||
</h2> | ||||||||
{age | ||||||||
? <p className="Person__age">{`I am ${age}`}</p> | ||||||||
: null } | ||||||||
<p className="Person__partner"> | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's redundant to use |
||||||||
{partner} | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
</p> | ||||||||
</section> | ||||||||
); | ||||||||
}; |
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; | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can use destructuring for props. Also pay attention to good formatting