Skip to content

Commit

Permalink
[CE-237] Add recent block&transaction query
Browse files Browse the repository at this point in the history
Add recent block&transaction query in chain page.

Change-Id: Ib26d34ad2accad750ed893c52baab4193c00aadd
Signed-off-by: Huiying Gong <541176616@qq.com>
  • Loading branch information
huiyingGong committed Jan 19, 2018
1 parent 2e4ce70 commit 1551dea
Show file tree
Hide file tree
Showing 19 changed files with 1,014 additions and 42 deletions.
115 changes: 102 additions & 13 deletions user-dashboard/js/dashboard/src/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
{
"Home": "Home",
"Title.chain": "Chain",
"Title.chain.new": "New Chain",
"Title.smart_contract": "Smart Contract",
"Title.api": "Invoke",
"Title.token": "Token",
"Title.account": "Account",
"Title.account.asset": "Account Asset",
"Menu.Chain": "Chain",
"Menu.SmartContract": "Smart Contract",
"Menu.API": "API",
"Menu.API": "Invoke",
"Menu.Token": "Token",
"Menu.ChangePwd": "ChangePwd",
"Menu.Account": "Account",
"Menu.Asset": "Asset",
"Menu.Log": "Log",
"Menu.SmartContractStore": "Smart Contract Store",
"Path.ChainNew": "Apply New Chain",
"Header.DropdownMenu.Logout": "Logout",
"Header.DropdownMenu.changePass": "Change password",
"Button.Submit": "Submit",
"Button.Confirm": "Confirm",
"Button.Cancel": "Cancel",
"Button.Download": "Download",
"Home.main.GetBlockChain":"Get your own blockchain network with only a few clicks",
"Global.message.success.newTransaction": "Got new transaction {name}",
"Global.message.success.tokenIssue": "Token issued successfully.",
"Global.message.success.transferToken": "From {from} to {to} transfer {count} request successfully. Need confirm.",
"Chain.Index.PageHeader.Content.Title.createTime": "Create Time",
"Chain.Index.PageHeader.Content.Button.actions": "Actions",
"Chain.Index.PageHeader.Content.Button.changeName": "Change Name",
"Chain.Index.PageHeader.Content.Button.release": "Release",
"Chain.Index.PageHeader.Extra.Title.status": "Status",
Expand All @@ -33,14 +47,59 @@
"Chain.Index.Overview.Help.block": "Block Number of Chain",
"Chain.Index.Overview.Help.smartContract": "Smart Contract of Chain",
"Chain.Index.Overview.Help.transaction": "Transaction of Chain",
"Chain.EmptyView.Title": "You did not add any block chains",

"Chain.Index.topologicalGraph.Title":"Network Topology",
"Chain.Index.BlockChain.Title":"Recent Block",
"Chain.Index.BlockChain.transactions":"Transactions",
"Chain.Index.BlockChain.generationTime":"Creating Time",
"Chain.Index.recentTransactions.title":"Recent Transactions",
"Chain.Index.recentTransactions.transactionContent":"Transaction Content",
"Chain.Index.recentTransactions.tradingTime":"Creating Time",
"Chain.Index.smartContract.title":"Smart Contract",
"Chain.Index.smartContract.count":"numbers of smart contracts",
"Chain.Index.smartContract.deployment":"No intelligent deployment contracts?",
"Chain.Index.smartContract.goDdeployment":"Go to deploy Smart Contracts.",
"Chain.Index.token.name":"Name",
"Chain.Index.token.total":"Total",
"Chain.Index.token.decimal":"Decimal",
"Chain.Index.token.firstTime":"Issue Time",
"Tip.releaseTip":" The blockchain that is applied by the trial user will be automatically released after 24h. If you want to upgrade to a advanced user or delay the release time of the blockchain, please contact baas@ink.one",
"Tip.releaseTitleTip":"Automatic release after ",
"Tip.applyTip":"Trial User can only apply 2 blockchains.",
"Account.address":"Address",
"Account.operation":"Operation",
"Menu.trialUser":"Trial user",
"Menu.advancedUser":"Advanced user",
"Account.tokenDetail":"Balances",
"Account.delete":"Delete",
"Chain.Index.PageHeader.Extra.Title.channelName":"Channel Name",
"Token.tokenTab.totalSupply":"Total Supply",
"Token.tokenTab.issueAddress":"Issue Address",
"Token.tokenTab.decimal":"Decimal",
"Token.tokenTab.issueTime":"Issue Time",
"Token.issueToken":"Issue Token",
"Account.newAccount":"New Account",
"Account.message.success.accountCreat":"Create Account success",
"Account.message.fail.accountCreat":"Create Account failed!",
"Token.message.fail.existence":"The existence of the same name token",
"Chain.Index.token.noSupport":"Fabric does not support Token issuing.",
"Chain.message.fail.queryChains":"Query chains failed!",
"Chain.message.fail.queryRecentBlocks":"Query recentBlocks failed!",
"Chain.message.fail.queryTransaction":"Query Transaction failed!",
"Chain.message.fail.queryBlock":"Query Block failed!",
"Chain.message.fail.queryRecentTransaction":"Query recentTransactions failed!",
"Chain.message.fail.tokenTransfer":"Query recentTokenTransfer failed!",
"Chain.message.fail.chainCode":"Query ChainCodes failed!",
"Chain.message.fail.editChain":"Edit Chain failed",
"Chain.message.success.editChain":"Edit Chain success",
"Chain.EmptyView.Title": "You need to apply a blockchain first.",
"Chain.EmptyView.Content": "Speed, free, stable, and so what, hurry up to apply it",
"Chain.EmptyView.ApplyButton": "Apply Now",
"Chain.Edit.form.title": "Update chain name",
"Chain.New.configuration.basic.title": "{type} - Basic Config",
"Chain.New.configuration.basic.content": "Free, suitable for {type} base developers",
"Chain.New.configuration.basic.content": "One CA node,one orderer node,one peer node",
"Chain.New.configuration.advance.title": "{type} - Advance Config",
"Chain.New.configuration.advance.content": "Limited time free, suitable for {type} advanced developers",
"Chain.New.configuration.advance.content": "Two CA node,one orderer node,two orgs/four peers node",
"Chain.New.form.placeholder.chainType": "Please select a chain type",
"Chain.New.form.label.name": "Name",
"Chain.New.form.label.chainType": "Chain Type",
Expand Down Expand Up @@ -72,35 +131,65 @@
"ChainCode.message.fail.listChainCode": "List Smart contract failed.",
"ChainCode.message.test": "test",
"ChainCode.Edit.form.title": "Update smart contract name",
"ChainCode.Upload.form.title": "Upload smart contract",
"ChainCode.modal.title.installChainCode": "Install Smart Contract",
"ChainCode.modal.title.instantiateChainCode": "Deploy Smart Contract",
"ChainCode.form.validate.chain.required": "Must select a chain",
"ChainCode.form.validate.version.required": "Must input smart contract version",
"ChainCode.form.validate.parameter.required": "Must input a parameter",
"ChainCode.status.uploaded": "Uploaded and not deployed",
"ChainCode.status.installed": "Uploaded and installed",
"ChainCode.status.instantiated": "Deployed at {name}",
"ChainCode.status.instantiating": "Deploying Smart Contract",
"ChainCode.status.error": "Error",
"ChainCode.New.form.validate.name.required":"Must input ChainCode name",
"API.pageHeader.content": "Contract call",
"API.button.newParam": "New Parameter",
"API.button.call": "Call",
"API.form.label.smartContract": "Smart Contract",
"API.form.label.function": "Function Name",
"API.form.label.parameter": "Parameter",
"API.form.label.method": "Method",
"API.form.label.account": "Account",
"API.form.validate.required.needInk": "Account must have token named 'INK'",
"API.form.validate.required.account": "Must select a account",
"API.form.validate.required.chainCode": "Must select a Smart contract",
"API.form.validate.required.parameter": "Must input parameter",
"API.form.validate.required.function": "Must input function name",
"API.form.validate.required.method": "Must select a method",
"API.form.placeholder.account": "Select a account",
"API.form.options.method.invoke": "Invoke",
"API.form.options.method.query": "Query",
"API.form.info.parameter": "Use , to separate parameters. Example: move, a, b, 100",
"Token.modal.issueToken.title": "Issue Token",
"Token.modal.issueToken.form.label.name": "Token Name",
"Token.modal.issueToken.form.required.name": "Must input token name",
"Token.modal.issueToken.form.required.address": "Must input issue address",
"Token.modal.issueToken.form.required.initialCount": "Must input initial token count",
"Token.modal.issueToken.form.required.maxFee": "Must input max fee",
"Token.modal.issueToken.form.label.maxFee": "Max Fee",
"Token.modal.issueToken.form.label.address": "Issue Address",
"Token.modal.issueToken.form.label.initialCount": "Initial Token Count"
"Error.code.10001": "No enough resource",
"Error.code.10002": "Resource {name} already exists",
"Messages.error.request": "Update failed. Please check your network connection.",
"Account.decimal.tip":"The decimal point must be less than {step}",
"Account.exceed.tip":"Can't exceed the total amount of token {count}",
"SmartContrct.ChainCodeExisted":"ChainCode already existed",
"smartContrat.inputChaincodes":"Please fill in the correct parameters and upload the contract",
"Token.tokenExisted":"Token already existed",
"Token.demicalLess":"Decimal must less than {maxDecimalNumber}",
"Token.tokenName":"Token Name",
"Token.tokenTotal":"Total",
"Token.tokenOpt":"Operation",
"smartContrat.upload":"Upload",
"SmartChainCodes.instantiate.name":"Name",
"SmartChainCodes.instantiate.version":"Version",
"SmartChainCodes.instantiate.chainCode":"Chain Code",
"SmartChainCodes.instantiate.description":"Description",
"SmartChainCodes.instantiate.chainCodeUpload":"File format is not correct",
"Menu.newChain":" New Chain",
"Token.transfer":"transfer",
"Chain.Index.topologicalGraph.name":"name",
"Chain.Index.topologicalGraph.type":"type",
"Chain.Index.topologicalGraph.status":"status",
"Chain.Index.topologicalGraph.nameCA":"name: ca",
"Chain.Index.topologicalGraph.namePeer":"name: peer",
"Chain.Index.topologicalGraph.nameOrderer":"name: orderer",
"Account.issueAccount":"Select a account to issue",
"Account.available":"No available account",
"Account.delete.tip":"Are you sure delete this account?",
"Account.delete.yes":"Yes",
"Account.delete.no":"no"
}
116 changes: 102 additions & 14 deletions user-dashboard/js/dashboard/src/locales/zh.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
{
"Home": "首页",
"Menu.Chain": "链路",
"Title.chain": "",
"Title.chain.new": "新建链",
"Title.smart_contract": "智能合约",
"Title.api": "合约调用",
"Title.token": "代币",
"Title.account": "账户",
"Title.account.asset": "账户资产",
"Menu.Chain": "",
"Menu.SmartContract": "智能合约",
"Menu.API": "接口",
"Menu.API": "合约调用",
"Menu.Token": "代币",
"Menu.ChangePwd": "修改密码",
"Menu.Account": "账户",
"Menu.Asset": "资产",
"Menu.Log": "日志",
"Menu.SmartContractStore": "智能合约市场",
"Header.DropdownMenu.Logout": "退出",
"Header.DropdownMenu.changePass": "修改密码",
"Path.ChainNew": "申请新的链路",
"Button.Submit": "提交",
"Button.Confirm": "确认",
"Button.Cancel": "取消",
"Button.Download": "下载",
"Home.main.GetBlockChain":"零门槛构建属于你的区块链网络",
"Global.message.success.newTransaction": "收到新的交易 {name}",
"Global.message.success.tokenIssue": "代币发行成功.",
"Global.message.success.transferToken": "从 {from} 到 {to} 转账 {count} 请求成功。需要等待确认。",
"Chain.Index.PageHeader.Content.Button.actions": "操作",
"Chain.Index.PageHeader.Content.Button.changeName": "修改名称",
"Chain.Index.PageHeader.Content.Button.release": "释放",
"Chain.Index.PageHeader.Content.Title.createTime": "创建时间",
Expand All @@ -25,22 +39,66 @@
"Chain.Index.PageHeader.Extra.Title.type": "类型",
"Chain.Index.PageHeader.Extra.Title.running": "运行时间 (小时)",
"Chain.Index.Modal.Confirm.Title.release": "是否要释放链 {name}?",
"Chain.Index.Overview.Title.peer": "节点",
"Chain.Index.Overview.Title.peer": "peer节点",
"Chain.Index.Overview.Title.block": "区块",
"Chain.Index.Overview.Title.smartContract": "智能合约",
"Chain.Index.Overview.Title.transaction": "交易",
"Chain.Index.Overview.Help.peer": "链的节点个数",
"Chain.Index.Overview.Help.block": "链的区块个数",
"Chain.Index.Overview.Help.smartContract": "链的智能合约个数",
"Chain.Index.Overview.Help.transaction": "链的交易数",
"Chain.Index.topologicalGraph.Title":"网络拓扑图",
"Chain.Index.BlockChain.Title":"最近区块",
"Chain.Index.BlockChain.transactions":"交易数",
"Chain.Index.BlockChain.generationTime":"生成时间",
"Chain.Index.recentTransactions.title":"最近交易",
"Chain.Index.recentTransactions.transactionContent":"交易内容",
"Chain.Index.recentTransactions.tradingTime":"交易时间",
"Chain.Index.smartContract.title":"智能合约",
"Chain.Index.smartContract.count":"智能合约数",
"Chain.Index.smartContract.deployment":"没有部署智能合约?",
"Chain.Index.smartContract.goDdeployment":"前往部署合约",
"Chain.Index.token.name":"名称",
"Chain.Index.token.total":"总额",
"Chain.Index.token.decimal":"小数点",
"Chain.Index.token.firstTime":"发行时间",
"Tip.releaseTip":"试用用户申请的区块链将在24h后自动释放,如果要升级为普通用户或推迟区块链的释放时间,请联系baas@ink.one",
"Tip.releaseTitleTip":"距离自动释放:",
"Tip.applyTip":"试用用户仅支持申请2个链,请释放现有链后再尝试申请",
"Account.address":"地址",
"Account.operation":"操作",
"Menu.trialUser":"试用用户",
"Menu.advancedUser":"高级用户",
"Account.tokenDetail":"代币资产",
"Account.delete":"删除",
"Chain.Index.PageHeader.Extra.Title.channelName":"通道名称",
"Token.tokenTab.totalSupply":"总额",
"Token.tokenTab.issueAddress":"发行地址",
"Token.tokenTab.decimal":"小数点",
"Token.tokenTab.issueTime":"发行时间",
"Token.issueToken":"发行Token",
"Account.newAccount":"添加账户",
"Account.message.success.accountCreat":"创建账户成功",
"Account.message.fail.accountCreat":"创建账户失败!",
"Chain.message.fail.queryChains":"查询链失败!",
"Chain.message.fail.queryRecentBlocks":"最近区块查询失败!",
"Chain.message.fail.queryTransaction":"交易查询失败!",
"Chain.message.fail.queryBlock":"区块查询失败!",
"Chain.message.fail.queryRecentTransaction":"最近区块查询失败!",
"Chain.message.fail.tokenTransfer":"最近Token转移查询失败",
"Chain.message.fail.chainCode":"智能合约查询失败",
"Chain.message.fail.editChain":"编辑链路失败",
"Chain.message.success.editChain":" 编辑链路成功",
"Token.message.fail.existence":"代币不允许出现重名",
"Chain.Index.token.noSupport":"Fabric不支持Token发行。",
"Chain.EmptyView.Title": "您还没添加任何区块链",
"Chain.EmptyView.Content": "极速、免费、稳定,还等什么,赶快申请吧",
"Chain.EmptyView.ApplyButton": "立即申请",
"Chain.Edit.form.title": "更新链名称",
"Chain.New.configuration.basic.title": "{type} - 基础配置",
"Chain.New.configuration.basic.content": "免费, 适用于 {type} 基础开发者使用",
"Chain.New.configuration.basic.content": " 1个CA节点,1个orderer节点,1个peer节点",
"Chain.New.configuration.advance.title": "{type} - 高级配置",
"Chain.New.configuration.advance.content": "限时免费, 适用于 {type} 高级开发者使用",
"Chain.New.configuration.advance.content": "2个CA节点,1 orderer节点,2 orgs/4 peers 节点",
"Chain.New.form.placeholder.chainType": "请选择一个链类型",
"Chain.New.form.label.name": "名称",
"Chain.New.form.label.chainType": "链类型",
Expand All @@ -55,6 +113,7 @@
"Chain.message.fail.applyChain": "申请链路 {name} 失败.",
"Chain.message.fail.releaseChain": "释放链路 {name} 失败.",
"ChainCode.Edit.form.title": "更新智能合约名称",
"ChainCode.Upload.form.title": "上传智能合约",
"ChainCode.button.newSmartContract": "新增智能合约",
"ChainCode.button.install": "安装",
"ChainCode.button.instantiate": "部署",
Expand All @@ -75,32 +134,61 @@
"ChainCode.modal.title.installChainCode": "安装智能合约",
"ChainCode.modal.title.instantiateChainCode": "部署智能合约",
"ChainCode.form.validate.chain.required": "必须选择一个链路",
"ChainCode.form.validate.version.required": "必须输入智能合约版本",
"ChainCode.form.validate.parameter.required": "必须输入一个参数",
"ChainCode.status.uploaded": "新上传未部署",
"ChainCode.status.installed": "上传并已安装",
"ChainCode.status.instantiated": "已部署在 {name}",
"ChainCode.status.instantiating": "正在部署智能合约",
"ChainCode.status.error": "出错",
"ChainCode.New.form.validate.name.required":"请输入合约名称",
"API.pageHeader.content": "合约调用",
"API.button.newParam": "新参数",
"API.button.call": "发起",
"API.form.label.smartContract": "智能合约",
"API.form.label.function": "函数名称",
"API.form.label.parameter": "参数",
"API.form.label.method": "方法",
"API.form.label.account": "账户",
"API.form.validate.required.needInk": "账户必须有名为'INK'的代币",
"API.form.validate.required.account": "必须选择一个账户",
"API.form.validate.required.chainCode": "必须选择一个智能合约",
"API.form.validate.required.parameter": "必须输入参数",
"API.form.validate.required.function": "必须输入函数名称",
"API.form.validate.required.method": "必须选择一个方式",
"API.form.placeholder.account": "选择一个账户",
"API.form.options.method.invoke": "调用",
"API.form.options.method.query": "查询",
"API.form.info.parameter": "使用 , 分割参数. 例如 move, a, b, 100",
"Token.modal.issueToken.title": "发行代币",
"Token.modal.issueToken.form.label.name": "代币名称",
"Token.modal.issueToken.form.required.name": "必须输入代币名称",
"Token.modal.issueToken.form.required.initialCount": "必须输入初始化代币个数",
"Token.modal.issueToken.form.required.maxFee": "必须输入最大手续费",
"Token.modal.issueToken.form.required.address": "必须输入发行地址",
"Token.modal.issueToken.form.label.maxFee": "最大手续费",
"Token.modal.issueToken.form.label.address": "发行地址",
"Token.modal.issueToken.form.label.initialCount": "初始化代币个数"
"Error.code.10001": "没有可用资源",
"Error.code.10002": "资源 {name} 已经存在。",
"Messages.error.request": "网络拥堵,部分信息更新失败。",
"Account.decimal.tip":"小数点必须小于 { step }",
"Account.exceed.tip":"不能超过代币总额 {count}",
"SmartContrct.ChainCodeExisted":"合约已存在",
"smartContrat.inputChaincodes":"请填写正确的参数并上传合约",
"Token.tokenExisted":"代币已存在",
"Token.demicalLess":"小数点必须低于 {maxDecimalNumber}",
"Token.tokenName":"代币名称",
"Token.tokenTotal":"总额",
"Token.tokenOpt":"操作",
"smartContrat.upload":"上传",
"SmartChainCodes.instantiate.name":"名称",
"SmartChainCodes.instantiate.version":"版本",
"SmartChainCodes.instantiate.chainCode":"合约",
"SmartChainCodes.instantiate.description":"描述",
"SmartChainCodes.instantiate.chainCodeUpload":"请上传正确格式的智能合约",
"Menu.newChain":" 新建链",
"Token.transfer":"转账",
"Chain.Index.topologicalGraph.name":"名称",
"Chain.Index.topologicalGraph.type":"类型",
"Chain.Index.topologicalGraph.status":"状态",
"Chain.Index.topologicalGraph.nameCA":"名称:ca",
"Chain.Index.topologicalGraph.namePeer":"名称:peer",
"Chain.Index.topologicalGraph.nameOrderer":"名称:orderer",
"Account.issueAccount":"请选择一个发行地址",
"Account.available":"没有可用的账户",
"Account.delete.tip":"确定要删除这个账户吗?",
"Account.delete.yes":"",
"Account.delete.no":""
}
Loading

0 comments on commit 1551dea

Please sign in to comment.