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

react_dynamic_list-of-posts #904

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
ESLINT_NO_DEV_ERRORS=true

REACT_APP_URL_USERS = /users
REACT_APP_POSTS_BY_USER = /posts?userId=
REACT_APP_COMMENTS_BY_POST= /comments?postId=
REACT_APP_COMMENTS_DELETE = /comments/
1 change: 0 additions & 1 deletion cypress.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"baseUrl": "http://localhost:3000",
"defaultCommandTimeout": 2000,
"video": true,
"viewportHeight": 1920,
"viewportWidth": 1080,
Expand Down
8 changes: 0 additions & 8 deletions cypress/support/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
import '@mate-academy/cypress-tools/support';

declare global {
namespace Cypress {
interface Chainable<Subject> {
byDataCy(name: string, text: string): Chainable<JQuery>;
}
}
}
18 changes: 0 additions & 18 deletions cypress/support/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
require('@mate-academy/cypress-tools/support');

Cypress.Commands.add(
'byDataCy',
{ prevSubject: 'optional' },

(subject, name, text = '') => {
const target = subject || cy;
const selector = `[data-cy="${name}"]`;

if (text) {
return target.contain(selector, text);
}

return subject
? subject.find(selector)
: cy.get(selector);
},
);
6 changes: 3 additions & 3 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 @@ -21,7 +21,7 @@
"@cypress/webpack-dev-server": "^1.8.4",
"@mate-academy/cypress-tools": "^1.0.5",
"@mate-academy/eslint-config-react-typescript": "^1.0.5",
"@mate-academy/scripts": "^1.2.3",
"@mate-academy/scripts": "^1.2.8",
"@mate-academy/students-ts-config": "*",
"@mate-academy/stylelint-config": "*",
"@types/node": "^17.0.23",
Expand Down
176 changes: 143 additions & 33 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,62 +1,172 @@
import React from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import 'bulma/bulma.sass';
import '@fortawesome/fontawesome-free/css/all.css';
import './App.scss';

import classNames from 'classnames';
import { MemoSidebar } from './components/Sidebar';
import { PostsList } from './components/PostsList';
import { PostDetails } from './components/PostDetails';
import { UserSelector } from './components/UserSelector';
import { MemoUserSelector } from './components/UserSelector';
import { NotificationMessage } from './components/NotificationMessage';
import { Loader } from './components/Loader';

import { client } from './utils/fetchClient';

import { User } from './types/User';
import { Post } from './types/Post';
import { Notification } from './types/Notification';

if (!process.env.REACT_APP_URL_USERS) {
throw new Error('Users Key in not defined');
}

if (!process.env.REACT_APP_POSTS_BY_USER) {
throw new Error('User posts in not defined');
}

const URL_GET_USERS = process.env.REACT_APP_URL_USERS;
const URL_GET_POSTS = process.env.REACT_APP_POSTS_BY_USER;

export const App: React.FC = () => {
const [users, setUsers] = useState<User[]>([]);
const [posts, setPosts] = useState<Post[]>([]);
const [selectedUser, setSelectedUser] = useState<User | null>(null);
const [selectedPost, setSelectedPost] = useState<Post | null>(null);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [isError, setIsError] = useState<boolean>(true);
const [notificationData, setNotificationData]
= useState<Notification | null>(null);

// #region Load-users

vintwp marked this conversation as resolved.
Show resolved Hide resolved
useEffect(() => {
client.get<User[]>(URL_GET_USERS)
.then(receivedUsers => {
const trimmedUsers = receivedUsers.slice(0, 25);

setUsers(trimmedUsers);
})
.catch(() => {
throw new Error('Something wrong');
});
}, []);

// #endregion

// #region Select-user
const onUserSelect = useCallback((userSelected: User) => {
setSelectedUser(userSelected);
setSelectedPost(null);
}, []);
// #endregion

// #region Load-posts

const handlerLoadedPosts = (receivedPosts: Post[], hasError = false) => {
if (hasError) {
const errorMessageData: Notification = {
typeNotification: 'danger',
text: 'Error loading posts',
dataCypress: 'PostsLoadingError',
};

setIsError(true);
setNotificationData(errorMessageData);

return;
}

if (receivedPosts.length === 0 && !hasError) {
const errorMessageData: Notification = {
vintwp marked this conversation as resolved.
Show resolved Hide resolved
typeNotification: 'warning',
text: 'No posts yet',
dataCypress: 'NoPostsYet',
};

setIsError(true);
setNotificationData(errorMessageData);

return;
}

setIsError(false);
setPosts(receivedPosts);
};

useEffect(() => {
if (selectedUser) {
setIsError(false);
setIsLoading(true);
client.get<Post[]>(URL_GET_POSTS + selectedUser.id)
.then((downloadedPosts) => {
handlerLoadedPosts(downloadedPosts, false);
})
.catch(() => handlerLoadedPosts(posts, true))
.finally(() => setIsLoading(false));
}
}, [selectedUser]);

// #endregion

// #region Select-post
const onSelectPost = (post: Post) => {
if (selectedPost) {
if (selectedPost.id === post.id) {
setSelectedPost(null);
vintwp marked this conversation as resolved.
Show resolved Hide resolved

return;
}
}

setSelectedPost(post);
};

// #endregion

return (
<main className="section">
<div className="container">
<div className="tile is-ancestor">
<div className="tile is-parent">
<div className="tile is-child box is-success">
<div className="block">
<UserSelector />
<MemoUserSelector
users={users}
selectedUser={selectedUser}
onUserSelect={onUserSelect}
/>
</div>

<div className="block" data-cy="MainContent">
<p data-cy="NoSelectedUser">
No user selected
</p>

<Loader />
{!selectedUser && (
<p data-cy="NoSelectedUser">
No user selected
</p>
)}
{isLoading && (
<Loader />
)}

<div
className="notification is-danger"
data-cy="PostsLoadingError"
>
Something went wrong!
</div>
{isError && notificationData && (
<NotificationMessage
data={notificationData}
/>
)}

<div className="notification is-warning" data-cy="NoPostsYet">
No posts yet
</div>
{posts.length > 0 && !isError && !isLoading && (
<PostsList
posts={posts}
onSelectPost={onSelectPost}
/>
)}

<PostsList />
</div>
</div>
</div>

<div
data-cy="Sidebar"
className={classNames(
'tile',
'is-parent',
'is-8-desktop',
'Sidebar',
'Sidebar--open',
)}
>
<div className="tile is-child box is-success ">
<PostDetails />
</div>
</div>
<MemoSidebar
selectedPost={selectedPost}
/>
</div>
</div>
</main>
Expand Down
103 changes: 0 additions & 103 deletions src/components/NewCommentForm.tsx

This file was deleted.

Loading
Loading