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.

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

task solution #2004

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
109 changes: 13 additions & 96 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,106 +1,23 @@
import React from 'react';

import './App.scss';

// import postsFromServer from './api/posts';
// import commentsFromServer from './api/comments';
// import usersFromServer from './api/users';
import postsFromServer from './api/posts';
import commentsFromServer from './api/comments';
import usersFromServer from './api/users';
import { PostList } from './components/PostList';

const posts = postsFromServer.map(post => {
return {
...post,
comments: commentsFromServer.filter(comment => comment.postId === post.id),
user: usersFromServer.find(user => user.id === post.userId),
};
});

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:[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>

<p>
{' Posted by '}

<a className="UserInfo" href="mailto:[email protected]">
Patricia Lebsack
</a>
</p>
</div>

<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>

<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>
);
22 changes: 21 additions & 1 deletion src/components/CommentInfo/CommentInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
import React from 'react';
import { Comment } from '../../types/Comment';

export const CommentInfo: React.FC = () => <>Put the comment here</>;
interface Props {
comment: Comment | undefined;
}

export const CommentInfo: React.FC<Props> = ({ comment }) =>
!!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>
);
14 changes: 13 additions & 1 deletion src/components/CommentList/CommentList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
import React from 'react';
import { CommentInfo } from '../CommentInfo';
import { Comment } from '../../types/Comment';

export const CommentList: React.FC = () => <>Put the list here</>;
interface Props {
comments: Comment[] | undefined;
}

export const CommentList: React.FC<Props> = ({ comments }) => (
<div className="CommentList">
{comments?.map(comment => (
<CommentInfo comment={comment} key={comment.id} />
))}
</div>
);
27 changes: 26 additions & 1 deletion src/components/PostInfo/PostInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
import React from 'react';
import { UserInfo } from '../UserInfo';
import { CommentList } from '../CommentList';
import { Post } from '../../types/Post';

export const PostInfo: React.FC = () => <>Put the post here</>;
interface Props {
post: Post;
}

export const PostInfo: React.FC<Props> = ({
post: { title, body, user, comments },
}) => (
<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">{title}</h3>

<UserInfo user={user} />
</div>

<p className="PostInfo__body">{body}</p>

{comments && comments.length === 0 ? (
<b data-cy="NoCommentsMessage">No comments yet</b>
) : (
<CommentList comments={comments} />
)}
</div>
);
16 changes: 15 additions & 1 deletion src/components/PostList/PostList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
import React from 'react';
import { PostInfo } from '../PostInfo';
import { Post } from '../../types/Post';

export const PostList: React.FC = () => <>Put the list here</>;
interface Props {
posts: Post[];
}

export const PostList: React.FC<Props> = ({ posts }) => {
return (
<div className="PostList">
{posts.map(post => (
<PostInfo post={post} key={post.id} />
))}
</div>
);
};
15 changes: 14 additions & 1 deletion src/components/UserInfo/UserInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
import React from 'react';
import { User } from '../../types/User';

export const UserInfo: React.FC = () => <>Put the user here</>;
interface Props {
user: User | undefined;
}

export const UserInfo: React.FC<Props> = ({ user }) => (
<p>
{' Posted by '}

<a className="UserInfo" href={`mailto:${user?.email}`}>
{user?.name}
</a>
</p>
);
7 changes: 7 additions & 0 deletions src/types/Comment.ts
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;
}
11 changes: 11 additions & 0 deletions src/types/Post.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { User } from './User';
import { Comment } from './Comment';

export interface Post {
userId: number;
id: number;
title: string;
body: string;
user?: User;
comments?: Comment[];
}
6 changes: 6 additions & 0 deletions src/types/User.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export interface User {
id: number;
name: string;
username: string;
email: string;
}
Loading