Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solution #1969

Closed
wants to merge 1 commit into from
Closed
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://Timi2424.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;
}
122 changes: 26 additions & 96 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,109 +1,39 @@
import React from 'react';

import './App.scss';

// 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:[email protected]">
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>
import postsFromServer from './api/posts';
import commentsFromServer from './api/comments';
import usersFromServer from './api/users';

<hr />
import { PostList } from './components/PostList';

<b data-cy="NoCommentsMessage">No comments yet</b>
</div>
import { Post } from './types/PostsTypes';
import { User } from './types/UserTypes';
import { Comment } from './types/CommentsTypes';

<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">
doloremque illum aliquid sunt
</h3>
function getUser(userId: number): User | null {
const foundUser = usersFromServer.find(user => user.id === userId);

<p>
{' Posted by '}
return foundUser || null;
}

<a className="UserInfo" href="mailto:[email protected]">
Patricia Lebsack
</a>
</p>
</div>
function getComment(postId: number): Comment[] {
const foundComment = commentsFromServer.filter(
comment => comment.postId === postId,
);

<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>
return foundComment;
}

<div className="CommentList">
<div className="CommentInfo">
<div className="CommentInfo__title">
<strong className="CommentInfo__name">pariatur omnis in</strong>
export const posts: Post[] = postsFromServer.map(post => ({
...post,
user: getUser(post.userId),
comments: getComment(post.id),
}));

{' by '}

<a
className="CommentInfo__email"
href="mailto:[email protected]"
>
[email protected]
</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:[email protected]"
>
[email protected]
</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>
);
22 changes: 19 additions & 3 deletions src/components/CommentInfo/CommentInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
import React from 'react';
import { Comment } from '../../types/CommentsTypes';

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;
}
22 changes: 20 additions & 2 deletions src/components/CommentList/CommentList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
import React from 'react';

export const CommentList: React.FC = () => (
<>Put the list here</>
import './CommentList.scss';

import { Comment } from '../../types/CommentsTypes';
import { CommentInfo } from '../CommentInfo';

type CommentsProps = {
comments: Comment[];
};

export const CommentList: React.FC<CommentsProps> = ({ comments }) => (
<>
<div className="CommentList">
{comments.map(comment => (
<CommentInfo
comment={comment}
key={comment.id}
/>
))}
</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;
}
}
35 changes: 33 additions & 2 deletions src/components/PostInfo/PostInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
import React from 'react';

export const PostInfo: React.FC = () => (
<>Put the post here</>
import './PostInfo.scss';

import { Post } from '../../types/PostsTypes';
import { UserInfo } from '../UserInfo';
import { CommentList } from '../CommentList';

type Props = {
post: Post;
};

export const PostInfo: React.FC<Props> = ({ post }) => (
<div className="PostInfo">
<div className="PostInfo__header">
<h3 className="PostInfo__title">
{post.title}
</h3>

{post.user && <UserInfo user={post.user} />}
</div>

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

{post.comments.length !== 0
? <CommentList key={post.id} comments={post.comments} />
: (
<>
<hr />
<b data-cy="NoCommentsMessage">No comments yet</b>
</>
)}
</div>
);
18 changes: 16 additions & 2 deletions src/components/PostList/PostList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import React from 'react';

export const PostList: React.FC = () => (
<>Put the list here</>
import { Post } from '../../types/PostsTypes';
import { PostInfo } from '../PostInfo';

type Props = {
posts: Post[];
};

export const PostList: React.FC<Props> = ({ posts }) => (
<div className="PostList">
{posts.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;
}
18 changes: 16 additions & 2 deletions src/components/UserInfo/UserInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import React from 'react';

export const UserInfo: React.FC = () => (
<>Put the user here</>
import './UserInfo.scss';

import { User } from '../../types/UserTypes';

type Props = {
user: User;
};

export const UserInfo: React.FC<Props> = ({ user }) => (
<p>
{' Posted by '}

<a className="UserInfo" href={`mailto:${user.email}`}>
{user.name}
</a>
</p>
);
7 changes: 7 additions & 0 deletions src/types/CommentsTypes.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/PostsTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { User } from './UserTypes';
import { Comment } from './CommentsTypes';

export interface Post {
userId: number;
id: number;
title: string;
body: string;
user: User | null;
comments: Comment[];
}
6 changes: 6 additions & 0 deletions src/types/UserTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export interface User {
id: number;
name: string;
username: string;
email: string;
}
Loading