Vika 3 anos atrás
pai
commit
5d588cfc7c

+ 23 - 0
react1/my-app/.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*

+ 70 - 0
react1/my-app/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)

Diferenças do arquivo suprimidas por serem muito extensas
+ 30163 - 0
react1/my-app/package-lock.json


+ 45 - 0
react1/my-app/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "my-app",
+  "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",
+    "node-sass": "^7.0.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",
+    "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"
+    ]
+  },
+  "devDependencies": {
+    "sass": "^1.45.0"
+  }
+}

BIN
react1/my-app/public/favicon.ico


+ 43 - 0
react1/my-app/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>

BIN
react1/my-app/public/logo192.png


BIN
react1/my-app/public/logo512.png


+ 25 - 0
react1/my-app/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"
+}

+ 3 - 0
react1/my-app/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

+ 362 - 0
react1/my-app/src/App.js

@@ -0,0 +1,362 @@
+import logo from './logo.svg';
+import './App.scss';
+import thunk from 'redux-thunk';
+import {createStore, combineReducers, applyMiddleware} from 'redux';
+import {Provider, connect} from 'react-redux';
+
+
+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)) // 1. {delay1000: {status: 'PENDING'}}
+        try{
+            let payload = await promise
+            dispatch(actionResolved(name, payload))
+            return payload
+        }
+        catch(error){
+            dispatch(actionRejected(name, error))
+        }
+    }
+
+const getGQL = url =>
+   (query, variables = {}) =>
+      fetch(url, {
+         //метод
+         method: 'POST',
+         headers: {
+            //заголовок content-type
+            "Content-Type": "application/json",
+            ...(localStorage.authToken ? { "Authorization": "Bearer " + localStorage.authToken } :
+               {})
+         },
+         //body с ключами query и variables 
+         body: JSON.stringify({ query, variables })
+      })
+         .then(res => res.json())
+         .then(data => {
+            if (data.errors && !data.data)
+               throw new Error(JSON.stringify(data.errors))
+            return data.data[Object.keys(data.data)[0]]
+         })
+
+const backendURL = "http://shop-roles.asmer.fs.a-level.com.ua" 
+const gql        = getGQL(backendURL + '/graphql')
+
+function jwtDecode(token) {
+    try {
+        let decoded = token.split('.')
+        decoded = decoded[1]
+        decoded = atob(decoded)
+        decoded = JSON.parse(decoded)
+        return decoded
+
+    } catch (e) {
+        return;
+    }
+}
+
+
+const actionRootCats = () =>
+    actionPromise('rootCats', gql(`query {
+        CategoryFind(query: "[{\\"parent\\":null}]"){
+            _id name
+        }
+    }`))
+
+
+const actionCartAdd = (good, count = 1) => ({ type: 'CART_ADD', good, count })
+const actionCartRemove = (good, count = 1) => ({ type: 'CART_REMOVE', good, count })
+const actionCartChange = (good, count = 1) => ({ type: 'CART_CHANGE', good, count })
+const actionCartClear = (good, count = 1) => ({ type: 'CART_CLEAR', good, count })
+
+function cartReducer(state = {}, { type, good={}, count=1}){
+    //{
+    //  _id1: {good, count}
+    //  _id2: {good, count}
+    //}
+    const {_id } = good
+    const types = {
+        CART_ADD() {
+            //как CHANGE, только если ключ раньше был, то достать из него count и добавить
+            //к count из action. Если не было, достать 0 и добавить к count из action
+            return {
+                ...state,
+                [_id]: { good, count: count + (state[_id]?.count || 0)}
+            }
+        },
+        CART_REMOVE(){ //смочь скопировать объект и выкинуть ключ. как вариант через
+                        //деструктуризацию
+            let newState = { ...state }
+            delete newState[_id]
+            return {
+                ...newState
+            }            
+        },
+        CART_CHANGE(){
+            return {
+                ...state, //по аналогии с promiseReducer дописать
+                    [_id]:{good, count}
+            }
+        },
+        CART_CLEAR(){
+            return {}
+        },
+    }
+
+    if (type in types)
+        return types[type]()
+
+
+    return state
+}
+
+function authReducer(state, {type, token}){
+    if (!state) {
+        if (localStorage.authToken) {
+            type = 'AUTH_LOGIN'
+            token = localStorage.authToken
+        } else {
+            return {}
+        }
+        //проверить localStorage.authToken на наличие
+        //если есть - сделать так, что бы следующий if сработал
+        //если нет - вернуть {}
+    }
+    if (type === 'AUTH_LOGIN') {
+        let auth = jwtDecode(token)
+        if (auth) {
+            localStorage.authToken = token
+            return { token, payload: auth }
+        }
+        //взять токен из action
+        //попытаться его jwtDecode
+        //если удалось, то:
+        //сохранить токен в localStorage
+        //вернуть объект вида {токен, payload: раскодированный токен}
+    }
+    if (type === 'AUTH_LOGOUT') {
+        localStorage.authToken = ''
+        return {}
+        //почистить localStorage
+        //вернуть пустой объект
+    }
+
+    return state
+}
+
+function promiseReducer(state={}, {type, name, status, payload, error}){
+    //{
+    //    login: {status, payload, error}
+    //    catById: {status, payload, error}
+    //}
+    if (type === 'PROMISE'){
+        return {
+            ...state,
+            [name]:{status, payload, error}
+        }
+    }
+    return state
+}
+
+// Actions =============================
+// Логин и логаут
+const actionAuthLogin = (token) => ({ type: 'AUTH_LOGIN', token })
+const actionAuthLogout = () => ({ type: 'AUTH_LOGOUT' })
+
+const actionLogin = (login = 'tst', password = '123') =>
+    actionPromise('login', gql(`query ($login:String, $password:String){ login(login:$login, password:$password)}`, { 'login': login, 'password': password }))
+
+const actionFullLogin = (login = 'tst', password = '123') =>
+    async dispatch => {
+        let token = await dispatch(actionLogin(login, password))
+        if (token) {
+            dispatch(actionAuthLogin(token))
+        }
+    }
+
+// Регистрация
+const actionRegister = (login = 'tst', password = '123') =>
+    actionPromise('login', gql(`mutation reg($login:String, $password:String) {
+        UserUpsert(user:{login:$login, password:$password, nick:$login}){
+          _id login
+        }
+      }`, { 'login': login, 'password': password }))
+
+const actionFullRegister = (login = 'tst', password = '123') =>
+    async dispatch => {
+        await dispatch(actionRegister(login, password))
+        await dispatch(actionFullLogin(login, password))
+    }
+
+// Корневые категории
+
+// Товары категории
+const actionCatById = (_id) =>
+    actionPromise('catById', gql(`query ($q: String){
+        CategoryFindOne(query: $q){
+            _id name goods {
+                _id name price images {
+                    url
+                }
+            } 
+            subCategories {
+                _id name
+            }
+        }
+    }`, { q: JSON.stringify([{ _id }]) }))
+
+const actionGoodById = (_id) =>
+    actionPromise('goodById', gql(`query ($good:String) {
+        GoodFindOne(query:$good) {
+          _id name price images {
+              url
+          }
+        }
+      }`, { good: JSON.stringify([{ _id }]) }))
+
+
+
+const store = createStore(combineReducers({promise: promiseReducer, 
+                                            auth: authReducer, 
+                                            cart: cartReducer}), applyMiddleware(thunk)) 
+store.subscribe(() => console.log(store.getState()))
+store.dispatch(actionRootCats())
+store.dispatch(actionCatById('5dc458985df9d670df48cc47'))
+
+
+const Logo = () =>
+<img src={logo} className="Logo" alt="logo" />
+
+const Header = () =>
+<header>
+    <Logo />
+    <CKoshik />
+</header>
+
+const CategoryListItem = ({_id, name}) =>
+<li><a href={`#/category/${_id}`}>{name}</a></li>
+
+const CategoryList = ({cats}) =>
+<ul>
+    {cats.map((item) => <CategoryListItem {...item} />)}
+</ul>
+
+const CCategoryList = connect(state => ({cats:state.promise.rootCats?.payload || []}))
+                              (CategoryList)
+
+const Aside = () =>
+<aside className='aside'>
+    <CCategoryList />
+</aside>
+
+const GoodCard = ({good:{_id, name, price, images}, onAdd}) =>
+<li className='GoodCard'>
+    <h2>{name}</h2>
+    {images && images[0] && images[0].url && <img src={backendURL + '/' + images[0].url} />}
+    <strong>{price}</strong>
+    <button onClick={() => onAdd({_id, name, price, images})}>+</button>
+</li>
+
+const CGoodCard = connect(null, {onAdd: actionCartAdd})(GoodCard)
+
+const Koshik = ({cart}) => {
+    let goodsInCart = cart
+    let allGoodsInCart = 0
+    for (let key in goodsInCart) {
+        allGoodsInCart += goodsInCart[key].count
+    }
+    return (
+        <h2>{allGoodsInCart}</h2>
+    )
+}
+
+const CKoshik = connect(({cart}) => ({cart}))(Koshik)
+
+
+const Category = ({cat:{name, goods=[]}={}}) => 
+<div className='Category'>
+    <h1>{name}</h1>
+    <ul>
+        {goods.map(good => <CGoodCard good={good} />)}
+    </ul>
+</div>
+
+const CCategory = connect(state => ({cat:state.promise.catById?.payload || {}}))
+                              (Category)
+
+                            //   {` нарисовать страницу корзины , по изменению в input <input onChange={() => onCartChange(...)}
+                            //   по кнопке удалить <button onClick={() => onCartRemove(....)}`}
+                            //   ТУТ БУДЕТ КОРЗИНА
+
+const Cart = ({cart = {}, onCartChange, onCartRemove}) =>{
+ 
+    let goodsInCart = Object.values(cart)
+    return (
+        <div> {console.log('cart',cart), console.log('',)}
+            <h1> КОРЗИНА</h1>
+            <ul> 
+                {goodsInCart.map(item => {
+                    let {good, good: {_id, name, price, images: [{url}]}, count} = item; 
+                   return (
+                        <li key = { _id}>
+                            <h2>{name}</h2>
+                            <img src={backendURL + '/' + url} />
+                            <p>Количество{count}</p>
+                            <strong>{price}$</strong>
+                            <input type="number" min="1" onChange = {(e) => onCartChange(good, e.target.value)}></input> 
+                            <button onClick={() => onCartRemove(good,count)}>Удалить</button>
+                        </li>)
+                }  )}
+            </ul>
+
+       </div>
+    )
+}
+
+                                            //const CCart = connect(забрать из редакса корзину положить в пропс cart, 
+                                                                //дать компоненту onCartChange и onCartRemove с соответствующими actionCreator)(Cart)
+
+const CCart = connect(state => (
+    {cart: state.cart }),
+    {onCartChange: actionCartChange,
+    onCartRemove:actionCartRemove})(Cart)
+
+const Main = () =>
+<main>
+    <Aside />
+    <Content>
+        <Category cat={{name: 'ЗАГЛУШКА'}} />
+        <CCategory />
+        <CCart/>      
+        
+    </Content>
+</main>
+
+const Content = ({children}) =>
+<div className="Content">
+    {children}
+</div>
+
+const Footer = () =>
+<footer>
+    <Logo />
+</footer>
+
+
+function App() {
+    return (
+        <Provider store={store}>
+            <div className="App">
+                <Header />
+                <Main />
+                <Footer />
+            </div>
+        </Provider>
+    );
+}
+
+export default App;

+ 42 - 0
react1/my-app/src/App.scss

@@ -0,0 +1,42 @@
+.App {
+  text-align: center;
+}
+
+.Logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+header {
+  height: 100px;
+  .Logo {
+    max-height: 100px;
+  }
+}
+
+main {
+  display: flex;
+  aside {
+    width: 16%;
+    text-align: left;
+    
+    ul {
+      li {
+        list-style-type: none;
+      }
+    } 
+  }
+}
+.GoodCard {
+  list-style-type: none;
+}
+footer {
+  max-height: 200px;
+  background-color: #383838;
+  display: flex;
+  align-items: center;
+  .Logo {
+    max-height: 50px;
+  }
+}
+

+ 16 - 0
react1/my-app/src/index.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+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();

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
react1/my-app/src/logo.svg


+ 13 - 0
react1/my-app/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;