From 94a4f9db2a2bcbca49c8a23765c66a3ae91e545c Mon Sep 17 00:00:00 2001 From: Kamil Date: Sat, 21 Sep 2024 14:31:41 +0200 Subject: [PATCH 1/2] task solution --- README.md | 2 +- src/App.scss | 29 ----- src/App.tsx | 120 +++++--------------- src/components/CommentInfo/CommentInfo.tsx | 19 +++- src/components/CommentList/CommentList.scss | 7 ++ src/components/CommentList/CommentList.tsx | 13 ++- src/components/PostInfo/PostInfo.scss | 16 +++ src/components/PostInfo/PostInfo.tsx | 36 +++++- src/components/PostList/PostList.tsx | 10 +- src/components/UserInfo/UserInfo.scss | 4 + src/components/UserInfo/UserInfo.tsx | 12 +- src/types/Comment.ts | 7 ++ src/types/Post.ts | 11 ++ src/types/User.ts | 6 + 14 files changed, 164 insertions(+), 128 deletions(-) create mode 100644 src/types/Comment.ts create mode 100644 src/types/Post.ts create mode 100644 src/types/User.ts diff --git a/README.md b/README.md index b1a2b34341..2d47d93895 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ This task is similar to [Static List of TODOs](https://github.com/mate-academy/r - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline). - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript). - 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/) and add it to the PR description. +- Replace `` with your Github username in the [DEMO LINK](https://W3zzie.github.io/react_static-list-of-posts/) and add it to the PR description. diff --git a/src/App.scss b/src/App.scss index 98bb3956c3..6436509521 100644 --- a/src/App.scss +++ b/src/App.scss @@ -5,32 +5,3 @@ iframe { .App__title { text-align: center; } - -.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; - } -} - -.UserInfo { - font-weight: bold; -} - -.CommentList { - display: flex; - flex-direction: column; - gap: 0.7em; - background-color: #eee; - padding: 1em; -} diff --git a/src/App.tsx b/src/App.tsx index 6ccd7807c2..02d664bcf5 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,104 +2,38 @@ 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'; +import { type Post } from './types/Post'; +import { type User } from './types/User'; +import { Comment } from './types/Comment'; + +const getCommentsByPostId = (postId: Post['id']): Comment[] => { + return commentsFromServer.filter( + (comment: Comment) => comment.postId === postId, + ); +}; + +const getUserById = (userId: User['id']): User | undefined => { + return usersFromServer.find((user: User) => user.id === userId); +}; + +const posts: Post[] = postsFromServer.map(post => { + return { + ...post, + user: getUserById(post.userId), + comments: getCommentsByPostId(post.id), + }; +}); export const App: React.FC = () => (

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.tsx b/src/components/CommentInfo/CommentInfo.tsx index 4471a7b9a3..b9812755a7 100644 --- a/src/components/CommentInfo/CommentInfo.tsx +++ b/src/components/CommentInfo/CommentInfo.tsx @@ -1,3 +1,20 @@ import React from 'react'; +import { Comment } from '../../types/Comment'; -export const CommentInfo: React.FC = () => <>Put the comment here; +export const CommentInfo: React.FC<{ comment: Comment }> = ({ + comment: { name, email, body }, +}) => ( +
+
+ {name} + + {' by '} + + + {email} + +
+ +
{body}
+
+); diff --git a/src/components/CommentList/CommentList.scss b/src/components/CommentList/CommentList.scss index f1b40ee00e..934ec5e54a 100644 --- a/src/components/CommentList/CommentList.scss +++ b/src/components/CommentList/CommentList.scss @@ -1 +1,8 @@ // add styles here +.CommentList { + display: flex; + flex-direction: column; + gap: 0.7em; + background-color: #eee; + padding: 1em; +} diff --git a/src/components/CommentList/CommentList.tsx b/src/components/CommentList/CommentList.tsx index 8cc7d72e14..1a61e1b7f5 100644 --- a/src/components/CommentList/CommentList.tsx +++ b/src/components/CommentList/CommentList.tsx @@ -1,3 +1,14 @@ import React from 'react'; +import './CommentList.scss'; +import { type Comment } from '../../types/Comment'; +import { CommentInfo } from '../CommentInfo'; -export const CommentList: React.FC = () => <>Put the list here; +export const CommentList: React.FC<{ comments: Comment[] }> = ({ + comments, +}) => ( +
+ {comments.map((comment: Comment) => ( + + ))} +
+); diff --git a/src/components/PostInfo/PostInfo.scss b/src/components/PostInfo/PostInfo.scss index f1b40ee00e..54d73198e5 100644 --- a/src/components/PostInfo/PostInfo.scss +++ b/src/components/PostInfo/PostInfo.scss @@ -1 +1,17 @@ // 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; + } +} diff --git a/src/components/PostInfo/PostInfo.tsx b/src/components/PostInfo/PostInfo.tsx index 90220ae5e1..8229326672 100644 --- a/src/components/PostInfo/PostInfo.tsx +++ b/src/components/PostInfo/PostInfo.tsx @@ -1,3 +1,37 @@ import React from 'react'; +import './PostInfo.scss'; +import { type Post } from '../../types/Post'; +import { CommentList } from '../CommentList'; +import { UserInfo } from '../UserInfo'; -export const PostInfo: React.FC = () => <>Put the post here; +interface Props { + post: Post; +} + +export const PostInfo: React.FC = ({ post }) => { + const { title, user, body, comments } = post; + + return ( +
+
+

