Skip to content
Open

develop #2039

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://wiolip.github.io/react_static-list-of-posts/) and add it to the PR description.
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;
}
120 changes: 25 additions & 95 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,106 +1,36 @@
import React from 'react';

import './App.scss';
import { type Comment } from './types/Comment';
import { type User } from './types/User';
import { PostList } from './components/PostList';

// import postsFromServer from './api/posts';
// import commentsFromServer from './api/comments';
// import usersFromServer from './api/users';

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 />
import postsFromServer from './api/posts';
import commentsFromServer from './api/comments';
import usersFromServer from './api/users';

<b data-cy="NoCommentsMessage">No comments yet</b>
</div>
function getUserById(userId: number): User | undefined {
return usersFromServer.find(user => user.id === userId);
}

<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">doloremque illum aliquid sunt</h3>
function getCommentsByPostId(postId: number): Comment[] {
return commentsFromServer.filter(comment => comment.postId === postId);
}

<p>
{' Posted by '}
export const posts = postsFromServer.map(post => {
const user = getUserById(post.userId);
const comments = getCommentsByPostId(post.id);

<a className="UserInfo" href="mailto:Julianne.OConner@kory.org">
Patricia Lebsack
</a>
</p>
</div>
return {
...post,
user,
comments,
};
});

<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>
export const App: React.FC = () => (
<section className="App">
<h1 className="App__title">Static list of posts</h1>

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

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

export const CommentInfo: React.FC<Props> = ({ 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>
);
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;
}
19 changes: 17 additions & 2 deletions src/components/CommentList/CommentList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
import React from 'react';
import React, { Fragment } from 'react';
import { type Comment } from '../../types/Comment';
import { CommentInfo } from '../CommentInfo';
import './CommentList.css';

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

export const CommentList: React.FC<Props> = ({ comments }) => (
<div className="CommentList">
{comments.map(comment => (
<Fragment key={comment.id}>
<CommentInfo comment={comment} />
</Fragment>
Comment on lines +13 to +15

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Fragment is unnecessary as it only wraps a single child component. This violates checklist item #4 which advises against using a React.Fragment for a single element. You can move the key prop directly to the CommentInfo component like this:

<CommentInfo key={comment.id} comment={comment} />

))}
</div>
);
21 changes: 20 additions & 1 deletion src/components/PostInfo/PostInfo.scss
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
// 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;
}
}




36 changes: 35 additions & 1 deletion src/components/PostInfo/PostInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
import React from 'react';
import { type Post } from '../../types/Post';
import { UserInfo } from '../UserInfo';
import { CommentList } from '../CommentList';
import './PostInfo.css';

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

export const PostInfo: React.FC<Props> = ({ post }) => {
const hasComments = post.comments && post.comments.length > 0;

return (
<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">{post.title}</h3>

{post.user && (
<p>
Posted by <UserInfo user={post.user} />
</p>
)}
</div>

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

<hr />

{!hasComments ? (
<b data-cy="NoCommentsMessage">No comments yet</b>
) : (
<CommentList comments={post.comments!} />
)}
</div>
);
};
19 changes: 17 additions & 2 deletions src/components/PostList/PostList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
import React from 'react';
import React, { Fragment } from 'react';
import { PostInfo } from '../PostInfo';
import { type Post } from '../../types/Post';
import './PostList.css';

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

export const PostList: React.FC<Props> = ({ posts }) => (
<div className="PostList">
{posts.map(post => (
<Fragment key={post.id}>
<PostInfo post={post} />
</Fragment>
Comment on lines +13 to +15

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Fragment is unnecessary as it only wraps a single child component. This violates checklist item #4 which advises against using a React.Fragment for a single element. You can move the key prop directly to the PostInfo component like this:

<PostInfo key={post.id} post={post} />

))}
</div>
);
5 changes: 4 additions & 1 deletion src/components/UserInfo/UserInfo.scss
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// add styles here
.UserInfo {
font-weight: bold;
}

14 changes: 13 additions & 1 deletion src/components/UserInfo/UserInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
import React from 'react';
import { type User } from '../../types/User';
import './UserInfo.css';

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

export const UserInfo: React.FC<Props> = ({ user }) => {
return (
<a className="UserInfo" href={`mailto:${user.email}`}>
{user.name}
</a>
);
};
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 { type User } from './User';
import { type Comment } from './Comment';

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