-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
add task solution #1402
Open
SofiiaPelenska
wants to merge
1
commit into
mate-academy:master
Choose a base branch
from
SofiiaPelenska:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
add task solution #1402
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,104 +1,28 @@ | ||
import './App.scss'; | ||
|
||
// import postsFromServer from './api/posts.json'; | ||
// import commentsFromServer from './api/comments.json'; | ||
// import usersFromServer from './api/users.json'; | ||
import postsFromServer from './api/posts.json'; | ||
import commentsFromServer from './api/comments.json'; | ||
import usersFromServer from './api/users.json'; | ||
import { PostList } from './components/PostList'; | ||
|
||
export const App = () => ( | ||
<section className="App"> | ||
<h1 className="App__title">Static list of posts</h1> | ||
|
||
<div className="PostList"> | ||
<div className="PostInfo"> | ||
<div className="PostInfo__header"> | ||
<h3 className="PostInfo__title">qui est esse</h3> | ||
|
||
<p> | ||
{' Posted by '} | ||
|
||
<a className="UserInfo" href="mailto:[email protected]"> | ||
Leanne Graham | ||
</a> | ||
</p> | ||
</div> | ||
|
||
<p className="PostInfo__body"> | ||
est rerum tempore vitae sequi sint nihil reprehenderit dolor beatae ea | ||
dolores neque fugiat blanditiis voluptate porro vel nihil molestiae ut | ||
reiciendis qui aperiam non debitis possimus qui neque nisi nulla | ||
</p> | ||
|
||
<hr /> | ||
|
||
<b data-cy="NoCommentsMessage">No comments yet</b> | ||
</div> | ||
|
||
<div className="PostInfo"> | ||
<div className="PostInfo__header"> | ||
<h3 className="PostInfo__title">doloremque illum aliquid sunt</h3> | ||
function getUserById(userId) { | ||
return usersFromServer.find(user => user.id === userId) || null; | ||
} | ||
|
||
<p> | ||
{' Posted by '} | ||
function getCommentById(postId) { | ||
return commentsFromServer.filter(comment => comment.postId === postId); | ||
} | ||
|
||
<a className="UserInfo" href="mailto:[email protected]"> | ||
Patricia Lebsack | ||
</a> | ||
</p> | ||
</div> | ||
export const posts = postsFromServer.map(post => ({ | ||
...post, | ||
user: getUserById(post.userId), | ||
comments: getCommentById(post.id), | ||
})); | ||
|
||
<p className="PostInfo__body"> | ||
deserunt eos nobis asperiores et hic est debitis repellat molestiae | ||
optio nihil ratione ut eos beatae quibusdam distinctio maiores earum | ||
voluptates et aut adipisci ea maiores voluptas maxime | ||
</p> | ||
|
||
<div className="CommentList"> | ||
<div className="CommentInfo"> | ||
<div className="CommentInfo__title"> | ||
<strong className="CommentInfo__name">pariatur omnis in</strong> | ||
|
||
{' by '} | ||
|
||
<a | ||
className="CommentInfo__email" | ||
href="mailto:[email protected]" | ||
> | ||
[email protected] | ||
</a> | ||
</div> | ||
|
||
<div className="CommentInfo__body"> | ||
dolorum voluptas laboriosam quisquam ab totam beatae et aut | ||
aliquid optio assumenda voluptas velit itaque quidem voluptatem | ||
tempore cupiditate in itaque sit molestiae minus dolores magni | ||
</div> | ||
</div> | ||
|
||
<div className="CommentInfo"> | ||
<div className="CommentInfo__title"> | ||
<strong className="CommentInfo__name"> | ||
odio adipisci rerum aut animi | ||
</strong> | ||
|
||
{' by '} | ||
|
||
<a | ||
className="CommentInfo__email" | ||
href="mailto:[email protected]" | ||
> | ||
[email protected] | ||
</a> | ||
</div> | ||
export const App = () => ( | ||
<section className="App"> | ||
<h1 className="App__title">Static list of posts</h1> | ||
|
||
<div className="CommentInfo__body"> | ||
quia molestiae reprehenderit quasi aspernatur aut expedita | ||
occaecati aliquam eveniet laudantium omnis quibusdam delectus | ||
saepe quia accusamus maiores nam est cum et ducimus et vero | ||
voluptates excepturi deleniti ratione | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<PostList posts={posts} /> | ||
</section> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,15 @@ | ||
export const CommentInfo = () => <>Put the comment here</>; | ||
export const CommentInfo = ({ comment }) => ( | ||
<div className="CommentInfo"> | ||
<div className="CommentInfo__title"> | ||
<strong className="CommentInfo__name">{comment.name}</strong> | ||
|
||
{' by '} | ||
|
||
<a className="CommentInfo__email" href={`mailto:${comment.email}`}> | ||
{comment.email} | ||
</a> | ||
</div> | ||
|
||
<div className="CommentInfo__body">{comment.body}</div> | ||
</div> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,13 @@ | ||
export const CommentList = () => <>Put the list here</>; | ||
import { CommentInfo } from '../CommentInfo'; | ||
|
||
export const CommentList = ({ comments }) => ( | ||
<div className="CommentList"> | ||
{comments.length > 0 ? ( | ||
comments.map(comment => ( | ||
<CommentInfo key={comment.id} comment={comment} /> | ||
)) | ||
) : ( | ||
<b data-cy="NoCommentsMessage">No comments yet</b> | ||
)} | ||
</div> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,8 @@ | ||
// add styles here | ||
.CommentList { | ||
display: flex; | ||
flex-direction: column; | ||
gap: 0.7em; | ||
background-color: #eee; | ||
padding: 1em; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,18 @@ | ||
export const PostInfo = () => <>Put the post here</>; | ||
import { UserInfo } from '../UserInfo'; | ||
import { CommentList } from '../CommentList'; | ||
|
||
export const PostInfo = ({ post }) => ( | ||
<div className="PostInfo"> | ||
<div className="PostInfo__header"> | ||
<h3 className="PostInfo__title">{post.title}</h3> | ||
|
||
<UserInfo user={post.user} /> | ||
</div> | ||
|
||
<p className="PostInfo__body">{post.body}</p> | ||
|
||
<hr /> | ||
|
||
<CommentList comments={post.comments} /> | ||
</div> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,16 @@ | ||
// add styles here | ||
.PostInfo { | ||
margin: 10px auto; | ||
width: 90%; | ||
border: 1px solid #000; | ||
border-radius: 8px; | ||
background-color: lightgray; | ||
padding: 1em; | ||
|
||
&__title { | ||
margin: 0; | ||
} | ||
|
||
&__header { | ||
margin-bottom: 1em; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,9 @@ | ||
export const PostList = () => <>Put the list here</>; | ||
import { PostInfo } from '../PostInfo'; | ||
|
||
export const PostList = ({ posts }) => ( | ||
<div className="PostList"> | ||
{posts.map(post => ( | ||
<PostInfo key={post.id} post={post} /> | ||
))} | ||
</div> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,9 @@ | ||
export const UserInfo = () => <>Put the user here</>; | ||
export const UserInfo = ({ user }) => ( | ||
<p> | ||
{' Posted by '} | ||
|
||
<a className="UserInfo" href={`mailto:${user.email}`}> | ||
{user.name} | ||
</a> | ||
</p> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
// add styles here | ||
.UserInfo { | ||
font-weight: bold; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The function
getCommentById
might be misleadingly named, as it returns all comments for a given post ID, not a single comment by its ID. Consider renaming it to something likegetCommentsByPostId
to better reflect its functionality.