{title}

+ +

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

+
+ +

{body}

+ +
+ + {!!comments?.length ? ( + + ) : ( + No comments yet + )} +
+ ); +}; diff --git a/src/components/PostList/PostList.tsx b/src/components/PostList/PostList.tsx index d7bc7aa5fa..ec29b09f9a 100644 --- a/src/components/PostList/PostList.tsx +++ b/src/components/PostList/PostList.tsx @@ -1,3 +1,11 @@ import React from 'react'; +import { PostInfo } from '../PostInfo'; +import { type Post } from '../../types/Post'; -export const PostList: React.FC = () => <>Put the list here; +interface Props { + posts: Post[]; +} + +export const PostList: React.FC = ({ posts }) => { + return posts.map((post: Post) => ); +}; diff --git a/src/components/UserInfo/UserInfo.scss b/src/components/UserInfo/UserInfo.scss index f1b40ee00e..e278559f82 100644 --- a/src/components/UserInfo/UserInfo.scss +++ b/src/components/UserInfo/UserInfo.scss @@ -1 +1,5 @@ // add styles here +.UserInfo { + font-weight: bold; +} + diff --git a/src/components/UserInfo/UserInfo.tsx b/src/components/UserInfo/UserInfo.tsx index 0435cbfa67..649289e537 100644 --- a/src/components/UserInfo/UserInfo.tsx +++ b/src/components/UserInfo/UserInfo.tsx @@ -1,3 +1,13 @@ import React from 'react'; +import './UserInfo.scss'; +import { type User } from '../../types/User'; -export const UserInfo: React.FC = () => <>Put the user here; +interface Props { + user: User | undefined; +} + +export const UserInfo: React.FC = ({ user }) => ( + + {user?.name} + +); diff --git a/src/types/Comment.ts b/src/types/Comment.ts new file mode 100644 index 0000000000..14df6303f3 --- /dev/null +++ b/src/types/Comment.ts @@ -0,0 +1,7 @@ +export interface Comment { + postId: number; + id: number; + name: string; + email: string; + body: string; +} diff --git a/src/types/Post.ts b/src/types/Post.ts new file mode 100644 index 0000000000..b8df92072c --- /dev/null +++ b/src/types/Post.ts @@ -0,0 +1,11 @@ +import { type Comment } from './Comment'; +import { type User } from './User'; + +export interface Post { + userId: number; + id: number; + title: string; + body: string; + user?: User; + comments: Comment[]; +} diff --git a/src/types/User.ts b/src/types/User.ts new file mode 100644 index 0000000000..1f6908b55a --- /dev/null +++ b/src/types/User.ts @@ -0,0 +1,6 @@ +export interface User { + id: number; + name: string; + username: string; + email: string; +} From aab04c6865c2bb01465a0f0786718a6a1b15a310 Mon Sep 17 00:00:00 2001 From: Kamil Date: Tue, 24 Sep 2024 16:13:54 +0200 Subject: [PATCH 2/2] task solution --- src/components/PostInfo/PostInfo.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/PostInfo/PostInfo.tsx b/src/components/PostInfo/PostInfo.tsx index 8229326672..8acc143d42 100644 --- a/src/components/PostInfo/PostInfo.tsx +++ b/src/components/PostInfo/PostInfo.tsx @@ -9,26 +9,25 @@ interface Props { } export const PostInfo: React.FC = ({ post }) => { - const { title, user, body, comments } = post; return (
-

{title}

+

{post.title}

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

-

{body}

+

{post.body}

- {!!comments?.length ? ( - + {!!post.comments?.length ? ( + ) : ( No comments yet )}