diff --git a/package.json b/package.json index 9030851..c57c1a9 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,13 @@ "homepage": "https://PracticaDS.github.io/pdes-tp-pochinki/", "private": true, "dependencies": { + "create-react-app": "^3.0.1", + "global": "^4.3.2", "react": "^16.8.6", "react-dom": "^16.8.6", "react-redux": "^7.0.2", + "react-router": "^5.0.1", + "react-router-dom": "^5.0.1", "react-scripts": "2.1.8", "redux": "^4.0.1" }, @@ -19,11 +23,12 @@ "storybook": "start-storybook -p 9009 -s public", "build-storybook": "build-storybook -s public" }, - "husky":{ - "hooks":{ + "husky": { + "hooks": { "pre-push": "CI=true yarn test" } }, + "proxy": "http://localhost:3001", "eslintConfig": { "extends": "react-app" }, diff --git a/src/App.js b/src/App.js index b805102..71e551a 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,7 @@ import React from 'react'; import './App.css'; import Fabrica from './containers/FabricaContainer'; +//import Login from './components/Login'; const App = () => { return ( diff --git a/src/actions/maquina.js b/src/actions/maquina.js index 4443ff8..4e92a1b 100644 --- a/src/actions/maquina.js +++ b/src/actions/maquina.js @@ -18,4 +18,11 @@ export const selectMaterial = (material) => { type: 'SELECT_MAT', material } +} + +export const selectBlueprint = (blueprint) => { + return { + type: 'SELECT_BLUE', + blueprint + } } \ No newline at end of file diff --git a/src/assets/blueprint.PNG b/src/assets/blueprint.PNG new file mode 100644 index 0000000..f8f4170 Binary files /dev/null and b/src/assets/blueprint.PNG differ diff --git a/src/components/InfoUser.js b/src/components/InfoUser.js new file mode 100644 index 0000000..a179016 --- /dev/null +++ b/src/components/InfoUser.js @@ -0,0 +1,25 @@ +import React from 'react'; + + +const InfoUser = ({match: {params}}) => { + + const username = params.username; + let userN + let loading = true + + fetch('http://localhost:3001/api/users/' + username) + .then(res => res.json()) + .then(user => { + userN = user + loading = false + }) + + return ( +
{item.nombre}
+