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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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 @@ -15,4 +15,4 @@ You have 3 button that should load [the goods](https://mate-academy.github.io/re
- 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_dynamic-list-of-goods/) and add it to the PR description.
- Replace `<your_account>` with your Github username in the [DEMO LINK](https://olena-ole.github.io/react_dynamic-list-of-goods/) and add it to the PR description.
66 changes: 47 additions & 19 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,55 @@
import React from 'react';
import React, { useState } from 'react';
import './App.scss';
import { GoodsList } from './GoodsList';
import { getAll, get5First, getRedGoods } from './api/goods';
import { Good } from './types/Good';

// import { getAll, get5First, getRed } from './api/goods';
// or
// import * as goodsAPI from './api/goods';
export const App: React.FC = () => {
const [currentGoods, setCurrentGoods] = useState<Good[]>([]);
const [errorMessage, setErrorMessage] = useState('');

export const App: React.FC = () => (
<div className="App">
<h1>Dynamic list of Goods</h1>
const handleClick = (fetchFromServer: () => Promise<Good[]>) => {
setErrorMessage('');
fetchFromServer()
.then(goods => {
setCurrentGoods(goods);
})
.catch(() => {
setErrorMessage('Something went wrong... Try again later!');
});
};

<button type="button" data-cy="all-button">
Load all goods
</button>
return (
<div className="App">
<h1>Dynamic list of Goods</h1>

<button type="button" data-cy="first-five-button">
Load 5 first goods
</button>
<button
type="button"
data-cy="all-button"
onClick={() => handleClick(getAll)}
>
Load all goods
</button>

<button type="button" data-cy="red-button">
Load red goods
</button>
<button
type="button"
data-cy="first-five-button"
onClick={() => handleClick(get5First)}
>
Load 5 first goods
</button>

<GoodsList goods={[]} />
</div>
);
<button
type="button"
data-cy="red-button"
onClick={() => handleClick(getRedGoods)}
>
Load red goods
</button>

{errorMessage
? <p>{errorMessage}</p>
: <GoodsList goods={currentGoods} />}
</div>
);
};
11 changes: 8 additions & 3 deletions src/GoodsList.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import React from 'react';
import { Good } from './types/Good';
import { arePropsEqual } from './utils';

type Props = {
goods: Good[]
};

export const GoodsList: React.FC<Props> = ({ goods }) => (
export const GoodsList: React.FC<Props> = React.memo(({ goods }) => (
<ul>
{goods.map(good => (
<li key={good.id} data-cy="good">
<li
key={good.id}
data-cy="good"
style={{ color: good.color }}
>
{good.name}
</li>
))}
</ul>
);
), arePropsEqual);
22 changes: 17 additions & 5 deletions src/api/goods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,27 @@ const API_URL = `https://mate-academy.github.io/react_dynamic-list-of-goods/good

export function getAll(): Promise<Good[]> {
return fetch(API_URL)
.then(response => response.json());
.then(response => {
if (!response.ok) {
throw new Error();
}

return response.json();
});
}

export const get5First = () => {
export const get5First = (): Promise<Good[]> => {
return getAll()
.then(goods => goods); // sort and get the first 5
.then(goods => {
const sortedGoods = goods.sort(
(good1, good2) => good1.name.localeCompare(good2.name),
);

return sortedGoods.slice(0, 5);
});
};

export const getRedGoods = () => {
export const getRedGoods = (): Promise<Good[]> => {
return getAll()
.then(goods => goods); // get only red
.then(goods => goods.filter(good => good.color === 'red'));
};
17 changes: 17 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Good } from './types/Good';

type Props = {
goods: Good[],
};

type Callback = (goods1: Props, good2: Props) => boolean;

export const arePropsEqual: Callback = (prevProps, nextProps) => {
if (prevProps.goods.length !== nextProps.goods.length) {
return false;
}

return prevProps.goods.every(
(good, index) => good.id === nextProps.goods[index].id,
);
};
Loading