diff --git a/.gitignore b/.gitignore index 0ed07a3..8663545 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ node_modules web/src/theme\.css web/build/ + +#secrets +.env \ No newline at end of file diff --git a/config.json b/config.json index 495fe75..63f0cb7 100644 --- a/config.json +++ b/config.json @@ -3,9 +3,9 @@ "production": false, "db": { "host": "localhost", - "user": "myrmey", + "user": "postgres", "password": "", - "database": "myrmey", + "database": "postgres", "port": "5432" }, "watchlist": { diff --git a/web/package.json b/web/package.json index 7d5fa84..9481cde 100644 --- a/web/package.json +++ b/web/package.json @@ -10,7 +10,10 @@ "react-big-calendar": "^0.17.0", "react-dom": "^16.0.0", "react-notification-system": "^0.2.16", - "react-scripts": "1.0.14" + "react-redux": "^5.0.6", + "react-scripts": "1.0.14", + "redux": "^3.7.2", + "redux-thunk": "^2.2.0" }, "scripts": { "build-css": "node-sass-chokidar src/theme.scss -o src/", diff --git a/web/src/App.js b/web/src/App.js index f9d18ac..a80b483 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import { connect } from 'react-redux'; import update from 'immutability-helper'; import NotificationSystem from 'react-notification-system'; @@ -382,6 +383,8 @@ class App extends Component { data: this.state[this.state.currScreen] } + console.log(this.props.user); + return (
0 ? this.popScreen : undefined} /> @@ -392,4 +395,8 @@ class App extends Component { } } -export default App; +export default connect((store) => { + return { + user: store.userState.user, + } +})(App); diff --git a/web/src/index.js b/web/src/index.js index 4a60c05..20b8b64 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -1,8 +1,13 @@ import React from 'react'; import ReactDOM from 'react-dom'; +import { Provider } from 'react-redux'; import App from './App'; +import store from './redux/store.js'; import registerServiceWorker from './registerServiceWorker'; import './theme.css'; -ReactDOM.render(, document.getElementById('root')); +ReactDOM.render( + + + , document.getElementById('root')); registerServiceWorker(); diff --git a/web/src/pages/home/index.js b/web/src/pages/home/index.js index 9016e9c..2b1bb8e 100644 --- a/web/src/pages/home/index.js +++ b/web/src/pages/home/index.js @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import { connect } from 'react-redux'; import Schedule from '../../components/Schedule'; import Inspector from '../../components/Inspector'; import './style.css'; @@ -6,6 +7,7 @@ import myrmey from '../../assets/myrmey.svg'; class HomePage extends Component { render() { + console.log(this.props.user.user); return (