diff --git a/src/components/BuildingList/index.js b/src/components/BuildingList/index.js deleted file mode 100644 index 8de12843a4e42f779de82707e11303d06547e60b..0000000000000000000000000000000000000000 --- a/src/components/BuildingList/index.js +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; - -import BuildingListItem from '../BuildingListItem/index' -import './styles.css'; - -export default function BuildingList({buildings}) { - if (!buildings || buildings.length === 0) { - return

Loading...

- } - - let i = 0; - const buildingProperties = Object.keys(buildings[0]).map((item) => { - return { item } - }); - - const buildingItems = buildings.map((building) => { - return ( - - ) - }); - - return ( - - - - {buildingProperties} - - - - {buildingItems} - -
- ) -}; diff --git a/src/components/BuildingList/styles.css b/src/components/BuildingList/styles.css deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/components/BuildingListItem/index.js b/src/components/BuildingListItem/index.js deleted file mode 100644 index b51cacbeffced6d697f430a1dd824e4bc892863e..0000000000000000000000000000000000000000 --- a/src/components/BuildingListItem/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import './styles.css'; - -export default function BuildingListItem(props) { - - let i = 0; - const building_items = Object.values(props).map((building_item) => { - return {building_item} - }); - - return ( - - {building_items} - - ) -}; diff --git a/src/components/BuildingListTable/index.js b/src/components/BuildingListTable/index.js new file mode 100644 index 0000000000000000000000000000000000000000..a4a0687b27d7f114c97a7d4468e002ebf7ed3cdb --- /dev/null +++ b/src/components/BuildingListTable/index.js @@ -0,0 +1,37 @@ +import React from 'react'; +import './styles.css'; + +export default function BuildingListTable({buildings}) { + if (!buildings || buildings.length === 0) { + return
None
+ } + + const buildingProperties = Object.keys(buildings[0]).map(item => + { item } , + ); + + const buildingItems = buildings.map(building => { + return ( + + {building['address']} + {building['bbl']} + {building['blocpower_id']} + {building['borough']} + {building['zipcode']} + + ) + }); + + return ( + + + + {buildingProperties} + + + + {buildingItems} + +
+ ) +}; diff --git a/src/components/BuildingListItem/styles.css b/src/components/BuildingListTable/styles.css similarity index 100% rename from src/components/BuildingListItem/styles.css rename to src/components/BuildingListTable/styles.css diff --git a/src/containers/App/index.js b/src/containers/App/index.js deleted file mode 100644 index b725bd1575de485f43d03d51d81fb8e0ea45da33..0000000000000000000000000000000000000000 --- a/src/containers/App/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import React, {Component} from 'react'; -import './styles.css'; - -import HomePage from '../HomePage'; - -class App extends Component { - render() { - return ( -
- -
- ); - } -} - -export default App; diff --git a/src/containers/App/index.test.js b/src/containers/App/index.test.js deleted file mode 100644 index ba444eb1b7b6c00e8380b5af03279eec67f28927..0000000000000000000000000000000000000000 --- a/src/containers/App/index.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './index'; - -it('renders without crashing', () => { - const div = document.createElement('div'); - ReactDOM.render(, div); -}); diff --git a/src/containers/App/styles.css b/src/containers/App/styles.css deleted file mode 100644 index 34b8ee09c60b8cfcc53807a2354c67d41d340899..0000000000000000000000000000000000000000 --- a/src/containers/App/styles.css +++ /dev/null @@ -1,3 +0,0 @@ -.App { - -} diff --git a/src/containers/HomePage/actions.js b/src/containers/BuildingList/actions.js similarity index 76% rename from src/containers/HomePage/actions.js rename to src/containers/BuildingList/actions.js index f37e330b89072b7e0bfba22848bd594690bcefff..600306d9accca8537cefbb41fa80a5ae04d7dca6 100644 --- a/src/containers/HomePage/actions.js +++ b/src/containers/BuildingList/actions.js @@ -1,11 +1,10 @@ import 'whatwg-fetch'; import {FETCH_BUILDINGS} from './constants' -const ROOT_URL = 'http://localhost:5404/building/'; +const ROOT_URL = process.env.REACT_APP_BUILDING_SERVICE + '/building/'; +const myHeaders = new Headers({"x-blocpower-app-key": process.env.REACT_APP_KEY}); export function fetchBuildings(address) { - const myHeaders = new Headers({"x-blocpower-app-key": "04a6b12c-d3d3-4ad2-afe4-b22fd0215578"}); - const myInit = { method: 'GET', headers: myHeaders, diff --git a/src/containers/HomePage/constants.js b/src/containers/BuildingList/constants.js similarity index 100% rename from src/containers/HomePage/constants.js rename to src/containers/BuildingList/constants.js diff --git a/src/containers/HomePage/index.js b/src/containers/BuildingList/index.js similarity index 84% rename from src/containers/HomePage/index.js rename to src/containers/BuildingList/index.js index 0664832b64e5eb78dddcb118cdcd216f42510f63..b464f7e1d58b00ff7f1858067ade6ad8f22b546e 100644 --- a/src/containers/HomePage/index.js +++ b/src/containers/BuildingList/index.js @@ -3,11 +3,11 @@ import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; import {fetchBuildings} from './actions' -import BuildingList from '../../components/BuildingList' +import BuildingListTable from '../../components/BuildingListTable' import './styles.css'; -class HomePage extends Component { +class BuildingList extends Component { constructor(props) { super(props); @@ -50,7 +50,7 @@ class HomePage extends Component { - + ) } @@ -64,4 +64,4 @@ function mapStateToProps({buildings}) { return {buildings}; } -export default connect(mapStateToProps, mapDispatchToProps)(HomePage); +export default connect(mapStateToProps, mapDispatchToProps)(BuildingList); diff --git a/src/containers/HomePage/reducer.js b/src/containers/BuildingList/reducer.js similarity index 100% rename from src/containers/HomePage/reducer.js rename to src/containers/BuildingList/reducer.js diff --git a/src/containers/HomePage/styles.css b/src/containers/BuildingList/styles.css similarity index 100% rename from src/containers/HomePage/styles.css rename to src/containers/BuildingList/styles.css diff --git a/src/index.js b/src/index.js index 252797585836c119c747af3f78092d986d08c6b2..72ebde11d51444ee7e764086e368fde67ea82e85 100644 --- a/src/index.js +++ b/src/index.js @@ -1,19 +1,14 @@ import React from 'react'; import ReactDOM from 'react-dom'; - import {Provider} from 'react-redux'; -import {createStore, applyMiddleware} from 'redux'; -import ReduxPromise from 'redux-promise'; - -import App from './containers/App'; -import rootReducer from './reducer' -const createStoreWithMiddleware = applyMiddleware(ReduxPromise)(createStore); +import store from './store'; +import BuildingList from './containers/BuildingList'; ReactDOM.render( - + store={store}> + , document.getElementById('root') ); diff --git a/src/reducer.js b/src/reducer.js index dd0cedcb55a8138bcc1e0c3d31aa506e7e7fd12a..7e64f7124e18b6011a699790430eab4750baa19b 100644 --- a/src/reducer.js +++ b/src/reducer.js @@ -1,6 +1,6 @@ import {combineReducers} from 'redux'; -import BuildingReducer from './containers/HomePage/reducer'; +import BuildingReducer from './containers/BuildingList/reducer'; const rootReducer = combineReducers({ buildings: BuildingReducer diff --git a/src/store.js b/src/store.js new file mode 100644 index 0000000000000000000000000000000000000000..134b954504539cc797cab2d3bfad2c87ca745e1b --- /dev/null +++ b/src/store.js @@ -0,0 +1,11 @@ +import { createStore, applyMiddleware } from 'redux'; +import ReduxPromise from 'redux-promise'; +import rootReducer from './reducer' + +const createStoreWithMiddleware = applyMiddleware(ReduxPromise)(createStore); + +const store = createStoreWithMiddleware(rootReducer, + window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__() +) + +export default store;