Solution

Dima-Semenov · Feb 16, 2021 · fb15098 · fb15098
1 parent 940229c
commit fb15098
Show file tree

Hide file tree

Showing 30 changed files with 1,782 additions and 173 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,17 +1,23 @@
 {
   "name": "modal",
+  "homepage": "https://Dima-Semenov.github.io/goods",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.7.1",
+    "classnames": "^2.2.6",
+    "gh-pages": "^3.1.0",
+    "node-sass": "^4.14.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-scripts": "4.0.2",
     "web-vitals": "^1.1.0"
   },
   "scripts": {
+    "predeploy": "npm run build",
+    "deploy": "gh-pages -d build",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",

diff --git a/public/index.html b/public/index.html
@@ -10,34 +10,9 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
     <title>React App</title>
   </head>
   <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/src/App.css b/src/App.css
diff --git a/src/App.js b/src/App.js
diff --git a/src/App.jsx b/src/App.jsx
@@ -0,0 +1,26 @@
+import React, { useEffect, useState } from 'react';
+import { getInfo } from './api';
+import './App.scss';
+import { GoodsList } from './Components/GoodsList/GoodsList';
+
+export function App() {
+  const [data, setData] = useState([]);
+
+  useEffect(() => {
+    getInfo()
+      .then(result => setData(
+        result.map((item, index) => ({
+            ...item,
+            id: index + 1,
+          })
+        )
+      ));
+
+  }, [])
+
+  return (
+    <div className="App">
+      <GoodsList data={data} />
+    </div>
+  );
+}
diff --git a/src/App.scss b/src/App.scss
@@ -0,0 +1,13 @@
+.App {
+  text-align: center;
+  position: relative;
+  padding: 100px 20px;
+  max-width: 1600px;
+  margin: 0 auto;
+}
+
+@media screen and (max-width: 400px) {
+  .App {
+    padding: 50px 20px;
+  }
+}
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/Components/CurrentGood/CurrentGood.jsx b/src/Components/CurrentGood/CurrentGood.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import '../CurrentGood/currentGood.scss';
+import PropTypes from 'prop-types';
+
+export const CurrentGood = ({good, setIsOpen, setData}) => {
+
+  return (
+    <div className="good">
+      <p className="good__category">{good.category}</p>
+      <h3 className="good__name">{good.name}</h3>
+
+      <div className="good__container">
+        <p className="good__price">
+          <span className="good__icon">$</span>
+          {good.price}
+        </p>
+        <button
+          type="button"
+          className="good__button"
+          onClick={() => {
+            setIsOpen(true)
+            setData(good)
+          }}
+        >
+          buy
+        </button>
+      </div>
+    </div>
+  );
+}
+
+CurrentGood.propTypes = {
+  good: PropTypes.shape({
+      category: PropTypes.string.isRequired,
+      name: PropTypes.string.isRequired,
+      price: PropTypes.number.isRequired,
+    }).isRequired,
+  setIsOpen: PropTypes.func.isRequired,
+  setData: PropTypes.func.isRequired,
+}
diff --git a/src/Components/CurrentGood/currentGood.scss b/src/Components/CurrentGood/currentGood.scss
@@ -0,0 +1,86 @@
+@import '../../utils/mixins.scss';
+@import '../../utils/vars.scss';
+
+.good {
+  width: 352px;
+  height: 256px;
+
+  padding: 32px;
+
+  background: $wh-color;
+  border-radius: $medium-radius;
+
+  &__category {
+    @include goodCategory;
+  }
+
+  &__name {
+    @include goodName;
+  }
+
+  &__container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  &__price {
+    @include goodPrice;
+  }
+
+  &__icon {
+    @include goodIcon;
+  }
+
+  &__button {
+    @include smallFont;
+
+    width: 64px;
+    height: 56px;
+
+    color: $main-color;
+    background-color: $wh-color;
+
+    letter-spacing: $small-spacing;
+
+    text-transform: uppercase;
+    outline: none;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: $small-radius;
+
+    &:hover {
+      color: $wh-color;
+      background: $main-color;
+      border: none;
+    }
+  }
+}
+
+@media screen and (max-width: 400px) {
+  .good {
+    padding: 16px;
+    height: 160px;
+
+    &__name {
+      font-size: 20px;
+      line-height: 20px;
+      margin-bottom: 20px;
+    }
+
+    &__category {
+      font-size: 12px;
+      margin: 0;
+    }
+
+    &__price {
+      font-size: 40px;
+      line-height: 40px;
+    }
+
+    &__icon {
+      font-size: 20px;
+      line-height: 20px;
+      margin: 8px 3px 0 0;
+    }
+  }
+}
diff --git a/src/Components/GoodsList/GoodsList.jsx b/src/Components/GoodsList/GoodsList.jsx
@@ -0,0 +1,58 @@
+import React, { useState } from 'react';
+import { CurrentGood } from '../CurrentGood/CurrentGood';
+import '../GoodsList/goodsList.scss';
+import { Loader } from '../Loader/Loader';
+import { ModalWindow } from '../ModalWindow/ModalWindow';
+import PropTypes from 'prop-types';
+
+export const GoodsList = ({data}) => {
+  const [isOpenWindow, setIsOpenWindow] = useState(false);
+  const [windowData, setWindowData] = useState(null);
+
+  const minValue = () => {
+    let min = data[0].price;
+
+    for (let i = 0; i < data.length; i++) {
+      if (data[i].price < min) {
+        min = data[i].price;
+        setWindowData(data[i]);
+      }
+    }
+    setIsOpenWindow(true);
+  }
+
+  if (data.length === 0) {
+    return (
+      <Loader />
+    );
+  }
+
+  return (
+    <>
+      {isOpenWindow && <ModalWindow data={windowData} reset={setIsOpenWindow} />}
+      <div className="goods">
+        {
+          data.map(item => (
+            <CurrentGood
+              key={item.id}
+              good={item}
+              setIsOpen={setIsOpenWindow}
+              setData={setWindowData}
+            />
+          ))
+        }
+      </div>
+      <button
+        type="button"
+        className="goods__button"
+        onClick={minValue}
+      >
+        Buy cheapest
+      </button>
+    </>
+  );
+}
+
+GoodsList.propTypes = {
+  data: PropTypes.array.isRequired,
+}