Merge pull request #8 from Conflux-Dev/bugfix

add system maintaining tips
Conflux-Chain · Sep 6, 2019 · f35f611 · f35f611
2 parents ae1db54 + c1bfff0
commit f35f611
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 29 deletions.
diff --git a/src/globalStyles/base.js b/src/globalStyles/base.js
@@ -96,5 +96,19 @@ const BaseStyle = css`
     padding: 5px 10px;
     z-index: 99999;
   }
+
+  .message {
+    padding: 12px;
+    font-size: 16px;
+    line-height: 16px;
+    border-radius: 4px;
+    color: #fff;
+    position: relative;
+    z-index: 9999;
+  }
+  .message-important-light {
+    background: #ffebd4;
+    color: #e76a25;
+  }
 `;
 export default BaseStyle;
diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -137,4 +137,5 @@ export default {
   'app.directory.topholders.desc': '保证社区的公开与透明',
   'app.directory.community.title': '社区',
   'app.directory.community.desc': '成为下一代去中心化社区的一员',
+  'system maintaining, please visit later': '系统维护中，请稍后访问',
 };
diff --git a/src/pages/Account/detail.js b/src/pages/Account/detail.js
@@ -403,6 +403,7 @@ class Detail extends Component {
       },
       minedTotalCount: 0,
       curMinedPage: 1,
+      showMaintaining: false,
     };
   }
 
@@ -417,33 +418,40 @@ class Detail extends Component {
   async fetchAccountDetail(accountid, queries) {
     const { history } = this.props;
     this.setState({ isLoading: true, accountid });
-    const { code, result } = (await superagent.get(`/proxy/fetchAccountDetail/${accountid}`).query(queries)).body;
-    if (!code) {
-      this.setState(
-        {
-          accountDetail: result.find((item) => Object.keys(item)[0] === `account/${accountid}`)[`account/${accountid}`],
-          // TxList: result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`)[
-          //   `account/${accountid}/transactionList`
-          // ],
-          TxList: get(
-            result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`),
-            `account/${accountid}/transactionList`,
-            []
-          ),
-          TxTotalCount: get(
-            result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`),
-            `total_account/${accountid}/transactionList`,
-            []
-          ),
-          minedTotalCount:
-            get(result.find((item) => Object.keys(item)[0] === `account/${accountid}`), [`account/${accountid}`, 'minedBlocks']) || 0,
-        },
-        () => {
-          this.setState({ isLoading: false, queries });
-        }
-      );
-    } else if (code === 1) {
-      history.push(`/search-notfound?searchId=${accountid}`);
+
+    try {
+      const { code, result } = (await superagent.get(`/proxy/fetchAccountDetail/${accountid}`).query(queries)).body;
+      if (!code) {
+        this.setState(
+          {
+            accountDetail: result.find((item) => Object.keys(item)[0] === `account/${accountid}`)[`account/${accountid}`],
+            // TxList: result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`)[
+            //   `account/${accountid}/transactionList`
+            // ],
+            TxList: get(
+              result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`),
+              `account/${accountid}/transactionList`,
+              []
+            ),
+            TxTotalCount: get(
+              result.find((item) => Object.keys(item)[0] === `account/${accountid}/transactionList`),
+              `total_account/${accountid}/transactionList`,
+              []
+            ),
+            minedTotalCount:
+              get(result.find((item) => Object.keys(item)[0] === `account/${accountid}`), [`account/${accountid}`, 'minedBlocks']) || 0,
+          },
+          () => {
+            this.setState({ isLoading: false, queries });
+          }
+        );
+      } else if (code === 1) {
+        history.push(`/search-notfound?searchId=${accountid}`);
+      }
+    } catch (e) {
+      this.setState({
+        showMaintaining: true,
+      });
     }
     return {};
   }
@@ -482,6 +490,7 @@ class Detail extends Component {
       accountid,
       minedTotalCount,
       curMinedPage,
+      showMaintaining,
     } = this.state;
     const {
       intl,
@@ -568,6 +577,11 @@ class Detail extends Component {
 
     return (
       <div className="page-address-detail">
+        {showMaintaining && (
+          <div className="message message-important-light">
+            <span>{intl.formatMessage({ id: 'system maintaining, please visit after 9/9' })}</span>
+          </div>
+        )}
         <Wrapper>
           <HeadBar>
             <h1>{i18n('Account')}</h1>

diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js
@@ -145,12 +145,19 @@ class Home extends Component {
         hashRate: 'day',
       }),
       summary: Immutable.fromJS({}),
+      showMaintaining: false,
     };
   }
 
   componentDidMount() {
     this.fetchStatistic();
-    this.fetchLineData('tps', 'day');
+    this.fetchLineData('tps', 'day').then((result) => {
+      if (result.data.length === 0) {
+        this.setState({
+          showMaintaining: true,
+        });
+      }
+    });
     this.fetchLineData('difficulty', 'day');
     this.fetchLineData('blockTime', 'day');
     this.fetchLineData('hashRate', 'day');
@@ -183,6 +190,7 @@ class Home extends Component {
         data,
       });
     }
+    return result;
   }
 
   formatTrend(value) {
@@ -196,10 +204,15 @@ class Home extends Component {
   }
 
   render() {
-    const { data, duration, summary } = this.state;
+    const { data, duration, summary, showMaintaining } = this.state;
     const { intl } = this.props;
     return (
       <Container>
+        {showMaintaining && (
+          <div className="message message-important-light">
+            <span>{intl.formatMessage({ id: 'system maintaining, please visit later' })}</span>
+          </div>
+        )}
         <BlockContainer>
           <Block key="tps" width="216px" height="44px" url={dashboard1}>
             <span className="block-title">