2 years ago · 85c9868f42
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,23 @@
 
				- 
			
 
				+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
			
 
				+
			
 
				+# dependencies
			
 
				+**/node_modules
			
 
				+**/.pnp
			
 
				+**.pnp.js
			
 
				+
			
 
				+# testing
			
 
				+**/coverage
			
 
				+
			
 
				+# production
			
 
				+**/build
			
 
				+
			
 
				+# misc
			
 
				+**.DS_Store
			
 
				+**.env.local
			
 
				+**.env.development.local
			
 
				+**.env.test.local
			
 
				+**.env.production.local
			
 
				+
			
 
				+**npm-debug.log*
			
 
				+**yarn-debug.log*
			
 
				+**yarn-error.log*
			
--- a/js/20_canvas-2/index.js
+++ b/js/20_canvas-2/index.js
@@ -224,6 +224,8 @@ class Line extends Drawable {
 
				         let lineAngle = Math.atan2(this.height, this.width);
			
 
				         let mouseAngle = Math.atan2(y - this.y, x - this.x);
			
 
				         let lineTurnAngle = mouseAngle - lineAngle;
			
 
				+        let cursorWidth = distance(this.x,this.y,x,y);
			
 
				+
			
 
				         let rotX = Math.cos(lineTurnAngle) * distance(x,y,this.x,this.y);
			
 
				         let rotY = Math.sin(lineTurnAngle) * distance(x,y,this.x,this.y);
			
 
				         
			
--- a/js/22/index.html
+++ b/js/22/index.html
@@ -1,13 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				-<head>
			
 
				-   <meta charset="UTF-8">
			
 
				-   <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-   <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-   <title>Document</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-   
			
 
				-   <script src="./index.js"></script>
			
 
				-</body>
			
 
				-</html>
			
--- a/js/22/index.js
+++ b/js/22/index.js
@@ -1,24 +0,0 @@
 
				-htmlTree()
			
 
				-function htmlTree() {
			
 
				-
			
 
				-}
			
 
				-
			
 
				-htmlTree()
			
 
				-function htmlTree() {
			
 
				-
			
 
				-}
			
 
				-
			
 
				-htmlTree()
			
 
				-function htmlTree() {
			
 
				-
			
 
				-}
			
 
				-
			
 
				-htmlTree()
			
 
				-function htmlTree() {
			
 
				-
			
 
				-}
			
 
				-
			
 
				-htmlTree()
			
 
				-function htmlTree() {
			
 
				-
			
 
				-}
			
--- a/js/22_react/package-lock.json
+++ b/js/22_react/package-lock.json
--- a/js/22_react/package.json
+++ b/js/22_react/package.json
@@ -0,0 +1,5 @@
 
				+{
			
 
				+  "dependencies": {
			
 
				+    "create-react-app": "^5.0.0"
			
 
				+  }
			
 
				+}
			
--- a/js/22_react/shop/.gitignore
+++ b/js/22_react/shop/.gitignore
@@ -0,0 +1,23 @@
 
				+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
			
 
				+
			
 
				+# dependencies
			
 
				+/node_modules
			
 
				+/.pnp
			
 
				+.pnp.js
			
 
				+
			
 
				+# testing
			
 
				+/coverage
			
 
				+
			
 
				+# production
			
 
				+/build
			
 
				+
			
 
				+# misc
			
 
				+.DS_Store
			
 
				+.env.local
			
 
				+.env.development.local
			
 
				+.env.test.local
			
 
				+.env.production.local
			
 
				+
			
 
				+npm-debug.log*
			
 
				+yarn-debug.log*
			
 
				+yarn-error.log*
			
--- a/js/22_react/shop/README.md
+++ b/js/22_react/shop/README.md
@@ -0,0 +1,70 @@
 
				+# Getting Started with Create React App
			
 
				+
			
 
				+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
			
 
				+
			
 
				+## Available Scripts
			
 
				+
			
 
				+In the project directory, you can run:
			
 
				+
			
 
				+### `npm start`
			
 
				+
			
 
				+Runs the app in the development mode.\
			
 
				+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
			
 
				+
			
 
				+The page will reload when you make changes.\
			
 
				+You may also see any lint errors in the console.
			
 
				+
			
 
				+### `npm test`
			
 
				+
			
 
				+Launches the test runner in the interactive watch mode.\
			
 
				+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
			
 
				+
			
 
				+### `npm run build`
			
 
				+
			
 
				+Builds the app for production to the `build` folder.\
			
 
				+It correctly bundles React in production mode and optimizes the build for the best performance.
			
 
				+
			
 
				+The build is minified and the filenames include the hashes.\
			
 
				+Your app is ready to be deployed!
			
 
				+
			
 
				+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
			
 
				+
			
 
				+### `npm run eject`
			
 
				+
			
 
				+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
			
 
				+
			
 
				+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
			
 
				+
			
 
				+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
			
 
				+
			
 
				+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
			
 
				+
			
 
				+## Learn More
			
 
				+
			
 
				+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
			
 
				+
			
 
				+To learn React, check out the [React documentation](https://reactjs.org/).
			
 
				+
			
 
				+### Code Splitting
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
			
 
				+
			
 
				+### Analyzing the Bundle Size
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
			
 
				+
			
 
				+### Making a Progressive Web App
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
			
 
				+
			
 
				+### Advanced Configuration
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
			
 
				+
			
 
				+### Deployment
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
			
 
				+
			
 
				+### `npm run build` fails to minify
			
 
				+
			
 
				+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
			
--- a/js/22_react/shop/package-lock.json
+++ b/js/22_react/shop/package-lock.json
--- a/js/22_react/shop/package.json
+++ b/js/22_react/shop/package.json
@@ -0,0 +1,42 @@
 
				+{
			
 
				+  "name": "shop",
			
 
				+  "version": "0.1.0",
			
 
				+  "private": true,
			
 
				+  "dependencies": {
			
 
				+    "@testing-library/jest-dom": "^5.16.1",
			
 
				+    "@testing-library/react": "^12.1.2",
			
 
				+    "@testing-library/user-event": "^13.5.0",
			
 
				+    "react": "^17.0.2",
			
 
				+    "react-dom": "^17.0.2",
			
 
				+    "react-redux": "^7.2.6",
			
 
				+    "react-scripts": "5.0.0",
			
 
				+    "redux": "^4.1.2",
			
 
				+    "redux-thunk": "^2.4.1",
			
 
				+    "sass": "^1.45.0",
			
 
				+    "web-vitals": "^2.1.2"
			
 
				+  },
			
 
				+  "scripts": {
			
 
				+    "start": "react-scripts start",
			
 
				+    "build": "react-scripts build",
			
 
				+    "test": "react-scripts test",
			
 
				+    "eject": "react-scripts eject"
			
 
				+  },
			
 
				+  "eslintConfig": {
			
 
				+    "extends": [
			
 
				+      "react-app",
			
 
				+      "react-app/jest"
			
 
				+    ]
			
 
				+  },
			
 
				+  "browserslist": {
			
 
				+    "production": [
			
 
				+      ">0.2%",
			
 
				+      "not dead",
			
 
				+      "not op_mini all"
			
 
				+    ],
			
 
				+    "development": [
			
 
				+      "last 1 chrome version",
			
 
				+      "last 1 firefox version",
			
 
				+      "last 1 safari version"
			
 
				+    ]
			
 
				+  }
			
 
				+}
			
--- a/js/22_react/shop/public/favicon.ico
+++ b/js/22_react/shop/public/favicon.ico
--- a/js/22_react/shop/public/index.html
+++ b/js/22_react/shop/public/index.html
@@ -0,0 +1,43 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="en">
			
 
				+  <head>
			
 
				+    <meta charset="utf-8" />
			
 
				+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1" />
			
 
				+    <meta name="theme-color" content="#000000" />
			
 
				+    <meta
			
 
				+      name="description"
			
 
				+      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>
			
--- a/js/22_react/shop/public/logo192.png
+++ b/js/22_react/shop/public/logo192.png
--- a/js/22_react/shop/public/logo512.png
+++ b/js/22_react/shop/public/logo512.png
--- a/js/22_react/shop/public/manifest.json
+++ b/js/22_react/shop/public/manifest.json
@@ -0,0 +1,25 @@
 
				+{
			
 
				+  "short_name": "React App",
			
 
				+  "name": "Create React App Sample",
			
 
				+  "icons": [
			
 
				+    {
			
 
				+      "src": "favicon.ico",
			
 
				+      "sizes": "64x64 32x32 24x24 16x16",
			
 
				+      "type": "image/x-icon"
			
 
				+    },
			
 
				+    {
			
 
				+      "src": "logo192.png",
			
 
				+      "type": "image/png",
			
 
				+      "sizes": "192x192"
			
 
				+    },
			
 
				+    {
			
 
				+      "src": "logo512.png",
			
 
				+      "type": "image/png",
			
 
				+      "sizes": "512x512"
			
 
				+    }
			
 
				+  ],
			
 
				+  "start_url": ".",
			
 
				+  "display": "standalone",
			
 
				+  "theme_color": "#000000",
			
 
				+  "background_color": "#ffffff"
			
 
				+}
			
--- a/js/22_react/shop/public/robots.txt
+++ b/js/22_react/shop/public/robots.txt
@@ -0,0 +1,3 @@
 
				+# https://www.robotstxt.org/robotstxt.html
			
 
				+User-agent: *
			
 
				+Disallow:
			
--- a/js/22_react/shop/src/App.js
+++ b/js/22_react/shop/src/App.js
@@ -0,0 +1,337 @@
 
				+import logoDefault from './logo.svg';
			
 
				+import './App.scss';
			
 
				+import {Provider, connect}   from 'react-redux';
			
 
				+import {createStore, combineReducers, applyMiddleware} from 'redux';
			
 
				+import thunk from 'redux-thunk'
			
 
				+
			
 
				+function authReducer(state, { type, token }) {
			
 
				+  if (!state) {
			
 
				+      if (localStorage.authToken) {
			
 
				+          type = 'AUTH_LOGIN'
			
 
				+          token = localStorage.authToken
			
 
				+      } else state = {}
			
 
				+  }
			
 
				+  if (type === 'AUTH_LOGIN') {
			
 
				+      localStorage.setItem('authToken', token)
			
 
				+      let payload = jwtDecode(token)
			
 
				+      if (typeof payload === 'object') {
			
 
				+          return {
			
 
				+              ...state,
			
 
				+              token,
			
 
				+              payload
			
 
				+          }
			
 
				+      } else return state
			
 
				+  }
			
 
				+  if (type === 'AUTH_LOGOUT') {
			
 
				+      localStorage.removeItem('authToken')
			
 
				+      return {}
			
 
				+  }
			
 
				+  return state
			
 
				+}
			
 
				+
			
 
				+const jwtDecode = token => {
			
 
				+  try {
			
 
				+      let arrToken = token.split('.')
			
 
				+      let base64Token = atob(arrToken[1])
			
 
				+      return JSON.parse(base64Token)
			
 
				+  }
			
 
				+  catch (e) {
			
 
				+      console.log('Лажа, Бро ' + e);
			
 
				+  }
			
 
				+}
			
 
				+const actionAuthLogin = token => ({ type: 'AUTH_LOGIN', token })
			
 
				+const actionAuthLogout = () => ({ type: 'AUTH_LOGOUT' })
			
 
				+
			
 
				+
			
 
				+
			
 
				+const actionLogin = (login, password) =>
			
 
				+    actionPromise('login', gql(`query NameForMe1($login:String, $password:String){
			
 
				+            login(login:$login, password:$password)
			
 
				+        }`, { login, password }))
			
 
				+
			
 
				+
			
 
				+function cartReducer(state = {}, { type, good = {}, count = 1 }) {
			
 
				+    const { _id } = good
			
 
				+    const types = {
			
 
				+        CART_ADD() {
			
 
				+            count = +count
			
 
				+            if (!count) return state
			
 
				+            return {
			
 
				+                ...state,
			
 
				+                [_id]: {
			
 
				+                    good,
			
 
				+                    count: count + (state[_id]?.count || 0)
			
 
				+                }
			
 
				+            }
			
 
				+        },
			
 
				+        CART_CHANGE() {
			
 
				+            count = +count
			
 
				+            if (!count) return state
			
 
				+            return {
			
 
				+                ...state,
			
 
				+                [_id]: {
			
 
				+                    good,
			
 
				+                    count: count
			
 
				+                }
			
 
				+            }
			
 
				+        },
			
 
				+        CART_REMOVE() {
			
 
				+            let { [_id]: remove, ...newState } = state
			
 
				+            return {
			
 
				+                ...newState
			
 
				+            }
			
 
				+        },
			
 
				+        CART_CLEAR() {
			
 
				+            return {}
			
 
				+        },
			
 
				+    }
			
 
				+    if (type in types) {
			
 
				+        return types[type]()
			
 
				+    }
			
 
				+    return state
			
 
				+}
			
 
				+
			
 
				+const actionCartAdd = (good, count) => ({type: 'CART_ADD', good, count})
			
 
				+const actionCartChange = (good, count) => ({type: 'CART_CHANGE', good, count})
			
 
				+const actionCartRemove = (good) => ({type: 'CART_REMOVE', good})
			
 
				+const actionCartClear = () => ({type: 'CART_CLEAR'})
			
 
				+
			
 
				+
			
 
				+
			
 
				+function promiseReducer(state = {}, { type, status, payload, error, name }) {
			
 
				+    if (type === 'PROMISE') {
			
 
				+        return {
			
 
				+            ...state,
			
 
				+            [name]: { status, payload, error }
			
 
				+        }
			
 
				+    }
			
 
				+    return state;
			
 
				+}
			
 
				+
			
 
				+const actionPending = name => ({ type: 'PROMISE', status: 'PENDING', name })
			
 
				+const actionResolved = (name, payload) => ({ type: 'PROMISE', status: 'RESOLVED', name, payload })
			
 
				+const actionRejected = (name, error) => ({ type: 'PROMISE', status: 'REJECTED', name, error })
			
 
				+
			
 
				+
			
 
				+const actionPromise = (name, promise) => (
			
 
				+    async dispatch => {
			
 
				+        dispatch(actionPending(name))
			
 
				+        try {
			
 
				+            let data = await promise
			
 
				+            dispatch(actionResolved(name, data))
			
 
				+            return data
			
 
				+        }
			
 
				+        catch (error) {
			
 
				+            dispatch(actionRejected(name, error))
			
 
				+        }
			
 
				+    }
			
 
				+)
			
 
				+
			
 
				+
			
 
				+const actionRootCats = () => (
			
 
				+    actionPromise('rootCats', gql(`query {
			
 
				+            CategoryFind(query: "[{\\"parent\\":null}]"){
			
 
				+                _id name
			
 
				+            }
			
 
				+        }`))
			
 
				+)
			
 
				+
			
 
				+
			
 
				+const actionCatById = (_id) => (
			
 
				+    actionPromise('catById', gql(`query catById($q: String){
			
 
				+            CategoryFindOne(query: $q){
			
 
				+                subCategories{name, _id}
			
 
				+                _id name goods {
			
 
				+                    _id name price images {
			
 
				+                        url
			
 
				+                    }
			
 
				+                }
			
 
				+            }
			
 
				+        }`, { q: JSON.stringify([{ _id }]) }))
			
 
				+)
			
 
				+
			
 
				+const getGQL = url => (
			
 
				+    async (query, variables = {}) => {
			
 
				+        let obj = await fetch(url, {
			
 
				+            method: 'POST',
			
 
				+            headers: {
			
 
				+                "Content-Type": "application/json",
			
 
				+                Authorization: localStorage.authToken ? 'Bearer ' + localStorage.authToken : {},
			
 
				+            },
			
 
				+            body: JSON.stringify({ query, variables })
			
 
				+        })
			
 
				+        let a = await obj.json()
			
 
				+        if (!a.data && a.errors)
			
 
				+            throw new Error(JSON.stringify(a.errors))
			
 
				+        return a.data[Object.keys(a.data)[0]]
			
 
				+    }
			
 
				+)
			
 
				+
			
 
				+const backURL = 'http://shop-roles.asmer.fs.a-level.com.ua'
			
 
				+const gql = getGQL(backURL + '/graphql');
			
 
				+
			
 
				+
			
 
				+const store = createStore(combineReducers({promise: promiseReducer, auth: authReducer, cart: cartReducer}),
			
 
				+                                  applyMiddleware(thunk))
			
 
				+
			
 
				+store.subscribe(() => console.log(store.getState()))
			
 
				+
			
 
				+store.dispatch(actionRootCats())
			
 
				+
			
 
				+store.dispatch(actionCatById('5dc49f4d5df9d670df48cc64'))
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+const Logo = ({logo}) => (
			
 
				+  <a href='#' className="Logo">
			
 
				+      <img src={logo} />
			
 
				+  </a>
			
 
				+)
			
 
				+
			
 
				+const Koshik = ({cart}) => {
			
 
				+  let count = 0;
			
 
				+  console.log(cart)
			
 
				+  let sum = Object.entries(cart).map(([, val]) => val.count)
			
 
				+  count = sum.reduce((a, b) => a + b, 0)
			
 
				+  return (
			
 
				+      <div className='Koshik'>{count}</div>
			
 
				+  )
			
 
				+}
			
 
				+
			
 
				+const CKoshik = connect(({cart}) => ({cart}))(Koshik)
			
 
				+
			
 
				+
			
 
				+const Header = ({logo=logoDefault}) => (
			
 
				+  <header>
			
 
				+      <CKoshik />
			
 
				+      <Logo logo={logo} />
			
 
				+  </header>
			
 
				+)
			
 
				+
			
 
				+
			
 
				+const defaultRootCats = [
			
 
				+  {_id: '5dc49f4d5df9d670df48cc64', name: 'Airconditions'},
			
 
				+  {_id: '5dc458985df9d670df48cc47', name: '     Smartphones'},
			
 
				+  {_id: '5dc4b2553f23b553bf354101', name: 'Крупная бытовая техника'},
			
 
				+  {_id: '5dcac1b56d09c45440d14cf8', name: 'Макароны'},
			
 
				+  {_id: '5dcac6cf6d09c45440d14cfd', name: 'Drinks'},
			
 
				+  {_id: '5dcacaeb6d09c45440d14d04', name: 'Салаты'},
			
 
				+  {_id: '61715b92ef4e1b3e3b67703c', name: 'Приятный бонус'},
			
 
				+]
			
 
				+
			
 
				+const RootCategory = ({cat:{_id, name}={}}) => (
			
 
				+  <li>
			
 
				+    <a href={`#/category/${_id}`}>{name}</a>
			
 
				+  </li>
			
 
				+)
			
 
				+
			
 
				+const RootCategories = ({cats=defaultRootCats}) => (
			
 
				+  <ul className='RootCategories'>
			
 
				+    {cats.map(cat => <RootCategory cat={cat}/>)}
			
 
				+  </ul>
			
 
				+)
			
 
				+
			
 
				+const CRootCategories = connect(state => ({cats: state.promise.rootCats?.payload || []}))(RootCategories)
			
 
				+
			
 
				+
			
 
				+const Aside = ({}) => (
			
 
				+  <aside>
			
 
				+      <CRootCategories/>
			
 
				+  </aside>
			
 
				+)
			
 
				+
			
 
				+const Content = ({children}) => (
			
 
				+<div className='Content'>
			
 
				+    {children}
			
 
				+</div>
			
 
				+)
			
 
				+
			
 
				+const SubCategories = ({cats}) => (
			
 
				+<></>
			
 
				+)
			
 
				+
			
 
				+const GoodCard = ({good:{_id, name, price, images}={}, onCartAdd}) =>
			
 
				+<div className='GoodCard'>
			
 
				+    <h2>{name}</h2>
			
 
				+    {images && images[0] && images[0].url && <img src={backURL + '/' + images[0].url} />}
			
 
				+    <strong>{price}</strong>
			
 
				+    <button onClick={() => onCartAdd({_id, name, price, images})}>+</button>
			
 
				+</div>
			
 
				+
			
 
				+const CGoodCard = connect(null, {onCartAdd: actionCartAdd})(GoodCard)
			
 
				+
			
 
				+const Category = ({cat:{_id, name, goods, subCategories}}) => (
			
 
				+  <div className="Category">
			
 
				+    <h1>{name}</h1>
			
 
				+    {subCategories && <SubCategories cats={subCategories}/>}
			
 
				+    {(goods || []).map(good => <CGoodCard good={good}/>)}
			
 
				+  </div>
			
 
				+)
			
 
				+
			
 
				+const CCategory = connect(state => ({cat: state.promise.catById?.payload || []}))(Category)
			
 
				+
			
 
				+
			
 
				+const Main = ({}) => (
			
 
				+  <main>
			
 
				+      <Aside />
			
 
				+      <Content>
			
 
				+        <CCategory/>
			
 
				+      </Content>
			
 
				+  </main>
			
 
				+)
			
 
				+
			
 
				+const Footer = ({logo=logoDefault}) => (
			
 
				+  <footer>
			
 
				+      <Logo logo={logo} />
			
 
				+  </footer>
			
 
				+)
			
 
				+
			
 
				+
			
 
				+
			
 
				+const JSONTest = ({data}) => (
			
 
				+  <pre>
			
 
				+    {JSON.stringify(data, null, 4)}
			
 
				+    {Math.random() > 0.5 ? <h1>qqqqqq</h1> : <h2>qq</h2>}
			
 
				+    {Math.random() > 0.5 && <h1>zzzz</h1>}
			
 
				+  </pre>
			
 
				+)
			
 
				+
			
 
				+const ReduxJSON = connect(state => ({data: state}))(JSONTest)
			
 
				+
			
 
				+
			
 
				+const ListItem = ({item}) => (
			
 
				+  <li>{item}</li>
			
 
				+)
			
 
				+
			
 
				+
			
 
				+const List = ({data=["пиво", "чипсы", "сиги",]}) => (
			
 
				+  <ul>
			
 
				+    {/* {[  <ListItem item={data[0]}/>,
			
 
				+        <ListItem item={data[1]}/>,
			
 
				+        <ListItem item={data[2]}/>  
			
 
				+    ]} */}
			
 
				+    {data.map(item => <ListItem item={item}/>)}
			
 
				+  </ul>
			
 
				+)
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+function App() {
			
 
				+  return (
			
 
				+    <Provider store={store}> 
			
 
				+      <div className="App">
			
 
				+        <Header />
			
 
				+        <Main />
			
 
				+        {/* <List /> */}
			
 
				+        {/* <JSONTest data={[1,2,{a:5}]} /> */}
			
 
				+        {/* <ReduxJSON /> */}
			
 
				+        <Footer />
			
 
				+      </div>
			
 
				+    </Provider>
			
 
				+  );
			
 
				+}
			
 
				+
			
 
				+export default App;
			
--- a/js/22_react/shop/src/App.scss
+++ b/js/22_react/shop/src/App.scss
@@ -0,0 +1,42 @@
 
				+
			
 
				+.Logo {
			
 
				+  img {
			
 
				+    max-height: 100px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.GoodCard {
			
 
				+  border: 1px solid black;
			
 
				+  border-radius: 15px;
			
 
				+  margin: 15px 0;
			
 
				+  img {
			
 
				+    max-width: 300px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.App {
			
 
				+  text-align: center;
			
 
				+  header {
			
 
				+    .Logo {
			
 
				+      img {
			
 
				+        max-height: 100px;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  main {
			
 
				+    display: flex;
			
 
				+    flex-direction: row;
			
 
				+    aside {
			
 
				+      width: 30%;
			
 
				+      background-color: cyan;
			
 
				+    }
			
 
				+  }
			
 
				+  footer {
			
 
				+    background-color: #303030;
			
 
				+    .Logo {
			
 
				+      img {
			
 
				+        max-height: 200px;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/js/22_react/shop/src/App.test.js
+++ b/js/22_react/shop/src/App.test.js
@@ -0,0 +1,8 @@
 
				+import { render, screen } from '@testing-library/react';
			
 
				+import App from './App';
			
 
				+
			
 
				+test('renders learn react link', () => {
			
 
				+  render(<App />);
			
 
				+  const linkElement = screen.getByText(/learn react/i);
			
 
				+  expect(linkElement).toBeInTheDocument();
			
 
				+});
			
--- a/js/22_react/shop/src/index.js
+++ b/js/22_react/shop/src/index.js
@@ -0,0 +1,17 @@
 
				+import React from 'react';
			
 
				+import ReactDOM from 'react-dom';
			
 
				+import './index.scss';
			
 
				+import App from './App';
			
 
				+import reportWebVitals from './reportWebVitals';
			
 
				+
			
 
				+ReactDOM.render(
			
 
				+  <React.StrictMode>
			
 
				+    <App />
			
 
				+  </React.StrictMode>,
			
 
				+  document.getElementById('root')
			
 
				+);
			
 
				+
			
 
				+// If you want to start measuring performance in your app, pass a function
			
 
				+// to log results (for example: reportWebVitals(console.log))
			
 
				+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
			
 
				+reportWebVitals();
			
--- a/js/22_react/shop/src/index.scss
+++ b/js/22_react/shop/src/index.scss
@@ -0,0 +1,13 @@
 
				+body {
			
 
				+  margin: 0;
			
 
				+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
			
 
				+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
			
 
				+    sans-serif;
			
 
				+  -webkit-font-smoothing: antialiased;
			
 
				+  -moz-osx-font-smoothing: grayscale;
			
 
				+}
			
 
				+
			
 
				+code {
			
 
				+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
			
 
				+    monospace;
			
 
				+}
			
--- a/js/22_react/shop/src/logo.svg
+++ b/js/22_react/shop/src/logo.svg
--- a/js/22_react/shop/src/reportWebVitals.js
+++ b/js/22_react/shop/src/reportWebVitals.js
@@ -0,0 +1,13 @@
 
				+const reportWebVitals = onPerfEntry => {
			
 
				+  if (onPerfEntry && onPerfEntry instanceof Function) {
			
 
				+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
			
 
				+      getCLS(onPerfEntry);
			
 
				+      getFID(onPerfEntry);
			
 
				+      getFCP(onPerfEntry);
			
 
				+      getLCP(onPerfEntry);
			
 
				+      getTTFB(onPerfEntry);
			
 
				+    });
			
 
				+  }
			
 
				+};
			
 
				+
			
 
				+export default reportWebVitals;
			
--- a/js/22_react/shop/src/setupTests.js
+++ b/js/22_react/shop/src/setupTests.js
@@ -0,0 +1,5 @@
 
				+// jest-dom adds custom jest matchers for asserting on DOM nodes.
			
 
				+// allows you to do things like:
			
 
				+// expect(element).toHaveTextContent(/react/i)
			
 
				+// learn more: https://github.com/testing-library/jest-dom
			
 
				+import '@testing-library/jest-dom';