From 273f018561a7802254c817ef7bb9c473e4a0cebc Mon Sep 17 00:00:00 2001
From: AnthonyLaw <yc-law1015@hotmail.com>
Date: Tue, 30 Mar 2021 16:26:53 +0800
Subject: [PATCH 1/2] enable price chart

---
 src/components/widgets/BaseInfoWidget.vue |  4 +--
 src/infrastructure/DataService.js         |  7 ++--
 src/store/chain.js                        | 40 +++++++++++------------
 src/views/Home.vue                        |  8 ++---
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/components/widgets/BaseInfoWidget.vue b/src/components/widgets/BaseInfoWidget.vue
index 4ee8851de..68b32d11e 100644
--- a/src/components/widgets/BaseInfoWidget.vue
+++ b/src/components/widgets/BaseInfoWidget.vue
@@ -13,7 +13,7 @@
 		<template #body>
 			<b-container fluid style="height: 100%">
 				<b-row>
-					<!-- <b-col class="ex-item" sm="3" lg="12">
+					<b-col class="ex-item" sm="3" lg="3">
 						<div class="ex-item-title">
 							{{getNameByKey('price')}}
 						</div>
@@ -21,7 +21,7 @@
 							{{marketData.price}}
 						</div>
 					</b-col>
-					<b-col class="ex-item" sm="3" lg="12">
+					<!-- <b-col class="ex-item" sm="3" lg="3">
 						<div class="ex-item-title">
 							{{getNameByKey('marketCap')}}
 						</div>
diff --git a/src/infrastructure/DataService.js b/src/infrastructure/DataService.js
index dd598704e..0d20d7dcd 100644
--- a/src/infrastructure/DataService.js
+++ b/src/infrastructure/DataService.js
@@ -35,7 +35,7 @@ class DataService {
   				return resolve(res.data.DISPLAY);
   			})
   			.catch(error => {
-  				// reject(new Error('Fail to request XEM price.'))
+  				// reject(new Error(`Fail to request ${cryptocurrency} price.`))
   				reject(new Error(error));
   			});
   	});
