Skip to content

Commit

Permalink
solution_OkM
Browse files Browse the repository at this point in the history
  • Loading branch information
Oksana-Maruniak committed Jan 30, 2024
1 parent 2a46adf commit 0605d67
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 20 deletions.
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://Oksana-Maruniak.github.io/react_dynamic-list-of-goods/) and add it to the PR description.
77 changes: 61 additions & 16 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,72 @@
import React from 'react';
import React, { useState } from 'react';
import './App.scss';
import { GoodsList } from './GoodsList';
import { Good } from './types/Good';

import { getAll, get5First, getRedGoods } from './api/goods';

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

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

// useEffect(() => {
// getAll()
// .then(setGoods);
// }, []);

const showAllGoods = () => {
getAll()
.then(arr => setGoods(arr));
};

// useEffect(() => {
// get5First()
// .then(setFiveGoods);
// }, []);

const showFiveGoods = () => {
get5First()
.then(arr => setGoods(arr));
};

const showRedGoods = () => {
getRedGoods()
.then(arr => setGoods(arr));
};

return (
<div className="App">
<h1>Dynamic list of Goods</h1>

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

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

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

<GoodsList goods={[]} />
</div>
);
<GoodsList goods={goods} />
</div>
);
};
6 changes: 5 additions & 1 deletion src/GoodsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ 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"
style={{ color: good.color }}
>
{good.name}
</li>
))}
Expand Down
15 changes: 13 additions & 2 deletions src/api/goods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,23 @@ export function getAll(): Promise<Good[]> {
.then(response => response.json());
}

// export const get5First = (goodName: string) => {
// return getAll<Good[]>()
// .then(goods => goods.sort(good1, good2) => {
// return good1.name.localeCompere(good2.name);
// }).slice(0, 6);
// };

export const get5First = () => {
return getAll()
.then(goods => goods); // sort and get the first 5
.then(goods => {
return goods.sort((good1, good2) => {
return good1.name.localeCompare(good2.name);
}).slice(0, 5);
});
};

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

0 comments on commit 0605d67

Please sign in to comment.