Skip to content
Open

Develop #2016

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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_static-list-of-posts/) and add it to the PR description.
- Replace `<your_account>` with your Github username in the [DEMO LINK](https://przwojwwp.github.io/react_static-list-of-posts/) and add it to the PR description.
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
29 changes: 0 additions & 29 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
124 changes: 28 additions & 96 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => (
<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 />

<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:Julianne.OConner@kory.org">
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: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>

<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 postListPosts={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';
import './CommentInfo.scss';

export const CommentInfo: React.FC = () => <>Put the comment here</>;
export const CommentInfo: React.FC<{ comment: Comment }> = ({
comment: { name, email, body },
}) => {
return (
<div className="CommentInfo">
<div className="CommentInfo__title">
<strong className="CommentInfo__name">{name}</strong>

{' by '}

<a className="CommentInfo__email" href={`mailto:${email}`}>
{email}
</a>
</div>

<div className="CommentInfo__body">{body}</div>
</div>
);
};
8 changes: 7 additions & 1 deletion src/components/CommentList/CommentList.scss
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;
}
15 changes: 14 additions & 1 deletion src/components/CommentList/CommentList.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div className="CommentList">
{comments.map(comment => (
<CommentInfo key={comment.id} comment={comment} />
))}
</div>
);
};
17 changes: 16 additions & 1 deletion src/components/PostInfo/PostInfo.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
32 changes: 31 additions & 1 deletion src/components/PostInfo/PostInfo.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">{title}</h3>

<p>
{' Posted by '}

{user?.name && <UserInfo user={user} />}
</p>
</div>

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

<hr />

{comments && comments.length > 0 ? (
<CommentList comments={comments} />
) : (
<b data-cy="NoCommentsMessage">No comments yet</b>
)}
</div>
);
};
14 changes: 13 additions & 1 deletion src/components/PostList/PostList.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div className="PostList">
{postListPosts.map(post => (
<PostInfo key={post.id} post={post} />
))}
</div>
);
};
4 changes: 3 additions & 1 deletion src/components/UserInfo/UserInfo.scss
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
// add styles here
.UserInfo {
font-weight: bold;
}
10 changes: 9 additions & 1 deletion src/components/UserInfo/UserInfo.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<a className="UserInfo" href={`mailto:${user.email}`}>
{user?.name}
</a>
);
};
1 change: 1 addition & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -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(<App />);
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 type 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 type Post = {
userId: number;
id: number;
title: string;
body: string;
user: User | null;
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 type User = {
id: number;
name: string;
username: string;
email: string;
};
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"src"
],
"compilerOptions": {
"jsx": "react",
"sourceMap": false,
"types": ["node", "cypress"]
}
Expand Down