@@ -48,7 +48,8 @@ class DataService {
    */
   static getHistoricalHourlyGraph = (cryptocurrency) => {
   	return new Promise((resolve, reject) => {
-  		let url = http.marketDataUrl + `data/histohour?fsym=${cryptocurrency}&tsym=USD&limit=168`;
+  		// Request price from exchange 'Gateio' default 'cccagg'
+  		let url = http.marketDataUrl + `data/histohour?fsym=${cryptocurrency}&tsym=USDT&limit=168&e=Gateio`;
 
   		axios
   			.get(url)
@@ -56,7 +57,7 @@ class DataService {
   				return resolve(res.data);
   			})
   			.catch(error => {
-  				// reject(new Error('Fail to request Xem historical hourly graph.'))
+  				// reject(new Error(`Fail to request ${cryptocurrency} historical hourly graph.`))
   				reject(new Error(error));
   			});
   	});
diff --git a/src/store/chain.js b/src/store/chain.js
index 57f1fe17f..9be082851 100644
--- a/src/store/chain.js
+++ b/src/store/chain.js
@@ -17,7 +17,7 @@
  */
 
 import Lock from './lock';
-import { NodeService, ChainService } from '../infrastructure';
+import { NodeService, ChainService, DataService } from '../infrastructure';
 import { RoleType } from 'symbol-sdk';
 
 const LOCK = Lock.create();
@@ -68,8 +68,8 @@ export default {
 			state.storageInfo.numAccounts = storageInfo.numAccounts;
 		},
 		setMarketData: (state, { marketData, graphData }) => {
-			state.marketData.price = marketData.XEM.USD.PRICE;
-			state.marketData.marketCap = marketData.XEM.USD.MKTCAP;
+			state.marketData.price = marketData.XYM.USD.PRICE;
+			state.marketData.marketCap = marketData.XYM.USD.MKTCAP;
 			state.marketData.historicalHourlyGraph = graphData;
 		},
 		setChainInfo: (state, { currentHeight, finalizedBlockHeight, isVotingNode }) => {
@@ -104,10 +104,10 @@ export default {
 		// Fetch data from the SDK / API and initialize the page.
 		async initializePage({ commit, dispatch }) {
 			commit('setLoading', true);
-			const [storageInfo, /* marketData, xemGraph, */ nodeStats] = await Promise.all([
+			const [storageInfo, marketData, xemGraph, nodeStats] = await Promise.all([
 				NodeService.getStorageInfo(),
-				// DataService.getMarketPrice('XEM'),
-				// DataService.getHistoricalHourlyGraph('XEM'),
+				DataService.getMarketPrice('XYM'),
+				DataService.getHistoricalHourlyGraph('XYM'),
 				NodeService.getNodeStats().catch(() => {})
 			]);
 
@@ -116,22 +116,22 @@ export default {
 			commit('setStorageInfo', storageInfo);
 			await dispatch('getChainInfo');
 
-			// let graphData = [];
+			let graphData = [];
 
-			// if (xemGraph) {
-			// 	xemGraph.Data.map((item, index) => {
-			// 		let graphDataItem = {};
+			if (xemGraph) {
+				xemGraph.Data.map((item, index) => {
+					let graphDataItem = {};
 
-			// 		graphDataItem.y = [];
-			// 		graphDataItem.x = new Date(item['time'] * 1000);
-			// 		graphDataItem.y[0] = item['open']; // parseFloat(item['open']).toFixed(4)
-			// 		graphDataItem.y[1] = item['high']; // parseFloat(item['high']).toFixed(4)
-			// 		graphDataItem.y[2] = item['low']; // parseFloat(item['low']).toFixed(4)
-			// 		graphDataItem.y[3] = item['close']; // parseFloat(item['close']).toFixed(4)
-			// 		graphData.push(graphDataItem);
-			// 	});
-			// }
-			// commit('setMarketData', { marketData, graphData });
+					graphDataItem.y = [];
+					graphDataItem.x = new Date(item['time'] * 1000);
+					graphDataItem.y[0] = item['open']; // parseFloat(item['open']).toFixed(4)
+					graphDataItem.y[1] = item['high']; // parseFloat(item['high']).toFixed(4)
+					graphDataItem.y[2] = item['low']; // parseFloat(item['low']).toFixed(4)
+					graphDataItem.y[3] = item['close']; // parseFloat(item['close']).toFixed(4)
+					graphData.push(graphDataItem);
+				});
+			}
+			commit('setMarketData', { marketData, graphData });
 
 			if (nodeStats)
 				commit('setNodeStats', nodeStats.nodeTypes);
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b3b8c40de..e4d2ff7ff 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -19,9 +19,9 @@
 <template>
 	<b-container fluid class="px-0 py-0">
 		<b-row class="my-4 mx-0 mx-xs-0 mx-md-4 mx-lg-8">
-			<!-- <b-col xs="12" md="12" lg="9" style="display: flex">
+			<b-col xs="12" md="12" lg="12" style="display: flex">
 				<PriceChartWidget style="width: 100%"/>
-			</b-col> -->
+			</b-col>
 			<b-col xs="12" md="12" lg="12" style="display: flex">
 				<BaseInfoWidget style="width: 100%"/>
 			</b-col>
@@ -36,7 +36,7 @@
 </template>
 <script>
 import BaseInfoWidget from '@/components/widgets/BaseInfoWidget.vue';
-// import PriceChartWidget from '@/components/widgets/PriceChartWidget.vue';
+import PriceChartWidget from '@/components/widgets/PriceChartWidget.vue';
 import RecentBlocksWidget from '@/components/widgets/RecentBlocksWidget.vue';
 import RecentTransactionsWidget from '@/components/widgets/RecentTransactionsWidget.vue';
 
@@ -45,7 +45,7 @@ export default {
 
 	components: {
 		BaseInfoWidget,
-		// PriceChartWidget,
+		PriceChartWidget,
 		RecentBlocksWidget,
 		RecentTransactionsWidget
 	},

From 61619ab033e2d85e1407bcada7c0869bda4e102b Mon Sep 17 00:00:00 2001
From: AnthonyLaw <yc-law1015@hotmail.com>
Date: Tue, 30 Mar 2021 16:28:40 +0800
Subject: [PATCH 2/2] rename name

---
 src/components/widgets/PriceChartWidget.vue | 2 +-
 src/config/i18n/en-us.json                  | 2 +-
 src/config/i18n/es.json                     | 2 +-
 src/config/i18n/ja.json                     | 2 +-
 src/config/i18n/pt.json                     | 2 +-
 src/config/i18n/ru.json                     | 2 +-
 src/config/i18n/ua.json                     | 2 +-
 src/config/i18n/zh.json                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/widgets/PriceChartWidget.vue b/src/components/widgets/PriceChartWidget.vue
index e29c5d239..0bea4a81f 100644
--- a/src/components/widgets/PriceChartWidget.vue
+++ b/src/components/widgets/PriceChartWidget.vue
@@ -1,7 +1,7 @@
 <template>
 	<Card :loading="loading">
 		<template #title>
-			{{getNameByKey('xemPrice')}}
+			{{getNameByKey('xymPrice')}}
 		</template>
 
 		<template #control>
diff --git a/src/config/i18n/en-us.json b/src/config/i18n/en-us.json
index cd6c6c398..f132c7569 100644
--- a/src/config/i18n/en-us.json
+++ b/src/config/i18n/en-us.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "Search block / tx hash / account address / mosaic id / namespace id",
     "nodes": "Nodes",
     "home": "Home",
-    "xemPrice": "XEM Price",
+    "xymPrice": "XYM Price",
     "baseInfo": "Base Info",
     "price": "Price",
     "marketCap": "Market Cap",
diff --git a/src/config/i18n/es.json b/src/config/i18n/es.json
index 48f697e51..90662dbb5 100644
--- a/src/config/i18n/es.json
+++ b/src/config/i18n/es.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "Search block / tx hash / account address / mosaic id / namespace id",
     "nodes": "Nodes",
     "home": "Home",
-    "xemPrice": "XEM Price",
+    "xymPrice": "XYM Price",
     "baseInfo": "Base Info",
     "price": "Price",
     "marketCap": "Market Cap",
diff --git a/src/config/i18n/ja.json b/src/config/i18n/ja.json
index 7d8d6358d..83a19c68c 100644
--- a/src/config/i18n/ja.json
+++ b/src/config/i18n/ja.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "ブロック / TXハッシュ / アドレス / モザイクID / ネームスペースID を検索",
     "nodes": "ノード",
     "home": "ホーム",
-    "xemPrice": "XEM相場",
+    "xymPrice": "XYM相場",
     "baseInfo": "基本情報",
     "price": "相場",
     "marketCap": "マーケットキャップ",
diff --git a/src/config/i18n/pt.json b/src/config/i18n/pt.json
index 70a6db50e..1d41a9470 100644
--- a/src/config/i18n/pt.json
+++ b/src/config/i18n/pt.json
@@ -102,7 +102,7 @@
     "searchBoxPlaceholder": "Search block / tx hash / account address / mosaic id / namespace id",
     "nodes": "Nodes",
     "home": "Home",
-    "xemPrice": "XEM Price",
+    "xymPrice": "XYM Price",
     "baseInfo": "Base Info",
     "price": "Price",
     "marketCap": "Market Cap",
diff --git a/src/config/i18n/ru.json b/src/config/i18n/ru.json
index de006d5fa..ec9762251 100644
--- a/src/config/i18n/ru.json
+++ b/src/config/i18n/ru.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "Поиск Блока / транзакционный хэш / аккаунт / идентификатор мозаики / идентификатор пространства имен",
     "nodes": "Узлы",
     "home": "Домашняя",
-    "xemPrice": "XEM Цена",
+    "xymPrice": "XYM Цена",
     "baseInfo": "Базовая информация",
     "price": "Цена",
     "marketCap": "Рыночная капитализация",
diff --git a/src/config/i18n/ua.json b/src/config/i18n/ua.json
index 25b6f825b..b4104d783 100644
--- a/src/config/i18n/ua.json
+++ b/src/config/i18n/ua.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "Шукати блок / хеш транзакції / адреса",
     "nodes": "Вузли",
     "home": "Домашня",
-    "xemPrice": "Ціна XEM",
+    "xymPrice": "Ціна XYM",
     "baseInfo": "Загальна інформація",
     "price": "Ціна",
     "marketCap": "Капіталізація ринку",
diff --git a/src/config/i18n/zh.json b/src/config/i18n/zh.json
index 977976d54..e0241cc88 100644
--- a/src/config/i18n/zh.json
+++ b/src/config/i18n/zh.json
@@ -101,7 +101,7 @@
     "searchBoxPlaceholder": "Search block / tx hash / account address / mosaic id / namespace id",
     "nodes": "Nodes",
     "home": "Home",
-    "xemPrice": "XEM Price",
+    "xymPrice": "XYM Price",
     "baseInfo": "Base Info",
     "price": "Price",
     "marketCap": "Market Cap",