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 #889

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
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);
},
);
34 changes: 12 additions & 22 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
91 changes: 71 additions & 20 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect, useState } from 'react';
import 'bulma/bulma.sass';
import '@fortawesome/fontawesome-free/css/all.css';
import './App.scss';
Expand All @@ -9,37 +9,84 @@ import { PostDetails } from './components/PostDetails';
import { UserSelector } from './components/UserSelector';
import { Loader } from './components/Loader';

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

import { getPosts } from './api/ApiMethods';

export const App: React.FC = () => {
const [selectUser, setSelectUser] = useState<User | null>(null);
const [userPosts, setUserPosts] = useState<Post[]>([]);

Choose a reason for hiding this comment

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

Suggested change
const [selectUser, setSelectUser] = useState<User | null>(null);
const [selectedUser, setSelectedUser] = useState<User | null>(null);

const [loading, setLoading] = useState(false);
const [hasSelect, setHasSelect] = useState(false);
const [hasError, setHasError] = useState(false);
const [openPost, setOpenPost] = useState<Post | null>(null);
const [openForm, setOpenForm] = useState(false);

Choose a reason for hiding this comment

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

Suggested change
const [openForm, setOpenForm] = useState(false);
const [isFormOpen, setIsFormOpen] = useState(false);

fix everywhere: https://dev.to/michi/tips-on-naming-boolean-variables-cleaner-code-35ig

useEffect(() => {
if (selectUser) {
setLoading(true);
setHasError(false);

getPosts(selectUser.id)
.then(posts => setUserPosts(posts))
.catch(() => setHasError(true))

Choose a reason for hiding this comment

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

Suggested change
.then(posts => setUserPosts(posts))
.then(setUserPosts)

we can simplify this logic

.finally(() => {
setLoading(false);
setHasSelect(true);
});

Choose a reason for hiding this comment

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

you may just check selectedUser variable instead of creating an additional state

}
}, [selectUser]);

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 />
<UserSelector
setSelectUser={setSelectUser}
selectUser={selectUser}
/>
</div>

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

{loading ? (
<Loader />
) : (
<div className="block" data-cy="MainContent">
{!selectUser && (
<p data-cy="NoSelectedUser">No user selected</p>
)}

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

<div className="notification is-warning" data-cy="NoPostsYet">
No posts yet
</div>
{userPosts.length === 0 && hasSelect && (
<div
className="notification is-warning"
data-cy="NoPostsYet"
>
No posts yet
</div>
)}

<PostsList />
</div>
{userPosts.length !== 0 && (
<PostsList
userPosts={userPosts}
setOpenPost={setOpenPost}
openPost={openPost}
setOpenForm={setOpenForm}
/>
)}
</div>
)}
</div>
</div>

Expand All @@ -50,11 +97,15 @@ export const App: React.FC = () => {
'is-parent',
'is-8-desktop',
'Sidebar',
'Sidebar--open',
{ 'Sidebar--open': openPost },
)}
>
<div className="tile is-child box is-success ">
<PostDetails />
<PostDetails
openPost={openPost}
setOpenForm={setOpenForm}
openForm={openForm}
/>
</div>
</div>
</div>
Expand Down
24 changes: 24 additions & 0 deletions src/api/ApiMethods.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { User } from '../types/User';
import { Post } from '../types/Post';
import { Comment } from '../types/Comment';
import { client } from '../utils/fetchClient';

export const getUsers = () => {
return client.get<User[]>('/users');
};

export const getPosts = (id: number) => {
return client.get<Post[]>(`/posts?userId=${id}`);
};

export const getComment = (id: number) => {
return client.get<Comment[]>(`/comments?postId=${id}`);
};

export const addComment = (data: Omit<Comment, 'id'>) => {
return client.post<Comment>('/comments', data);
};

export const deleteComment = (id: number) => {
return client.delete(`/comments/${id}`);
};
Loading
Loading