-
Notifications
You must be signed in to change notification settings - Fork 1.8k
develop #2039
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
Open
Wiolip
wants to merge
3
commits into
mate-academy:master
Choose a base branch
from
Wiolip: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
develop #2039
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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,106 +1,36 @@ | ||
| import React from 'react'; | ||
|
|
||
| import './App.scss'; | ||
| import { type Comment } from './types/Comment'; | ||
| import { type User } from './types/User'; | ||
| import { PostList } from './components/PostList'; | ||
|
|
||
| // import postsFromServer from './api/posts'; | ||
| // import commentsFromServer from './api/comments'; | ||
| // import usersFromServer from './api/users'; | ||
|
|
||
| export const App: React.FC = () => ( | ||
| <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:Sincere@april.biz"> | ||
| 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 /> | ||
| import postsFromServer from './api/posts'; | ||
| import commentsFromServer from './api/comments'; | ||
| import usersFromServer from './api/users'; | ||
|
|
||
| <b data-cy="NoCommentsMessage">No comments yet</b> | ||
| </div> | ||
| function getUserById(userId: number): User | undefined { | ||
| return usersFromServer.find(user => user.id === userId); | ||
| } | ||
|
|
||
| <div className="PostInfo"> | ||
| <div className="PostInfo__header"> | ||
| <h3 className="PostInfo__title">doloremque illum aliquid sunt</h3> | ||
| function getCommentsByPostId(postId: number): Comment[] { | ||
| return commentsFromServer.filter(comment => comment.postId === postId); | ||
| } | ||
|
|
||
| <p> | ||
| {' Posted by '} | ||
| export const posts = postsFromServer.map(post => { | ||
| const user = getUserById(post.userId); | ||
| const comments = getCommentsByPostId(post.id); | ||
|
|
||
| <a className="UserInfo" href="mailto:Julianne.OConner@kory.org"> | ||
| Patricia Lebsack | ||
| </a> | ||
| </p> | ||
| </div> | ||
| return { | ||
| ...post, | ||
| user, | ||
| comments, | ||
| }; | ||
| }); | ||
|
|
||
| <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:Telly_Lynch@karl.co.uk" | ||
| > | ||
| Telly_Lynch@karl.co.uk | ||
| </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:Nikita@garfield.biz" | ||
| > | ||
| Nikita@garfield.biz | ||
| </a> | ||
| </div> | ||
| export const App: React.FC = () => ( | ||
| <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 hidden or 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,3 +1,20 @@ | ||
| import React from 'react'; | ||
| import { type Comment } from '../../types/Comment'; | ||
| import './CommentInfo.css'; | ||
|
|
||
| export const CommentInfo: React.FC = () => <>Put the comment here</>; | ||
| type Props = { | ||
| comment: Comment; | ||
| }; | ||
|
|
||
| export const CommentInfo: React.FC<Props> = ({ 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 hidden or 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,7 @@ | ||
| // add styles here | ||
| .CommentList { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 0.7em; | ||
| background-color: #eee; | ||
| padding: 1em; | ||
| } |
This file contains hidden or 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,3 +1,18 @@ | ||
| import React from 'react'; | ||
| import React, { Fragment } from 'react'; | ||
| import { type Comment } from '../../types/Comment'; | ||
| import { CommentInfo } from '../CommentInfo'; | ||
| import './CommentList.css'; | ||
|
|
||
| export const CommentList: React.FC = () => <>Put the list here</>; | ||
| type Props = { | ||
| comments: Comment[]; | ||
| }; | ||
|
|
||
| export const CommentList: React.FC<Props> = ({ comments }) => ( | ||
| <div className="CommentList"> | ||
| {comments.map(comment => ( | ||
| <Fragment key={comment.id}> | ||
| <CommentInfo comment={comment} /> | ||
| </Fragment> | ||
| ))} | ||
| </div> | ||
| ); | ||
This file contains hidden or 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,20 @@ | ||
| // 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 hidden or 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,3 +1,37 @@ | ||
| import React from 'react'; | ||
| import { type Post } from '../../types/Post'; | ||
| import { UserInfo } from '../UserInfo'; | ||
| import { CommentList } from '../CommentList'; | ||
| import './PostInfo.css'; | ||
|
|
||
| export const PostInfo: React.FC = () => <>Put the post here</>; | ||
| type Props = { | ||
| post: Post; | ||
| }; | ||
|
|
||
| export const PostInfo: React.FC<Props> = ({ post }) => { | ||
| const hasComments = post.comments && post.comments.length > 0; | ||
|
|
||
| return ( | ||
| <div className="PostInfo"> | ||
| <div className="PostInfo__header"> | ||
| <h3 className="PostInfo__title">{post.title}</h3> | ||
|
|
||
| {post.user && ( | ||
| <p> | ||
| Posted by <UserInfo user={post.user} /> | ||
| </p> | ||
| )} | ||
| </div> | ||
|
|
||
| <p className="PostInfo__body">{post.body}</p> | ||
|
|
||
| <hr /> | ||
|
|
||
| {!hasComments ? ( | ||
| <b data-cy="NoCommentsMessage">No comments yet</b> | ||
| ) : ( | ||
| <CommentList comments={post.comments!} /> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; |
This file contains hidden or 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,3 +1,18 @@ | ||
| import React from 'react'; | ||
| import React, { Fragment } from 'react'; | ||
| import { PostInfo } from '../PostInfo'; | ||
| import { type Post } from '../../types/Post'; | ||
| import './PostList.css'; | ||
|
|
||
| export const PostList: React.FC = () => <>Put the list here</>; | ||
| type Props = { | ||
| posts: Post[]; | ||
| }; | ||
|
|
||
| export const PostList: React.FC<Props> = ({ posts }) => ( | ||
| <div className="PostList"> | ||
| {posts.map(post => ( | ||
| <Fragment key={post.id}> | ||
| <PostInfo post={post} /> | ||
| </Fragment> | ||
|
Comment on lines
+13
to
+15
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. This <PostInfo key={post.id} post={post} /> |
||
| ))} | ||
| </div> | ||
| ); | ||
This file contains hidden or 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,4 @@ | ||
| // add styles here | ||
| .UserInfo { | ||
| font-weight: bold; | ||
| } | ||
|
|
This file contains hidden or 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,3 +1,15 @@ | ||
| import React from 'react'; | ||
| import { type User } from '../../types/User'; | ||
| import './UserInfo.css'; | ||
|
|
||
| export const UserInfo: React.FC = () => <>Put the user here</>; | ||
| type Props = { | ||
| user: User; | ||
| }; | ||
|
|
||
| export const UserInfo: React.FC<Props> = ({ user }) => { | ||
| return ( | ||
| <a className="UserInfo" href={`mailto:${user.email}`}> | ||
| {user.name} | ||
| </a> | ||
| ); | ||
| }; |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export interface Comment { | ||
| postId: number; | ||
| id: number; | ||
| name: string; | ||
| email: string; | ||
| body: string; | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import { type User } from './User'; | ||
| import { type Comment } from './Comment'; | ||
|
|
||
| export interface Post { | ||
| userId: number; | ||
| id: number; | ||
| title: string; | ||
| body: string; | ||
| user?: User; | ||
| comments?: Comment[]; | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| export interface User { | ||
| id: number; | ||
| name: string; | ||
| email: string; | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| export * from './User'; | ||
| export * from './Comment'; | ||
| export * from './Post'; |
Oops, something went wrong.
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.
This
Fragmentis unnecessary as it only wraps a single child component. This violates checklist item #4 which advises against using aReact.Fragmentfor a single element. You can move thekeyprop directly to theCommentInfocomponent like this: