From 0605d673eb09d896caaa66256d19b29344f5fa2e Mon Sep 17 00:00:00 2001 From: Oksana Maruniak Date: Wed, 31 Jan 2024 01:54:20 +0200 Subject: [PATCH] solution_OkM --- README.md | 2 +- src/App.tsx | 77 +++++++++++++++++++++++++++++++++++++---------- src/GoodsList.tsx | 6 +++- src/api/goods.ts | 15 +++++++-- 4 files changed, 80 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index aa688e6f2..24a337f32 100644 --- a/README.md +++ b/README.md @@ -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 `` with your Github username in the [DEMO LINK](https://.github.io/react_dynamic-list-of-goods/) and add it to the PR description. +- Replace `` 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. diff --git a/src/App.tsx b/src/App.tsx index 2cf5239da..b6ed66264 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -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 = () => ( -
-

Dynamic list of Goods

+export const App: React.FC = () => { + const [goods, setGoods] = useState([]); + // const [fiveGoods, setFiveGoods] = useState([]); + + // 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 ( +
+

Dynamic list of Goods

- + - + - + - -
-); + +
+ ); +}; diff --git a/src/GoodsList.tsx b/src/GoodsList.tsx index b56a4331e..45e78feef 100644 --- a/src/GoodsList.tsx +++ b/src/GoodsList.tsx @@ -8,7 +8,11 @@ type Props = { export const GoodsList: React.FC = ({ goods }) => (
    {goods.map(good => ( -
  • +
  • {good.name}
  • ))} diff --git a/src/api/goods.ts b/src/api/goods.ts index f0d1659f8..0b5a28e9a 100644 --- a/src/api/goods.ts +++ b/src/api/goods.ts @@ -8,12 +8,23 @@ export function getAll(): Promise { .then(response => response.json()); } +// export const get5First = (goodName: string) => { +// return getAll() +// .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')); };