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

Jump to bottom

Develop #1509

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

Develop #1509

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a142dbd
add person
dubyuliia Jul 27, 2023
9032e2c
add react person
dubyuliia Jul 27, 2023
367c0e1
fix person
dubyuliia Jul 27, 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
42 changes: 4 additions & 38 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,11 @@
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 { alex, misha, olya, 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={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;
}
}
49 changes: 48 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,48 @@
// export const Person = ({ person }) => ();
import './Person.scss';

export const Person = ({ person }) => (
<section className="Person">
<h2 className="Person__name">
{`My name is ${person.name}`}
</h2>
<p className="Person__age">
{person.age && (
<p>{`I am ${person.age}`}</p>
)}
</p>
<p className="Person__partner">
{!person.isMarried ? (
<p>I am not married</p>
) : (
<p>
{`${person.partnerName} is my ${person.sex === 'm'
? 'wife'
: 'husband'
}`}
</p>
Copy link

Choose a reason for hiding this comment

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

Consider moving this logic into a function. The double ternary operator affects the readability and maintainability of your code

)}
</p>
</section>
);

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

export const alex = {
name: 'Alex',
age: 25,
sex: 'm',
isMarried: false,
};

export const olya = {
name: 'Olya',
sex: 'f',
isMarried: true,
partnerName: 'Maksym',
};
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;
}
}
Loading