diff --git a/README.md b/README.md index ab3abde58..0abd35c68 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ This task is similar to [Static List of TODOs](https://github.com/mate-academy/r - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline). - Open one more terminal and run tests with `npm test` to ensure your solution is correct. -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_static-list-of-posts-js/) and add it to the PR description. +- Replace `` with your Github username in the [DEMO LINK](https://RuslanSkl.github.io/react_static-list-of-posts-js/) and add it to the PR description. diff --git a/src/App.jsx b/src/App.jsx index 22ae1b9c0..28db41088 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,104 +1,19 @@ 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'; + +const postsWithUsers = postsFromServer.map(post => ({ + ...post, + user: usersFromServer.find(user => user.id === post.userId), + comments: commentsFromServer.filter(comment => comment.postId === post.id), +})); export const App = () => (

Static list of posts

- -
-
-
-

qui est esse

- -

- {' Posted by '} - - - Leanne Graham - -

-
- -

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

- -
- - No comments yet -
- -
-
-

doloremque illum aliquid sunt

- -

- {' Posted by '} - - - Patricia Lebsack - -

-
- -

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

- -
-
-
- pariatur omnis in - - {' by '} - - - Telly_Lynch@karl.co.uk - -
- -
- 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 -
-
- -
-
- - odio adipisci rerum aut animi - - - {' by '} - - - Nikita@garfield.biz - -
- -
- 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 -
-
-
-
-
+
); diff --git a/src/components/CommentInfo/CommentInfo.jsx b/src/components/CommentInfo/CommentInfo.jsx index f99e27787..48a10acdf 100644 --- a/src/components/CommentInfo/CommentInfo.jsx +++ b/src/components/CommentInfo/CommentInfo.jsx @@ -1 +1,12 @@ -export const CommentInfo = () => <>Put the comment here; +export const CommentInfo = ({ comment }) => ( +
+
+ {comment.name} + {' by '} + + {comment.email} + +
+
{comment.body}
+
+); diff --git a/src/components/CommentList/CommentList.jsx b/src/components/CommentList/CommentList.jsx index 263dfbc73..590d24449 100644 --- a/src/components/CommentList/CommentList.jsx +++ b/src/components/CommentList/CommentList.jsx @@ -1 +1,9 @@ -export const CommentList = () => <>Put the list here; +import { CommentInfo } from '../CommentInfo'; + +export const CommentList = ({ comments }) => ( +
+ {comments.map(comment => ( + + ))} +
+); diff --git a/src/components/PostInfo/PostInfo.jsx b/src/components/PostInfo/PostInfo.jsx index eb3efb784..04de8b299 100644 --- a/src/components/PostInfo/PostInfo.jsx +++ b/src/components/PostInfo/PostInfo.jsx @@ -1 +1,21 @@ -export const PostInfo = () => <>Put the post here; +import { UserInfo } from '../UserInfo'; +import { CommentList } from '../CommentList'; + +export const PostInfo = ({ post }) => ( +
+
+

{post.title}

+

+ {' Posted by '} + {post.user && } +

+
+

{post.body}

+
+ {post.comments.length ? ( + + ) : ( + No comments yet + )} +
+); diff --git a/src/components/PostList/PostList.jsx b/src/components/PostList/PostList.jsx index 4487a96c9..799feb37c 100644 --- a/src/components/PostList/PostList.jsx +++ b/src/components/PostList/PostList.jsx @@ -1 +1,9 @@ -export const PostList = () => <>Put the list here; +import { PostInfo } from '../PostInfo'; + +export const PostList = ({ posts }) => ( +
+ {posts.map(post => ( + + ))} +
+); diff --git a/src/components/UserInfo/UserInfo.jsx b/src/components/UserInfo/UserInfo.jsx index 6264e2f7e..821f187c8 100644 --- a/src/components/UserInfo/UserInfo.jsx +++ b/src/components/UserInfo/UserInfo.jsx @@ -1 +1,5 @@ -export const UserInfo = () => <>Put the user here; +export const UserInfo = ({ user }) => ( + + {user.name} + +);