From 636817661acadd247a6488e4b2566a562bdbd226 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 12:48:53 -0500 Subject: [PATCH 1/9] Add SearchBar and Redux --- package.json | 3 + src/App.js | 56 ------------------- src/actions/index.js | 38 +++++++++++++ src/containers/App/index.js | 25 +++++++++ .../App/index.test.js} | 2 +- src/{App.css => containers/App/styles.css} | 0 .../building_list.js | 11 +++- src/containers/search_bar.js | 46 +++++++++++++++ src/index.js | 15 ++++- src/reducers/index.js | 9 +++ src/reducers/reducer_building_list.js | 11 ++++ 11 files changed, 154 insertions(+), 62 deletions(-) delete mode 100644 src/App.js create mode 100644 src/actions/index.js create mode 100644 src/containers/App/index.js rename src/{App.test.js => containers/App/index.test.js} (87%) rename src/{App.css => containers/App/styles.css} (100%) rename src/{components => containers}/building_list.js (65%) create mode 100644 src/containers/search_bar.js create mode 100644 src/reducers/index.js create mode 100644 src/reducers/reducer_building_list.js diff --git a/package.json b/package.json index c2cd75c1..7e9a9d20 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,9 @@ "dependencies": { "react": "^15.3.2", "react-dom": "^15.3.2", + "react-redux": "^4.4.5", + "redux": "^3.6.0", + "redux-promise": "^0.5.3", "whatwg-fetch": "^1.0.0" }, "scripts": { diff --git a/src/App.js b/src/App.js deleted file mode 100644 index 330faa0a..00000000 --- a/src/App.js +++ /dev/null @@ -1,56 +0,0 @@ -import React, { Component } from 'react'; -import './App.css'; -import BuildingList from './components/building_list'; -import 'whatwg-fetch'; - -class App extends Component { - constructor(props) { - super(props); - - this.state = { - buildings: [] - }; - - this.getBuildings(); - } - - getBuildings() { - const myHeaders = new Headers(); - myHeaders.append("x-blocpower-app-key", "04a6b12c-d3d3-4ad2-afe4-b22fd0215578"); - - const myInit = { - method: 'GET', - headers: myHeaders, - mode: 'cors', - cache: 'default' - }; - - const url = 'http://localhost:5404/building/?address=23%20broadway'; - - fetch(url, myInit).then(function (response) { - return response.json() - - }).catch(function (error) { - console.log('request failed for buildings', error) - - }).then(json => { - this.setState({ - buildings: json.data, - }); - - }).catch(function (error) { - console.log('parser failed', error) - }); - } - - render() { - return ( -
-
- -
- ); - } -} - -export default App; diff --git a/src/actions/index.js b/src/actions/index.js new file mode 100644 index 00000000..0a2d6d52 --- /dev/null +++ b/src/actions/index.js @@ -0,0 +1,38 @@ +import 'whatwg-fetch'; + +export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; + +const ROOT_URL = 'http://localhost:5404/building/'; + +export function fetchBuildings(address) { + const myHeaders = new Headers({"x-blocpower-app-key": "04a6b12c-d3d3-4ad2-afe4-b22fd0215578"}); + + const myInit = { + method: 'GET', + headers: myHeaders, + mode: 'cors', + cache: 'default' + }; + + const url = `${ROOT_URL}?address=${address}`; + + const request = fetch(url, myInit).then(function (response) { + return response.json() + + }).catch(function (error) { + console.log('request failed for buildings', error) + + }); + + // .then(json => { + // console.log(json.data) + // }); + + + console.log('fetching buildings'); + + return { + type: FETCH_BUILDINGS, + payload: request + }; +} \ No newline at end of file diff --git a/src/containers/App/index.js b/src/containers/App/index.js new file mode 100644 index 00000000..74f25b18 --- /dev/null +++ b/src/containers/App/index.js @@ -0,0 +1,25 @@ +import React, {Component} from 'react'; +import './styles.css'; +import 'whatwg-fetch'; + +import BuildingList from '../building_list'; +import SearchBar from '../search_bar'; + +class App extends Component { + constructor(props) { + super(props); + } + + render() { + return ( +
+
+ +
+ +
+ ); + } +} + +export default App; diff --git a/src/App.test.js b/src/containers/App/index.test.js similarity index 87% rename from src/App.test.js rename to src/containers/App/index.test.js index b84af98d..ba444eb1 100644 --- a/src/App.test.js +++ b/src/containers/App/index.test.js @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import App from './App'; +import App from './index'; it('renders without crashing', () => { const div = document.createElement('div'); diff --git a/src/App.css b/src/containers/App/styles.css similarity index 100% rename from src/App.css rename to src/containers/App/styles.css diff --git a/src/components/building_list.js b/src/containers/building_list.js similarity index 65% rename from src/components/building_list.js rename to src/containers/building_list.js index 39656991..c2a801ce 100644 --- a/src/components/building_list.js +++ b/src/containers/building_list.js @@ -1,5 +1,6 @@ import React from 'react'; -import BuildingListItem from './building_list_item' +import {connect} from 'react-redux' +import BuildingListItem from '../components/building_list_item' const BuildingList = ({buildings}) => { if (!buildings || buildings.length === 0) { @@ -7,7 +8,7 @@ const BuildingList = ({buildings}) => { } let i = 0; - const buildingProperties = Object.keys(buildings[0]).map((item) => { + const buildingProperties = Object.keys(buildings[0]).map((item) => { return { item } }); @@ -31,4 +32,8 @@ const BuildingList = ({buildings}) => { ) }; -export default BuildingList; \ No newline at end of file +function mapStateToProps({buildings}) { + return {buildings}; +} + +export default connect(mapStateToProps)(BuildingList); diff --git a/src/containers/search_bar.js b/src/containers/search_bar.js new file mode 100644 index 00000000..e14cdba0 --- /dev/null +++ b/src/containers/search_bar.js @@ -0,0 +1,46 @@ +import React, {Component} from 'react'; +import {connect} from 'react-redux'; +import {bindActionCreators} from 'redux'; +import {fetchBuildings} from '../actions/index' + + +class SearchBar extends Component { + constructor(props) { + super(props); + + this.state = {term: ''}; + + this.onInputChange = this.onInputChange.bind(this); + this.onFormSubmit = this.onFormSubmit.bind(this); + } + + onInputChange(event) { + this.setState({term: event.target.value}); + } + + onFormSubmit(event) { + event.preventDefault(); + + this.props.fetchBuildings(this.state.term); + this.setState({term: ''}); + } + + render() { + return ( +
+ +
+ ) + } +} + +function mapDispatchToProps(dispatch) { + return bindActionCreators({fetchBuildings}, dispatch); +} + +export default connect(null, mapDispatchToProps)(SearchBar); \ No newline at end of file diff --git a/src/index.js b/src/index.js index 54c5ef1a..652d0301 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,20 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import App from './App'; + +import {Provider} from 'react-redux'; +import {createStore, applyMiddleware} from 'redux'; +import ReduxPromise from 'redux-promise'; + +import App from './containers/App/index'; import './index.css'; +import reducers from './reducers' + +const createStoreWithMiddleware = applyMiddleware(ReduxPromise)(createStore); ReactDOM.render( - , + + + , document.getElementById('root') ); diff --git a/src/reducers/index.js b/src/reducers/index.js new file mode 100644 index 00000000..92ca359c --- /dev/null +++ b/src/reducers/index.js @@ -0,0 +1,9 @@ +import { combineReducers } from 'redux'; + +import BuildingReducer from './reducer_building_list' + +const rootReducer = combineReducers({ + buildings: BuildingReducer +}); + +export default rootReducer; diff --git a/src/reducers/reducer_building_list.js b/src/reducers/reducer_building_list.js new file mode 100644 index 00000000..fbdbbdca --- /dev/null +++ b/src/reducers/reducer_building_list.js @@ -0,0 +1,11 @@ +import {FETCH_BUILDINGS} from '../actions/index'; + +export default function (state = [], action) { + switch (action.type) { + case FETCH_BUILDINGS: + return action.payload.data; + + default: + return state; + } +} \ No newline at end of file -- GitLab From c15a0269456c980851bb11abc66cadc8b2d4abe2 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 12:55:11 -0500 Subject: [PATCH 2/9] Remove logging from building list reducer --- src/actions/index.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/actions/index.js b/src/actions/index.js index 0a2d6d52..f07967c7 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -24,13 +24,6 @@ export function fetchBuildings(address) { }); - // .then(json => { - // console.log(json.data) - // }); - - - console.log('fetching buildings'); - return { type: FETCH_BUILDINGS, payload: request -- GitLab From 7e70322301a855f186b1be84ca7c6f3fa644e273 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 17:34:41 -0500 Subject: [PATCH 3/9] Refactor application layout --- .../BuildingList}/building_list.js | 13 ++-- src/components/BuildingList/styles.css | 0 .../building_list_item.js | 7 +- src/components/BuildingListItem/styles.css | 7 ++ src/containers/App/index.js | 13 +--- src/containers/App/styles.css | 15 ----- .../HomePage/actions.js} | 3 +- src/containers/HomePage/constants.js | 1 + src/containers/HomePage/index.js | 64 +++++++++++++++++++ .../HomePage/reducer.js} | 2 +- src/containers/HomePage/styles.css | 4 ++ src/containers/search_bar.js | 46 ------------- src/index.js | 4 +- src/{reducers/index.js => reducer.js} | 4 +- 14 files changed, 91 insertions(+), 92 deletions(-) rename src/{containers => components/BuildingList}/building_list.js (69%) create mode 100644 src/components/BuildingList/styles.css rename src/components/{ => BuildingListItem}/building_list_item.js (77%) create mode 100644 src/components/BuildingListItem/styles.css rename src/{actions/index.js => containers/HomePage/actions.js} (92%) create mode 100644 src/containers/HomePage/constants.js create mode 100644 src/containers/HomePage/index.js rename src/{reducers/reducer_building_list.js => containers/HomePage/reducer.js} (77%) create mode 100644 src/containers/HomePage/styles.css delete mode 100644 src/containers/search_bar.js rename src/{reducers/index.js => reducer.js} (50%) diff --git a/src/containers/building_list.js b/src/components/BuildingList/building_list.js similarity index 69% rename from src/containers/building_list.js rename to src/components/BuildingList/building_list.js index c2a801ce..9eba146e 100644 --- a/src/containers/building_list.js +++ b/src/components/BuildingList/building_list.js @@ -1,8 +1,9 @@ import React from 'react'; -import {connect} from 'react-redux' -import BuildingListItem from '../components/building_list_item' -const BuildingList = ({buildings}) => { +import BuildingListItem from '../BuildingListItem/building_list_item' +import './styles.css'; + +export default function BuildingList({buildings}) { if (!buildings || buildings.length === 0) { return

Loading...

} @@ -31,9 +32,3 @@ const BuildingList = ({buildings}) => { ) }; - -function mapStateToProps({buildings}) { - return {buildings}; -} - -export default connect(mapStateToProps)(BuildingList); diff --git a/src/components/BuildingList/styles.css b/src/components/BuildingList/styles.css new file mode 100644 index 00000000..e69de29b diff --git a/src/components/building_list_item.js b/src/components/BuildingListItem/building_list_item.js similarity index 77% rename from src/components/building_list_item.js rename to src/components/BuildingListItem/building_list_item.js index 6c7d0d99..25522d75 100644 --- a/src/components/building_list_item.js +++ b/src/components/BuildingListItem/building_list_item.js @@ -1,6 +1,7 @@ import React from 'react'; +import './styles.css'; -const BuildingListItem = (props) => { +export default function BuildingListItem(props) { let i = 0; const building_items = Object.values(props).map((building_item) => { @@ -12,6 +13,4 @@ const BuildingListItem = (props) => { {building_items} ) -}; - -export default BuildingListItem \ No newline at end of file +}; \ No newline at end of file diff --git a/src/components/BuildingListItem/styles.css b/src/components/BuildingListItem/styles.css new file mode 100644 index 00000000..f7fd6a46 --- /dev/null +++ b/src/components/BuildingListItem/styles.css @@ -0,0 +1,7 @@ +.building-list-item { + cursor: pointer; +} + +.building-list-item:hover { + background-color: #eee; +} \ No newline at end of file diff --git a/src/containers/App/index.js b/src/containers/App/index.js index 74f25b18..05423e54 100644 --- a/src/containers/App/index.js +++ b/src/containers/App/index.js @@ -1,22 +1,13 @@ import React, {Component} from 'react'; import './styles.css'; -import 'whatwg-fetch'; -import BuildingList from '../building_list'; -import SearchBar from '../search_bar'; +import HomePage from '../HomePage/index'; class App extends Component { - constructor(props) { - super(props); - } - render() { return (
-
- -
- +
); } diff --git a/src/containers/App/styles.css b/src/containers/App/styles.css index 8c0b05e7..c4d0449d 100644 --- a/src/containers/App/styles.css +++ b/src/containers/App/styles.css @@ -1,18 +1,3 @@ .App { -} - -.App-header { - background-color: #222; - height: 150px; - padding: 20px; - color: white; -} - -.building-list-item { - cursor: pointer; -} - -.building-list-item:hover { - background-color: #eee; } \ No newline at end of file diff --git a/src/actions/index.js b/src/containers/HomePage/actions.js similarity index 92% rename from src/actions/index.js rename to src/containers/HomePage/actions.js index f07967c7..46325c87 100644 --- a/src/actions/index.js +++ b/src/containers/HomePage/actions.js @@ -1,6 +1,5 @@ import 'whatwg-fetch'; - -export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; +import {FETCH_BUILDINGS} from './constants' const ROOT_URL = 'http://localhost:5404/building/'; diff --git a/src/containers/HomePage/constants.js b/src/containers/HomePage/constants.js new file mode 100644 index 00000000..c162b72e --- /dev/null +++ b/src/containers/HomePage/constants.js @@ -0,0 +1 @@ +export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; \ No newline at end of file diff --git a/src/containers/HomePage/index.js b/src/containers/HomePage/index.js new file mode 100644 index 00000000..d8a2216b --- /dev/null +++ b/src/containers/HomePage/index.js @@ -0,0 +1,64 @@ +import React, {Component} from 'react'; +import {connect} from 'react-redux'; +import {bindActionCreators} from 'redux'; +import {fetchBuildings} from './actions' + +import BuildingList from '../../components/BuildingList/building_list' +import './styles.css'; + + +class HomePage extends Component { + constructor(props) { + super(props); + + this.state = {term: '107 broadway'}; + + this.onInputChange = this.onInputChange.bind(this); + this.onFormSubmit = this.onFormSubmit.bind(this); + } + + componentDidMount() { + this.getBuildings(); + } + + getBuildings() { + this.props.fetchBuildings(this.state.term); + this.setState({term: ''}); + } + + onInputChange(event) { + this.setState({term: event.target.value}); + } + + onFormSubmit(event) { + event.preventDefault(); + + this.getBuildings(); + } + + render() { + return ( +
+
+ +
+ +
+ ) + } +} + +function mapDispatchToProps(dispatch) { + return bindActionCreators({fetchBuildings}, dispatch); +} + +function mapStateToProps({buildings}) { + return {buildings}; +} + +export default connect(mapStateToProps, mapDispatchToProps)(HomePage); \ No newline at end of file diff --git a/src/reducers/reducer_building_list.js b/src/containers/HomePage/reducer.js similarity index 77% rename from src/reducers/reducer_building_list.js rename to src/containers/HomePage/reducer.js index fbdbbdca..6168e607 100644 --- a/src/reducers/reducer_building_list.js +++ b/src/containers/HomePage/reducer.js @@ -1,4 +1,4 @@ -import {FETCH_BUILDINGS} from '../actions/index'; +import {FETCH_BUILDINGS} from './constants'; export default function (state = [], action) { switch (action.type) { diff --git a/src/containers/HomePage/styles.css b/src/containers/HomePage/styles.css new file mode 100644 index 00000000..576467af --- /dev/null +++ b/src/containers/HomePage/styles.css @@ -0,0 +1,4 @@ +.building-search { + background-color: #222; + padding: 40px; +} \ No newline at end of file diff --git a/src/containers/search_bar.js b/src/containers/search_bar.js deleted file mode 100644 index e14cdba0..00000000 --- a/src/containers/search_bar.js +++ /dev/null @@ -1,46 +0,0 @@ -import React, {Component} from 'react'; -import {connect} from 'react-redux'; -import {bindActionCreators} from 'redux'; -import {fetchBuildings} from '../actions/index' - - -class SearchBar extends Component { - constructor(props) { - super(props); - - this.state = {term: ''}; - - this.onInputChange = this.onInputChange.bind(this); - this.onFormSubmit = this.onFormSubmit.bind(this); - } - - onInputChange(event) { - this.setState({term: event.target.value}); - } - - onFormSubmit(event) { - event.preventDefault(); - - this.props.fetchBuildings(this.state.term); - this.setState({term: ''}); - } - - render() { - return ( -
- -
- ) - } -} - -function mapDispatchToProps(dispatch) { - return bindActionCreators({fetchBuildings}, dispatch); -} - -export default connect(null, mapDispatchToProps)(SearchBar); \ No newline at end of file diff --git a/src/index.js b/src/index.js index 652d0301..b30f6e62 100644 --- a/src/index.js +++ b/src/index.js @@ -7,13 +7,13 @@ import ReduxPromise from 'redux-promise'; import App from './containers/App/index'; import './index.css'; -import reducers from './reducers' +import rootReducer from './reducer' const createStoreWithMiddleware = applyMiddleware(ReduxPromise)(createStore); ReactDOM.render( + store={createStoreWithMiddleware(rootReducer, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__())}> , document.getElementById('root') diff --git a/src/reducers/index.js b/src/reducer.js similarity index 50% rename from src/reducers/index.js rename to src/reducer.js index 92ca359c..dd0cedcb 100644 --- a/src/reducers/index.js +++ b/src/reducer.js @@ -1,6 +1,6 @@ -import { combineReducers } from 'redux'; +import {combineReducers} from 'redux'; -import BuildingReducer from './reducer_building_list' +import BuildingReducer from './containers/HomePage/reducer'; const rootReducer = combineReducers({ buildings: BuildingReducer -- GitLab From f44a6becbb65d4cb2529da16bb1f312ee83cf4aa Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 17:35:46 -0500 Subject: [PATCH 4/9] Update title to Buildings --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 82434aa0..ed8b06bf 100644 --- a/public/index.html +++ b/public/index.html @@ -15,7 +15,7 @@ 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`. --> - React App + Buildings
-- GitLab From ff1fd2986b8d8fd1f108d279da0fc5bb179f875f Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 17:41:21 -0500 Subject: [PATCH 5/9] Rename components index.js and import directory --- src/components/BuildingList/{building_list.js => index.js} | 2 +- .../BuildingListItem/{building_list_item.js => index.js} | 0 src/containers/App/index.js | 2 +- src/containers/HomePage/index.js | 2 +- src/index.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/components/BuildingList/{building_list.js => index.js} (90%) rename src/components/BuildingListItem/{building_list_item.js => index.js} (100%) diff --git a/src/components/BuildingList/building_list.js b/src/components/BuildingList/index.js similarity index 90% rename from src/components/BuildingList/building_list.js rename to src/components/BuildingList/index.js index 9eba146e..8de12843 100644 --- a/src/components/BuildingList/building_list.js +++ b/src/components/BuildingList/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import BuildingListItem from '../BuildingListItem/building_list_item' +import BuildingListItem from '../BuildingListItem/index' import './styles.css'; export default function BuildingList({buildings}) { diff --git a/src/components/BuildingListItem/building_list_item.js b/src/components/BuildingListItem/index.js similarity index 100% rename from src/components/BuildingListItem/building_list_item.js rename to src/components/BuildingListItem/index.js diff --git a/src/containers/App/index.js b/src/containers/App/index.js index 05423e54..b725bd15 100644 --- a/src/containers/App/index.js +++ b/src/containers/App/index.js @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import './styles.css'; -import HomePage from '../HomePage/index'; +import HomePage from '../HomePage'; class App extends Component { render() { diff --git a/src/containers/HomePage/index.js b/src/containers/HomePage/index.js index d8a2216b..f7eaead5 100644 --- a/src/containers/HomePage/index.js +++ b/src/containers/HomePage/index.js @@ -3,7 +3,7 @@ import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; import {fetchBuildings} from './actions' -import BuildingList from '../../components/BuildingList/building_list' +import BuildingList from '../../components/BuildingList' import './styles.css'; diff --git a/src/index.js b/src/index.js index b30f6e62..7f0a7bba 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import {Provider} from 'react-redux'; import {createStore, applyMiddleware} from 'redux'; import ReduxPromise from 'redux-promise'; -import App from './containers/App/index'; +import App from './containers/App'; import './index.css'; import rootReducer from './reducer' -- GitLab From c1093e7bcf01db283cc41ac6f2cefba9a4674995 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 17:45:06 -0500 Subject: [PATCH 6/9] Remove index.css from src --- src/index.css | 5 ----- src/index.js | 1 - 2 files changed, 6 deletions(-) delete mode 100644 src/index.css diff --git a/src/index.css b/src/index.css deleted file mode 100644 index b4cc7250..00000000 --- a/src/index.css +++ /dev/null @@ -1,5 +0,0 @@ -body { - margin: 0; - padding: 0; - font-family: sans-serif; -} diff --git a/src/index.js b/src/index.js index 7f0a7bba..25279758 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,6 @@ import {createStore, applyMiddleware} from 'redux'; import ReduxPromise from 'redux-promise'; import App from './containers/App'; -import './index.css'; import rootReducer from './reducer' const createStoreWithMiddleware = applyMiddleware(ReduxPromise)(createStore); -- GitLab From 9acf6c24a2ba2736daae7d29da3632ae404c906b Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 17:53:47 -0500 Subject: [PATCH 7/9] Add newline to end of files --- src/components/BuildingListItem/index.js | 2 +- src/components/BuildingListItem/styles.css | 2 +- src/containers/App/styles.css | 2 +- src/containers/HomePage/actions.js | 2 +- src/containers/HomePage/constants.js | 2 +- src/containers/HomePage/index.js | 2 +- src/containers/HomePage/reducer.js | 2 +- src/containers/HomePage/styles.css | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/BuildingListItem/index.js b/src/components/BuildingListItem/index.js index 25522d75..b51cacbe 100644 --- a/src/components/BuildingListItem/index.js +++ b/src/components/BuildingListItem/index.js @@ -13,4 +13,4 @@ export default function BuildingListItem(props) { {building_items} ) -}; \ No newline at end of file +}; diff --git a/src/components/BuildingListItem/styles.css b/src/components/BuildingListItem/styles.css index f7fd6a46..2f5a0655 100644 --- a/src/components/BuildingListItem/styles.css +++ b/src/components/BuildingListItem/styles.css @@ -4,4 +4,4 @@ .building-list-item:hover { background-color: #eee; -} \ No newline at end of file +} diff --git a/src/containers/App/styles.css b/src/containers/App/styles.css index c4d0449d..34b8ee09 100644 --- a/src/containers/App/styles.css +++ b/src/containers/App/styles.css @@ -1,3 +1,3 @@ .App { -} \ No newline at end of file +} diff --git a/src/containers/HomePage/actions.js b/src/containers/HomePage/actions.js index 46325c87..f37e330b 100644 --- a/src/containers/HomePage/actions.js +++ b/src/containers/HomePage/actions.js @@ -27,4 +27,4 @@ export function fetchBuildings(address) { type: FETCH_BUILDINGS, payload: request }; -} \ No newline at end of file +} diff --git a/src/containers/HomePage/constants.js b/src/containers/HomePage/constants.js index c162b72e..bdea6400 100644 --- a/src/containers/HomePage/constants.js +++ b/src/containers/HomePage/constants.js @@ -1 +1 @@ -export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; \ No newline at end of file +export const FETCH_BUILDINGS = 'FETCH_BUILDINGS'; diff --git a/src/containers/HomePage/index.js b/src/containers/HomePage/index.js index f7eaead5..89e69f69 100644 --- a/src/containers/HomePage/index.js +++ b/src/containers/HomePage/index.js @@ -61,4 +61,4 @@ function mapStateToProps({buildings}) { return {buildings}; } -export default connect(mapStateToProps, mapDispatchToProps)(HomePage); \ No newline at end of file +export default connect(mapStateToProps, mapDispatchToProps)(HomePage); diff --git a/src/containers/HomePage/reducer.js b/src/containers/HomePage/reducer.js index 6168e607..077dcc30 100644 --- a/src/containers/HomePage/reducer.js +++ b/src/containers/HomePage/reducer.js @@ -8,4 +8,4 @@ export default function (state = [], action) { default: return state; } -} \ No newline at end of file +} diff --git a/src/containers/HomePage/styles.css b/src/containers/HomePage/styles.css index 576467af..56722ce8 100644 --- a/src/containers/HomePage/styles.css +++ b/src/containers/HomePage/styles.css @@ -1,4 +1,4 @@ .building-search { background-color: #222; padding: 40px; -} \ No newline at end of file +} -- GitLab From 83e9405377d64dee1a97f76835fd7737d7e9e8cc Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 7 Nov 2016 18:17:54 -0500 Subject: [PATCH 8/9] Add btn for search --- src/containers/HomePage/index.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/containers/HomePage/index.js b/src/containers/HomePage/index.js index 89e69f69..d4ef5f02 100644 --- a/src/containers/HomePage/index.js +++ b/src/containers/HomePage/index.js @@ -39,13 +39,17 @@ class HomePage extends Component { render() { return (
-
- + +
+ + +
-- GitLab From 26cd8be75899ed8d17db1f70e5633dfdae63b9dc Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Tue, 15 Nov 2016 19:32:09 -0500 Subject: [PATCH 9/9] Remove clearing out search term. --- src/containers/HomePage/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/containers/HomePage/index.js b/src/containers/HomePage/index.js index d4ef5f02..0664832b 100644 --- a/src/containers/HomePage/index.js +++ b/src/containers/HomePage/index.js @@ -23,7 +23,6 @@ class HomePage extends Component { getBuildings() { this.props.fetchBuildings(this.state.term); - this.setState({term: ''}); } onInputChange(event) { -- GitLab