diff --git a/public/index.html b/public/index.html index 1fb1082cf0ddfe964329e142fce801aa63425606..cbb2bb847b9c439539ba217aa6b5a72e65f74ba5 100644 --- a/public/index.html +++ b/public/index.html @@ -14,7 +14,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`. --> - Buildings + Dashboard
diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 5ce4237cdd4c4e0a90984f304b1b95862662e062..ee93bfb3bd07a7ee31ed2b7f1a395a84aefc7bbb 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -7,7 +7,7 @@ import request from '../../utils/request'; import ErrorAlert from '../../components/ErrorAlert'; import { getHeaders, scrapeURL, accountURL, disaggregateURL } from '../../utils/restServices'; import LinkBarDetail from '../../components/LinkBarDetail'; -import UtilityAccount from '../UtilityAccount'; +import UtilityLine from '../UtilityLine/UtilityLine'; import Loading from '../../components/Loading'; import userPropType from '../../containers/User/propTypes'; @@ -388,7 +388,7 @@ class Utilities extends Component { accountsCounter: accountsCounter + 1, }); return ( - - {this.state.loadingFetch ? 'Scraping...' : 'Scrape' } + {this.state.loadingFetch ? 'Fetching...' : 'Fetch' } ); } @@ -895,7 +895,7 @@ class UtilityAccount extends Component { } } -UtilityAccount.propTypes = { +UtilityLine.propTypes = { form: PropTypes.shape({ utility: PropTypes.string, account_number: PropTypes.string, @@ -941,7 +941,7 @@ UtilityAccount.propTypes = { user: userPropType, }; -UtilityAccount.defaultProps = { +UtilityLine.defaultProps = { form: { utility: 'con_edison_electric', account_number: '', @@ -961,4 +961,4 @@ UtilityAccount.defaultProps = { address: '', }; -export default UtilityAccount; +export default UtilityLine; diff --git a/src/components/UtilityAccount/dataInteraction.js b/src/components/UtilityLine/dataInteraction.js similarity index 100% rename from src/components/UtilityAccount/dataInteraction.js rename to src/components/UtilityLine/dataInteraction.js diff --git a/src/components/UtilityAccount/styles.css b/src/components/UtilityLine/styles.css similarity index 100% rename from src/components/UtilityAccount/styles.css rename to src/components/UtilityLine/styles.css diff --git a/src/containers/BGroup/reducer.js b/src/containers/BGroup/reducer.js index c0e7231bcf9dfaabb974b0de6609fab427d23150..30dc95dc4f430def7242f590c43ec655b4dd1553 100644 --- a/src/containers/BGroup/reducer.js +++ b/src/containers/BGroup/reducer.js @@ -72,7 +72,7 @@ export default (state = initState, action) => { createBGroupLoading: false, createBGroupError: false, bGroups: [ - { ...action.bGroup.data, user_created: { name: localStorage.getItem('name') } }, + action.bGroup.data, ...state.bGroups, ], };