diff --git a/package.json b/package.json index dd912be..dad9286 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "dev": "vue-cli-service serve", "dist": "vue-cli-service build", "deploy": "node ./deploy.js", - "daemon:sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist server.js", - "daemon": "cross-env NODE_ENV=production pm2 start server.js -n node.console.web", + "daemon": "cross-env NODE_ENV=production node server.js", + "daemon.sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist server.js", + "daemon.pm2": "cross-env NODE_ENV=production pm2 start server.js -n node.console.web", "lint": "vue-cli-service lint", "test:unit": "vue-cli-service test:unit" }, diff --git a/src/i18n/en.js b/src/i18n/en.js index 70547f7..1d18168 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -8,15 +8,15 @@ export default { }, home: { titleOwner: 'Account', - titleNode: 'Node', + titleNode: 'Netnode', titleNetwork: 'Network', titleChain: 'Data', titleToken: 'Token', titleMarket: 'App', }, owner: { - tableHeader: 'my transaction', - searchHolder: '请输入该输入的', + tableHeader: 'Account', + searchHolder: 'Search', thId: '交易 ID', thType: '类型', thSender: '发送者', @@ -28,8 +28,8 @@ export default { tableNone: '暂无数据', }, network: { - tableHeader: 'Current neighbouring node list', - searchHolder: 'Please input node owner address or network url', + tableHeader: 'Network', + searchHolder: 'Search netnode owner address or url', thIndex: 'Nr.', thAccessPoint: 'Url', thStatus: 'Status', @@ -37,24 +37,24 @@ export default { tableNone: '暂无数据', }, chain: { - tableHeader: 'Block List', - searchHolder: '请输入该输入的', + tableHeader: 'Blockchain', + searchHolder: 'Search', thHeight: 'Height', thTimestamp: 'Timestamp', thType: 'Type', thHash: 'Hash', - tableNone: '暂无数据', + tableNone: 'No data available', }, - node: { - tableHeader: '本节点打包的区块列表', - searchHolder: '输入要查询的区块高度或者区块哈希', - thHeight: '区块高度', - thTimestamp: '时间戳', - thType: '区块类型', - thHash: '区块哈希', - tableNone: '暂无数据', - thWinner: '获胜者', - thPacker: '打包区块者', - thRewardPacker: '打包奖励', + netnode: { + tableHeader: 'Netnode', + searchHolder: 'Search block height or hash', + thHeight: 'Height', + thTimestamp: 'Timestamp', + thType: 'Type', + thHash: 'Hash', + tableNone: 'No data available', + thWinner: 'Winner', + thPacker: 'Packer', + thRewardPacker: 'Reward', }, } diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 3329470..f81810f 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -15,7 +15,7 @@ export default { titleMarket: '应用', }, owner: { - tableHeader: '我的交易', + tableHeader: '交易记录', searchHolder: '请输入查询内容', thId: '交易 ID', thType: '类型', @@ -28,8 +28,8 @@ export default { tableNone: '暂无数据', }, network: { - tableHeader: '当前邻居节点列表', - searchHolder: '请输入主人地址或节点网址', + tableHeader: '网络节点列表', + searchHolder: '查询节点主人地址或节点网址', thIndex: '序号', thAccessPoint: '连接网址', thOwnerAddress: '邻居主人地址', @@ -38,16 +38,16 @@ export default { }, chain: { tableHeader: '区块链', - searchHolder: '输入要查询的区块高度或者区块哈希', + searchHolder: '查询', thHeight: '区块高度', thTimestamp: '时间戳', thType: '区块类型', thHash: '区块哈希', tableNone: '暂无数据', }, - node: { - tableHeader: '本节点打包的区块列表', - searchHolder: '输入要查询的区块高度或者区块哈希', + netnode: { + tableHeader: '打包区块列表', + searchHolder: '查询区块高度或区块哈希', thHeight: '区块高度', thType: '区块类型', thHash: '区块哈希', diff --git a/src/router.js b/src/router.js index 1a8f898..0999bf3 100644 --- a/src/router.js +++ b/src/router.js @@ -6,7 +6,7 @@ import Home from './views/Home' import Login from './views/Login' import Owner from './views/Owner' import Chain from './views/Chain' -import Node from './views/Node' +import Netnode from './views/Netnode' import Network from './views/Network' import Market from './views/Market' @@ -27,8 +27,8 @@ const router = new Router({ component: Owner, }, { - path: 'node', - component: Node, + path: 'netnode', + component: Netnode, }, { path: 'network', diff --git a/src/services/tic.js b/src/services/tic.js index f0e868d..52b60ad 100644 --- a/src/services/tic.js +++ b/src/services/tic.js @@ -2,7 +2,7 @@ import axios from 'axios' import * as Ticrypto from 'tic.crypto' import * as ticAction from 'tic.action' -const TicActTransfer = ticAction.ActTransfer +const TicActionTransfer = ticAction.ActionTransfer const TIC_TXFEE = 10 @@ -91,7 +91,7 @@ export class TIC { if (!toAddress || !amount) { throw new Error('ERROR:RequiredParamsMissing') } // amount cannot be zero - let action = new TicActTransfer({ + let action = new TicActionTransfer({ amount: parseInt(amount), toAddress: toAddress, fee: option.gasFee, @@ -122,7 +122,7 @@ export class TIC { if (!option.toAddress || !option.amount) { throw new Error('ERROR:RequiredParamsMissing') } - let action = new TicActTransfer({ + let action = new TicActionTransfer({ amount: parseInt(option.amount), toAddress: option.toAddress, fee: option.fee || this._defaultFee, diff --git a/src/store/modules/index.js b/src/store/modules/index.js index c582df9..d2bedd3 100644 --- a/src/store/modules/index.js +++ b/src/store/modules/index.js @@ -1,6 +1,6 @@ export { default as chain } from './chain' export { default as market } from './market' export { default as network } from './network' -export { default as node } from './node' +export { default as netnode } from './netnode' export { default as owner } from './owner' export { default as login } from './login' diff --git a/src/store/modules/node.js b/src/store/modules/netnode.js similarity index 71% rename from src/store/modules/node.js rename to src/store/modules/netnode.js index 7bdc402..4edbdb0 100644 --- a/src/store/modules/node.js +++ b/src/store/modules/netnode.js @@ -5,13 +5,13 @@ export default { state: { pageEntity: [5, 10, 25], headers: [ - { text: 'node.thHeight', value: 'height', align: 'center' }, - { text: 'node.thType', value: 'type', align: 'center' }, - { text: 'node.thHash', value: 'hash', align: 'center' }, - { text: 'node.thTimestamp', value: 'timestamp', align: 'center' }, - // { text: 'node.thWinner', value: 'winnerPubkey', align: 'center' }, - { text: 'node.thPacker', value: 'packerPubkey', align: 'center' }, - { text: 'node.thRewardPacker', value: 'rewardPacker', align: 'center' }, + { text: 'netnode.thHeight', value: 'height', align: 'center' }, + { text: 'netnode.thType', value: 'type', align: 'center' }, + { text: 'netnode.thHash', value: 'hash', align: 'center' }, + { text: 'netnode.thTimestamp', value: 'timestamp', align: 'center' }, + // { text: 'netnode.thWinner', value: 'winnerPubkey', align: 'center' }, + { text: 'netnode.thPacker', value: 'packerPubkey', align: 'center' }, + { text: 'netnode.thRewardPacker', value: 'rewardPacker', align: 'center' }, ], blockList: [ { diff --git a/src/store/modules/network.js b/src/store/modules/network.js index 94cb4e3..5094703 100644 --- a/src/store/modules/network.js +++ b/src/store/modules/network.js @@ -38,7 +38,7 @@ export default { actions: { async updateNetInfo({ state, commit }) { - let result = await axios.post('Node/nodeStat', {}) + let result = await axios.post('Netnode/nodeStat', {}) commit('setNodeNumber', (result && result.data) ? result.data.length : 0) diff --git a/src/store/rootStore.js b/src/store/rootStore.js index 3ea1af1..a9e35c0 100644 --- a/src/store/rootStore.js +++ b/src/store/rootStore.js @@ -29,7 +29,7 @@ const sideMenus = [ { title: 'home.titleNode', icon: 'all_inclusive', - path: '/node', + path: '/netnode', }, { title: 'home.titleNetwork', diff --git a/src/views/Node.vue b/src/views/Netnode.vue similarity index 91% rename from src/views/Node.vue rename to src/views/Netnode.vue index 6baf5d5..83a9863 100644 --- a/src/views/Node.vue +++ b/src/views/Netnode.vue @@ -1,5 +1,5 @@  @@ -58,10 +58,10 @@ import { createNamespacedHelpers, } from 'vuex' -const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('node') +const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('netnode') export default { - name: 'Node', + name: 'Netnode', computed: { ...mapState([ @@ -94,7 +94,7 @@ export default {