Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge remote-tracking branch 'origin/frontend'

Browse source
This commit is contained in:
wildkif 2019-01-24 16:12:03 +02:00
commit edd465bd9c
10 changed files with 47 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -143,7 +143,8 @@
"HEIGHT": "Height",
"CONFIRMATION": "Confirmation",
"INPUTS": "Inputs",
"OUTPUTS": "Outputs"
"OUTPUTS": "Outputs",
"COMMENT": "Comment"
}
},
"CONTRACTS": {

22
src/gui/qt-daemon/html/main.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

8
src/gui/qt-daemon/html_source/src/app/_helpers/directives/transaction-details/transaction-details.component.html
View file

@ -1,7 +1,7 @@
<div class="table">
<div class="row">
<span class="cell label" [style.flex-basis]="sizes[0] + 'px'">{{ 'HISTORY.DETAILS.ID' | translate }}</span>
<span class="cell key-value" [style.flex-basis]="sizes[1] + 'px'">{{transaction.tx_hash}}</span>
<span class="cell key-value" [style.flex-basis]="sizes[1] + 'px'" (click)="openInBrowser(transaction.tx_hash)">{{transaction.tx_hash}}</span>
<span class="cell label" [style.flex-basis]="sizes[2] + 'px'">{{ 'HISTORY.DETAILS.SIZE' | translate }}</span>
<span class="cell value" [style.flex-basis]="sizes[3] + 'px'">{{ 'HISTORY.DETAILS.SIZE_VALUE' | translate : {value: transaction.tx_blob_size} }}</span>
</div>
@ -9,7 +9,7 @@
<span class="cell label" [style.flex-basis]="sizes[0] + 'px'">{{ 'HISTORY.DETAILS.HEIGHT' | translate }}</span>
<span class="cell value" [style.flex-basis]="sizes[1] + 'px'">{{transaction.height}}</span>
<span class="cell label" [style.flex-basis]="sizes[2] + 'px'">{{ 'HISTORY.DETAILS.CONFIRMATION' | translate }}</span>
<span class="cell value" [style.flex-basis]="sizes[3] + 'px'">{{variablesService.height_app - transaction.height}}</span>
<span class="cell value" [style.flex-basis]="sizes[3] + 'px'">{{transaction.height === 0 ? 0 : variablesService.height_app - transaction.height}}</span>
</div>
<div class="row">
<span class="cell label" [style.flex-basis]="sizes[0] + 'px'">{{ 'HISTORY.DETAILS.INPUTS' | translate }}</span>
@ -17,4 +17,8 @@
<span class="cell label" [style.flex-basis]="sizes[2] + 'px'">{{ 'HISTORY.DETAILS.OUTPUTS' | translate }}</span>
<span class="cell value" [style.flex-basis]="sizes[3] + 'px'">{{transaction.td['spn']?.length || 0}}</span>
</div>
<div class="row">
<span class="cell label" [style.flex-basis]="sizes[0] + 'px'">{{ 'HISTORY.DETAILS.COMMENT' | translate }}</span>
<span class="cell value" [style.flex-basis]="sizes[1] + sizes[2] + sizes[3] + 'px'">{{transaction.comment}}</span>
</div>
</div>

4
src/gui/qt-daemon/html_source/src/app/_helpers/directives/transaction-details/transaction-details.component.scss
View file

@ -34,6 +34,10 @@
&:last-child {
padding-right: 3rem;
}
&.key-value {
cursor: pointer;
}
}
}
}

13
src/gui/qt-daemon/html_source/src/app/_helpers/directives/transaction-details/transaction-details.component.ts
View file

@ -1,19 +1,26 @@
import {Component, OnInit, Input} from '@angular/core';
import {Component, OnInit, OnDestroy, Input} from '@angular/core';
import {Transaction} from '../../models/transaction.model';
import {VariablesService} from "../../services/variables.service";
import {BackendService} from '../../services/backend.service';
@Component({
selector: 'app-transaction-details',
templateUrl: './transaction-details.component.html',
styleUrls: ['./transaction-details.component.scss']
})
export class TransactionDetailsComponent implements OnInit {
export class TransactionDetailsComponent implements OnInit, OnDestroy {
@Input() transaction: Transaction;
@Input() sizes: Array<number>;
constructor(private variablesService: VariablesService) {}
constructor(private variablesService: VariablesService, private backendService: BackendService) {}
ngOnInit() {}
openInBrowser(tr) {
let link = 'explorer.zano.org/transaction/' + tr;
this.backendService.openUrlInBrowser(link);
}
ngOnDestroy() {}
}

6
src/gui/qt-daemon/html_source/src/app/history/history.component.scss
View file

@ -11,6 +11,10 @@
tr {
td {
min-width: 10rem;
}
.status {
position: relative;
display: flex;
@ -69,7 +73,7 @@
height: 0;
&.open {
height: 10.2rem;
height: 13.2rem;
}
td {

2
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html
View file

@ -6,7 +6,7 @@
<div class="sidebar-account" *ngFor="let wallet of variablesService.wallets" [class.active]="wallet?.wallet_id === walletActive" [routerLink]="['/wallet/' + wallet.wallet_id + '/history']">
<div class="sidebar-account-row account-title-balance">
<span class="title">{{wallet.name}}</span>
<span class="balance">{{wallet.unlocked_balance | intToMoney : '3' }} {{variablesService.defaultCurrency}}</span>
<span class="balance">{{wallet.balance | intToMoney : '3' }} {{variablesService.defaultCurrency}}</span>
</div>
<div class="sidebar-account-row account-alias">
<span>{{wallet.alias}}</span>

2
src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.html
View file

@ -1,7 +1,7 @@
<div class="header">
<div>
<h3>{{variablesService.currentWallet.name}}</h3>
<button (click)="openInBrowser('zano.org')">
<button (click)="openInBrowser('docs.zano.org/docs/how-to-get-alias')">
<i class="icon account"></i>
<span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>
</button>

3
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -143,7 +143,8 @@
"HEIGHT": "Height",
"CONFIRMATION": "Confirmation",
"INPUTS": "Inputs",
"OUTPUTS": "Outputs"
"OUTPUTS": "Outputs",
"COMMENT": "Comment"
}
},
"CONTRACTS": {