From 59645a07100852f431fa8edf62ab8366658d29e4 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Wed, 24 Jan 2018 13:58:52 -0500 Subject: [PATCH 1/4] Rename UtilityAccount to UtilityLine --- src/components/Utilities/index.js | 4 ++-- .../index.js => UtilityLine/UtilityLine.js} | 8 ++++---- .../{UtilityAccount => UtilityLine}/dataInteraction.js | 0 src/components/{UtilityAccount => UtilityLine}/styles.css | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename src/components/{UtilityAccount/index.js => UtilityLine/UtilityLine.js} (99%) rename src/components/{UtilityAccount => UtilityLine}/dataInteraction.js (100%) rename src/components/{UtilityAccount => UtilityLine}/styles.css (100%) diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 5ce4237c..ee93bfb3 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 ( - Date: Wed, 24 Jan 2018 17:01:28 -0500 Subject: [PATCH 2/4] Rename Scrape to fetch --- src/components/UtilityLine/UtilityLine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/UtilityLine/UtilityLine.js b/src/components/UtilityLine/UtilityLine.js index 5e523517..3f906cbc 100644 --- a/src/components/UtilityLine/UtilityLine.js +++ b/src/components/UtilityLine/UtilityLine.js @@ -389,7 +389,7 @@ class UtilityLine extends Component { } onClick={this.handleFetchingUtilityBill} > - {this.state.loadingFetch ? 'Scraping...' : 'Scrape' } + {this.state.loadingFetch ? 'Fetching...' : 'Fetch' } ); } -- GitLab From b54a7d7349199c1900fe6c88c7c2a9abc254920d Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Wed, 24 Jan 2018 17:05:01 -0500 Subject: [PATCH 3/4] Remove user_created in bgroup reducer --- src/containers/BGroup/reducer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/BGroup/reducer.js b/src/containers/BGroup/reducer.js index c0e7231b..30dc95dc 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, ], }; -- GitLab From 7c2881e85a6bb49f5d01e466b287bdd562f0cf7d Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Wed, 24 Jan 2018 17:18:27 -0500 Subject: [PATCH 4/4] Update title --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 1fb1082c..cbb2bb84 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
-- GitLab