Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:TOMOAPP/Tomo-CashFlows-PoC

  • Loading branch information...
thanhson1085 committed Dec 20, 2017
2 parents 49f49f5 + 5f5f375 commit 892df362b172663e7e30c7101ff0f5e7cfd484cd
Showing with 14 additions and 14 deletions.
  1. +7 −7 app/App.vue
  2. +4 −4 nginx/app.template
  3. +3 −3 tomochain/entrypoint.sh
@@ -77,10 +77,10 @@
<div class="sumaryCoin">
<h3>You have total:</h3>
<h1>
<strong>{{(Math.floor((tmcSidechain + tmcMainchain)*100)/100).toFixed(2)}}</strong>
<strong>{{(tmcSidechain + tmcMainchain).toFixed(2)}}</strong>
<small>TMC</small>
<span v-if="expandSumaryCoin">
= {{tmcSidechain}} <small>TMC in Tomochain</small> + {{tmcMainchain}} <small>TMC in Ethereum</small>
= {{tmcSidechain.toFixed(2)}} <small>TMC in Tomochain</small> + {{tmcMainchain.toFixed(2)}} <small>TMC in Ethereum</small>
</span>
<md-button class="md-icon-button" @click="toggleExpandSumaryCoin">
<md-icon v-if="expandSumaryCoin">keyboard_arrow_left</md-icon>
@@ -92,7 +92,7 @@
</md-toolbar>


<md-empty-state v-if="hasCoin"
<md-empty-state v-if="!hasCoin"
md-icon="devices_other"
md-label="Get your first Tomocoins"
md-description="Hello friends, click MINE TomoCoin to receive your first Tomocoins from Tomo Reward Engine">
@@ -159,7 +159,7 @@
<md-table md-card>
<md-table-row>
<md-table-head style="width: 230px">Time</md-table-head>
<md-table-head>Type</md-table-head>
<md-table-head style="width: 160px">Type</md-table-head>
<md-table-head>Detail</md-table-head>
<md-table-head md-numeric>TMC in Tomochain</md-table-head>
<md-table-head md-numeric>TMC in Ethereum</md-table-head>
@@ -180,15 +180,15 @@
<md-table-cell>{{e.msg}}</md-table-cell>
<md-table-cell md-numeric>
<span class="color-side-chain">
{{e.tmcSidechain}}
{{(e.tmcSidechain || tmcSidechain) .toFixed(2)}}
</span>
</md-table-cell>
<md-table-cell md-numeric>
<span class="color-main-chain">
{{e.tmcMainchain}}
{{(e.tmcMainchain || tmcMainchain).toFixed(2)}}
</span>
</md-table-cell>
<md-table-cell md-numeric>{{e.total}}</md-table-cell>
<md-table-cell md-numeric>{{(e.total || (tmcSidechain + tmcMainchain)).toFixed(2)}}</md-table-cell>
</md-table-row>
</md-table>
</div>
@@ -7,8 +7,8 @@ upstream be_stats {
}

server {
listen 80 default_server;
listen [::]:80 default_server ipv6only=on;
listen 80;
server_name testnet.tomocoin.io;

location / {
proxy_set_header Upgrade $http_upgrade;
@@ -21,8 +21,8 @@ server {
}

server {
listen 80;
server_name stats.tomocoin.io;
listen 80 default_server;
listen [::]:80 default_server ipv6only=on;

location / {
proxy_set_header Upgrade $http_upgrade;
@@ -4,9 +4,9 @@ if [ ! -d /build/tomochain/geth/chaindata ]
then
wallet=$(geth account new --password /build/.pwd --datadir /build/tomochain | awk -v FS="({|})" '{print $2}')
sed -i "s/:wallet:/${wallet}/g" /build/tomochain.json
geth --nodiscover --datadir /build/tomochain init tomochain.json
geth --nodiscover --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
geth --datadir /build/tomochain init tomochain.json
geth --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
else
wallet=$(geth account list --datadir /build/tomochain| head -n 1 | awk -v FS="({|})" '{print $2}')
geth --nodiscover --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
geth --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
fi

0 comments on commit 892df36

Please sign in to comment.
You can’t perform that action at this time.