Vadym Hlushko 3 år sedan
incheckning
b2367bd65a

+ 23 - 0
projectreact/.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
projectreact/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 the browser.
+
+The page will reload if you make edits.\
+You will 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)

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 38984 - 0
projectreact/package-lock.json


+ 43 - 0
projectreact/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "projectreact",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^11.2.7",
+    "@testing-library/user-event": "^12.8.3",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-redux": "^7.2.5",
+    "react-router-dom": "^5.3.0",
+    "react-scripts": "4.0.3",
+    "redux": "^4.1.1",
+    "redux-thunk": "^2.3.0",
+    "web-vitals": "^1.1.2",
+    "proxy": "http://snippet.asmer.fs.a-level.com.ua"
+  },
+  "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"
+    ]
+  }
+}

BIN
projectreact/public/favicon.ico


+ 43 - 0
projectreact/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
projectreact/public/logo192.png


BIN
projectreact/public/logo512.png


+ 25 - 0
projectreact/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
projectreact/public/robots.txt

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

+ 38 - 0
projectreact/src/App.css

@@ -0,0 +1,38 @@
+.App {
+  text-align: center;
+}
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .App-logo {
+    animation: App-logo-spin infinite 20s linear;
+  }
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}

+ 31 - 0
projectreact/src/App.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import './App.css';
+import createHistory from "history/createBrowserHistory";
+import {Provider, connect}   from 'react-redux';
+import thunk from 'redux-thunk';
+import {createStore, combineReducers, applyMiddleware} from 'redux';
+import store from './reducers';
+import RegForm from './pages/reg';
+import Home from './pages/homePage';
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route, 
+  Link
+} from "react-router-dom";
+
+function App() {
+  return (
+    <div className="App">
+      <Provider store = {store}>
+      <Router history = {createHistory()}>
+      <Route exact path='/' component={Home}/>
+      <Route exact path='/registration' component={RegForm}/>
+      </Router>
+      </Provider>
+     
+    </div>
+  );
+}
+
+export default App;

+ 8 - 0
projectreact/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();
+});

+ 85 - 0
projectreact/src/actions/index.js

@@ -0,0 +1,85 @@
+const getGQL = url => 
+    (query, variables={}) => fetch(url, {
+        method: 'POST',
+        headers: {
+            //Accept: "application/json",
+            "Content-Type": "application/json",
+            ...(localStorage.authToken ? {Authorization: "Bearer " + localStorage.authToken } : {})
+        },
+        body: JSON.stringify({query, variables})
+    }).then(res => res.json())
+
+    let gql = getGQL("/graphql")
+
+export const actionPending = name =>            ({type: "PROMISE" ,status:"PENDING", name})
+export const actionResolved = (name,payload) => ({type: "PROMISE" ,status:"RESOLVED", name,payload})
+export const actionRejected = (name,error) =>   ({type: "PROMISE" ,status:"REJECTED", name,error})
+
+export const actionPromise = (name, promise) => 
+  async dispatch => {
+      dispatch(actionPending(name))
+      try {
+          let payload = await promise
+          dispatch(actionResolved(name , payload))
+          return payload
+      }
+      catch(error){
+          dispatch(actionRejected(name , error))
+      }
+  }
+
+  let log = async(login , password) => {
+    let query = ` query log($l:String!,$p:String!) {
+      login(login:$l,password:$p)
+    }`
+let qVariables = {
+    "l": login,
+    "p": password 
+}
+let result = await gql(query,qVariables)
+return result
+}
+
+let reg = async(login,password) => {
+  let query = `mutation reg($l:String! , $p:String!) {
+      createUser(login:$l,password:$p){
+  _id login
+}
+}`
+    let qVariables = {
+      "l":  login,
+      "p": password
+    }
+    let result = await gql(query,qVariables)
+    return result
+  }
+
+
+export const actionAuthLogin = token => ({type:'LOGIN', token})
+export const actionAuthLogout = () => ({type:'LOGOUT'})
+export const actionFullLogin = (login , password) => async dispatch => {
+  let result = await dispatch(actionPromise("login",log(login,password)))
+  if (result?.data?.login !== null){
+  dispatch(actionAuthLogin(result.data.login))
+  }
+  else {
+      alert ('такого пользователя не существует')
+  }
+}
+
+export const actionRegister = (login,password) => async dispatch => {
+        return await dispatch (actionPromise('register' , reg(login,password)))
+     } 
+
+
+export const actionFullRegister = (login,password) => async dispatch => {
+  let result =  await dispatch (actionRegister(login,password))
+  if (result?.errors === undefined) {
+      await dispatch (actionFullLogin(login,password))
+  }
+  else { 
+      alert("Такой пользователь уже есть")
+
+  }
+}
+

