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

add solution #2519

Open
wants to merge 1 commit 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 @@ -18,4 +18,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://YuriiMykhailenko.github.io/react_dynamic-list-of-goods/) and add it to the PR description.
12 changes: 11 additions & 1 deletion src/App.scss
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
// styles go here
.red {
color: rgb(255, 0, 0);
}

.green {
color: rgb(0, 128, 0);
}

.blue {
color: rgb(0, 0, 255);
}
57 changes: 38 additions & 19 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
import React from 'react';
import React, { useState } from 'react';
import './App.scss';
import { GoodsList } from './GoodsList';

// import { getAll, get5First, getRed } from './api/goods';
// or
// import * as goodsAPI from './api/goods';
import { getAll, get5First, getRedGoods } from './api/goods';
import { Good } from './types/Good';

export const App: React.FC = () => (
<div className="App">
<h1>Dynamic list of Goods</h1>
export const App: React.FC = () => {
const [visibleGoods, setVisibleGoods] = useState<Good[]>([]);

<button type="button" data-cy="all-button">
Load all goods
</button>
const handleSetAllData = () => {
return getAll().then(setVisibleGoods);
};

<button type="button" data-cy="first-five-button">
Load 5 first goods
</button>
const handleSetFirst5 = () => {
return get5First().then(setVisibleGoods);
};

<button type="button" data-cy="red-button">
Load red goods
</button>
const handleSetRed = () => {
return getRedGoods().then(setVisibleGoods);
};

<GoodsList goods={[]} />
</div>
);
return (
<div className="App">
<h1>Dynamic list of Goods</h1>

<button type="button" data-cy="all-button" onClick={handleSetAllData}>
Load all goods
</button>

<button
type="button"
data-cy="first-five-button"
onClick={handleSetFirst5}
>
Load 5 first goods
</button>

<button type="button" data-cy="red-button" onClick={handleSetRed}>
Load red goods
</button>

<GoodsList goods={visibleGoods} />
</div>
);
};
2 changes: 1 addition & 1 deletion src/GoodsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type Props = {
export const GoodsList: React.FC<Props> = ({ goods }) => (
<ul>
{goods.map(good => (
<li key={good.id} data-cy="good">
<li key={good.id} data-cy="good" className={good.color}>
{good.name}
</li>
))}
Expand Down
8 changes: 6 additions & 2 deletions src/api/goods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ export function getAll(): Promise<Good[]> {
}

export const get5First = () => {
return getAll().then(goods => goods); // sort and get the first 5
return getAll().then(goods =>
goods
.sort((g1, g2) => g1.name.localeCompare(g2.name))
.filter((_, index) => index < 5),
);
};

export const getRedGoods = () => {
return getAll().then(goods => goods); // get only red
return getAll().then(goods => goods.filter(good => good.color === 'red'));
};
Loading