diff --git a/README.md b/README.md index b1a2b34341..4f8d2d6a72 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://przwojwwp.github.io/react_static-list-of-posts/) and add it to the PR description. diff --git a/package-lock.json b/package-lock.json index 4339654af2..057739669e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", @@ -1170,10 +1170,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.5.tgz", - "integrity": "sha512-mHRY2FkuoYCf5U0ahIukkaRo5LSZsxrTSgMJheFoyf3VXsTvfM9OfWcZIDIDB521kdPrScHHnRp+JRNjCfUO5A==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 8f0875aee2..01d185fd65 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", 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..7390f9038d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,105 +2,37 @@ 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 { User } from './types/User'; +import { Comment } from './types/Comment'; +import { Post } from './types/Post'; +import { PostList } from './components/PostList'; + +function getUser(userId: number): User | null { + const foundUser = usersFromServer.find(user => user.id === userId); + + return foundUser || null; +} + +function getComments(postId: number): Comment[] { + const foundComments = commentsFromServer.filter( + comment => comment.postId === postId, + ); + + return foundComments; +} + +const posts: Post[] = postsFromServer.map(post => ({ + ...post, + user: getUser(post.userId), + comments: getComments(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..9b3634ebc7 100644 --- a/src/components/CommentInfo/CommentInfo.tsx +++ b/src/components/CommentInfo/CommentInfo.tsx @@ -1,3 +1,23 @@ import React from 'react'; +import { Comment } from '../../types/Comment'; +import './CommentInfo.scss'; -export const CommentInfo: React.FC = () => <>Put the comment here; +export const CommentInfo: React.FC<{ comment: Comment }> = ({ + comment: { name, email, body }, +}) => { + return ( +
+
+ {name} + + {' by '} + + + {email} + +
+ +
{body}
+
+ ); +}; diff --git a/src/components/CommentList/CommentList.scss b/src/components/CommentList/CommentList.scss index f1b40ee00e..91c2ed5fbb 100644 --- a/src/components/CommentList/CommentList.scss +++ b/src/components/CommentList/CommentList.scss @@ -1 +1,7 @@ -// 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..edc4341fd7 100644 --- a/src/components/CommentList/CommentList.tsx +++ b/src/components/CommentList/CommentList.tsx @@ -1,3 +1,16 @@ import React from 'react'; +import { Comment } from '../../types/Comment'; +import './CommentList.scss'; +import { CommentInfo } from '../CommentInfo'; -export const CommentList: React.FC = () => <>Put the list here; +export const CommentList: React.FC<{ comments: Comment[] }> = ({ + comments, +}) => { + return ( +
+ {comments.map(comment => ( + + ))} +
+ ); +}; diff --git a/src/components/PostInfo/PostInfo.scss b/src/components/PostInfo/PostInfo.scss index f1b40ee00e..1ad49fd344 100644 --- a/src/components/PostInfo/PostInfo.scss +++ b/src/components/PostInfo/PostInfo.scss @@ -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; + } +} diff --git a/src/components/PostInfo/PostInfo.tsx b/src/components/PostInfo/PostInfo.tsx index 90220ae5e1..e269b62250 100644 --- a/src/components/PostInfo/PostInfo.tsx +++ b/src/components/PostInfo/PostInfo.tsx @@ -1,3 +1,33 @@ import React from 'react'; +import { Post } from '../../types/Post'; +import './PostInfo.scss'; +import { CommentList } from '../CommentList'; +import { UserInfo } from '../UserInfo'; -export const PostInfo: React.FC = () => <>Put the post here; +export const PostInfo: React.FC<{ post: Post }> = ({ + post: { title, user, body, comments }, +}) => { + return ( +
+
+

{title}

+ +

+ {' Posted by '} + + {user?.name && } +

+
+ +

{body}

+ +
+ + {comments && comments.length > 0 ? ( + + ) : ( + No comments yet + )} +
+ ); +}; diff --git a/src/components/PostList/PostList.tsx b/src/components/PostList/PostList.tsx index d7bc7aa5fa..2f790057da 100644 --- a/src/components/PostList/PostList.tsx +++ b/src/components/PostList/PostList.tsx @@ -1,3 +1,15 @@ import React from 'react'; +import { Post } from '../../types/Post'; +import { PostInfo } from '../PostInfo'; -export const PostList: React.FC = () => <>Put the list here; +export const PostList: React.FC<{ postListPosts: Post[] }> = ({ + postListPosts, +}) => { + return ( +
+ {postListPosts.map(post => ( + + ))} +
+ ); +}; diff --git a/src/components/UserInfo/UserInfo.scss b/src/components/UserInfo/UserInfo.scss index f1b40ee00e..5080de7cd7 100644 --- a/src/components/UserInfo/UserInfo.scss +++ b/src/components/UserInfo/UserInfo.scss @@ -1 +1,3 @@ -// add styles here +.UserInfo { + font-weight: bold; +} diff --git a/src/components/UserInfo/UserInfo.tsx b/src/components/UserInfo/UserInfo.tsx index 0435cbfa67..71805c9de9 100644 --- a/src/components/UserInfo/UserInfo.tsx +++ b/src/components/UserInfo/UserInfo.tsx @@ -1,3 +1,11 @@ import React from 'react'; +import { User } from '../../types/User'; +import './UserInfo.scss'; -export const UserInfo: React.FC = () => <>Put the user here; +export const UserInfo: React.FC<{ user: User }> = ({ user }) => { + return ( + + {user?.name} + + ); +}; diff --git a/src/index.tsx b/src/index.tsx index 50470f1508..6e2bc93e7f 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,5 @@ import { createRoot } from 'react-dom/client'; import { App } from './App'; +import React from 'react'; createRoot(document.getElementById('root') as HTMLElement).render(); diff --git a/src/types/Comment.ts b/src/types/Comment.ts new file mode 100644 index 0000000000..54ee4fac31 --- /dev/null +++ b/src/types/Comment.ts @@ -0,0 +1,7 @@ +export type 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..433cb01b0e --- /dev/null +++ b/src/types/Post.ts @@ -0,0 +1,11 @@ +import { User } from './User'; +import { Comment } from './Comment'; + +export type Post = { + userId: number; + id: number; + title: string; + body: string; + user: User | null; + comments: Comment[]; +}; diff --git a/src/types/User.ts b/src/types/User.ts new file mode 100644 index 0000000000..f74409b994 --- /dev/null +++ b/src/types/User.ts @@ -0,0 +1,6 @@ +export type User = { + id: number; + name: string; + username: string; + email: string; +}; diff --git a/tsconfig.json b/tsconfig.json index cfb168bb26..778406f15e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "src" ], "compilerOptions": { + "jsx": "react", "sourceMap": false, "types": ["node", "cypress"] }