+ 8 - 0
projectreact/src/components/future-nick.js

@@ -0,0 +1,8 @@
+const NickName =  ({nick}) => {
+    return (
+      <p></p>,
+      <a href = '#'>{nick || 'anon'}</a>
+      )
+    }
+    
+    const ConnectedNick = connect(state => ({nick:state?.auth?.payload?.sub?.login }))(NickName)

+ 13 - 0
projectreact/src/index.css

@@ -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;
+}

+ 17 - 0
projectreact/src/index.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+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();

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
projectreact/src/logo.svg


+ 16 - 0
projectreact/src/pages/homePage.js

@@ -0,0 +1,16 @@
+import React from "react";
+import {connect}   from 'react-redux';
+import {useState} from "react";
+import { Redirect } from "react-router";
+import { Link } from "react-router-dom";
+
+const Home = () =>{
+    return (
+        <>
+        <h1>HOME</h1>
+        <Link to = '/registration'>Reg</Link>
+        </>
+    )
+}
+
+export default Home

+ 0 - 0
projectreact/src/pages/login.js


+ 34 - 0
projectreact/src/pages/reg.js

@@ -0,0 +1,34 @@
+import { connect } from "react-redux";
+import { useState} from "react";
+import { actionFullRegister } from "../actions";
+import { Redirect } from "react-router-dom";
+
+const Reg = ({ onReg }) => {
+    const [login, setLogin] = useState("");
+    const [password, setPassword] = useState("");
+    //надо тип инпуту
+    //надо проверку на пустоту инпутов и запрет кнопки (disabled)
+    //надо при кнопке отправить в onLogin login и пароль. onLogin - это функция-колбэк
+    return (
+      <>
+        <input value={login} onChange={(e) => setLogin(e.target.value)} />
+        <input
+          type="password"
+          value={password}
+          onChange={(e) => setPassword(e.target.value)}
+        />
+        <button
+          onClick={() => onReg(login, password)}
+          disabled={!login || !password}
+        >
+          Sign in
+        </button>
+        
+      </>
+    );
+  };
+  
+  const RegForm = connect(null, {onReg: actionFullRegister})(Reg)
+
+  
+export default RegForm

+ 53 - 0
projectreact/src/reducers/index.js

@@ -0,0 +1,53 @@
+import thunk  from 'redux-thunk'
+import {createStore, combineReducers,applyMiddleware } from 'redux';
+
+function promiseReducer(state , {type, name ,status , payload, error}) {
+  if (!state){
+      return {} //{status , payload , error}
+  }
+  if (type === 'PROMISE') {
+      return {
+          ...state,
+          [name]: [status,payload , error]
+      }
+  }
+  return state
+}
+
+function authReducer(state, action){ //....
+    if (state === undefined){
+        if (!localStorage.authToken){
+            return {}
+        }
+        action.token = localStorage.authToken
+        action.type = 'LOGIN'
+        // добавить в action token из localStorage, и проимитировать LOGIN 
+    }
+    if (action.type === 'LOGIN'){
+        console.log('ЛОГИН')
+        localStorage.authToken = action.token
+        console.log(action.token)
+        function jwt_decode (token) {
+            var start64Url = token.split('.')[1]
+            return JSON.parse(atob(start64Url))
+        }
+        return {token: action.token, payload: jwt_decode(action.token)}
+    }
+    if (action.type === 'LOGOUT'){
+        console.log('ЛОГАУТ')
+        localStorage.removeItem("authToken")
+        //вернуть пустой объект
+        return {}
+    }
+    return state
+}
+
+
+let reducers = {
+    promise:promiseReducer,
+    auth:authReducer
+}
+
+const store = createStore(combineReducers(reducers), applyMiddleware(thunk))
+
+export default store

+ 13 - 0
projectreact/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;

+ 5 - 0
projectreact/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';