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-23 17:57:58 +02:00
commit 4443449803
9 changed files with 27 additions and 11 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

@ -36,7 +36,8 @@
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data"
"LOADING": "Loading blockchain data",
"TESTNET": "(testnet)"
}
},
"MAIN": {

7
src/gui/qt-daemon/html/assets/scss/layout/_sidebar.scss
View file

@ -167,6 +167,13 @@ app-sidebar {
background-color: themed(onlineColor);
}
}
.testnet {
@include themify($themes) {
color: themed(mainTextColor);
}
}
}
.progress-bar-container {

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

@ -4823,7 +4823,7 @@ var SettingsComponent = /** @class */ (function () {
/*! no static exports found */
/***/ (function(module, exports) {
module.exports = "<div class=\"sidebar-accounts\">\r\n <div class=\"sidebar-accounts-header\">\r\n <h3>{{ 'SIDEBAR.TITLE' | translate }}</h3><button [routerLink]=\"['main']\">{{ 'SIDEBAR.ADD_NEW' | translate }}</button>\r\n </div>\r\n <div class=\"sidebar-accounts-list scrolled-content\">\r\n <div class=\"sidebar-account\" *ngFor=\"let wallet of variablesService.wallets\" [class.active]=\"wallet?.wallet_id === walletActive\" [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">\r\n <div class=\"sidebar-account-row account-title-balance\">\r\n <span class=\"title\">{{wallet.name}}</span>\r\n <span class=\"balance\">{{wallet.unlocked_balance | intToMoney : '3' }} {{variablesService.defaultCurrency}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-alias\">\r\n <span>{{wallet.alias}}</span>\r\n <span>$ {{wallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-staking\" *ngIf=\"!(!wallet.loaded && variablesService.daemon_state === 2)\">\r\n <span class=\"text\">{{ 'SIDEBAR.ACCOUNT.STAKING' | translate }}</span>\r\n <app-staking-switch [(wallet_id)]=\"wallet.wallet_id\" [(staking)]=\"wallet.staking\"></app-staking-switch>\r\n </div>\r\n <div class=\"sidebar-account-row account-messages\" *ngIf=\"!(!wallet.loaded && variablesService.daemon_state === 2)\">\r\n <span class=\"text\">{{ 'SIDEBAR.ACCOUNT.MESSAGES' | translate }}</span>\r\n <span class=\"indicator\">{{wallet.new_contracts}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-synchronization\" *ngIf=\"!wallet.loaded && variablesService.daemon_state === 2\">\r\n <span class=\"status\">{{ 'SIDEBAR.ACCOUNT.SYNCING' | translate }}</span>\r\n <div class=\"progress-bar-container\">\r\n <div class=\"progress-bar\">\r\n <div class=\"fill\" [style.width]=\"wallet.progress + '%'\"></div>\r\n </div>\r\n <div class=\"progress-percent\">{{ wallet.progress }}%</div>\r\n </div>\r\n </div>\r\n </div>\r\n </div>\r\n</div>\r\n<div class=\"sidebar-settings\">\r\n <button [routerLink]=\"['/settings']\" routerLinkActive=\"active\">\r\n <i class=\"icon settings\"></i>\r\n <span>{{ 'SIDEBAR.SETTINGS' | translate }}</span>\r\n </button>\r\n <button (click)=\"logOut()\">\r\n <i class=\"icon logout\"></i>\r\n <span>{{ 'SIDEBAR.LOG_OUT' | translate }}</span>\r\n </button>\r\n</div>\r\n<div class=\"sidebar-synchronization-status\">\r\n <div class=\"status-container\">\r\n <span class=\"offline\" *ngIf=\"variablesService.daemon_state === 0\">{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }}</span>\r\n <span class=\"syncing\" *ngIf=\"variablesService.daemon_state === 1\">{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }}</span>\r\n <span class=\"online\" *ngIf=\"variablesService.daemon_state === 2\">{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }}</span>\r\n <span class=\"loading\" *ngIf=\"variablesService.daemon_state === 3\">{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}</span>\r\n <span class=\"offline\" *ngIf=\"variablesService.daemon_state === 4\">{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }}</span>\r\n <span class=\"online\" *ngIf=\"variablesService.daemon_state === 5\">{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }}</span>\r\n </div>\r\n <div class=\"progress-bar-container\">\r\n <div class=\"syncing\" *ngIf=\"variablesService.daemon_state === 1\">\r\n <div class=\"progress-bar\">\r\n <div class=\"fill\" [style.width]=\"variablesService.sync.progress_value + '%'\"></div>\r\n </div>\r\n <div class=\"progress-percent\">{{ variablesService.sync.progress_value_text }}%</div>\r\n </div>\r\n <div class=\"loading\" *ngIf=\"variablesService.daemon_state === 3\"></div>\r\n </div>\r\n</div>\r\n"
module.exports = "<div class=\"sidebar-accounts\">\r\n <div class=\"sidebar-accounts-header\">\r\n <h3>{{ 'SIDEBAR.TITLE' | translate }}</h3><button [routerLink]=\"['main']\">{{ 'SIDEBAR.ADD_NEW' | translate }}</button>\r\n </div>\r\n <div class=\"sidebar-accounts-list scrolled-content\">\r\n <div class=\"sidebar-account\" *ngFor=\"let wallet of variablesService.wallets\" [class.active]=\"wallet?.wallet_id === walletActive\" [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">\r\n <div class=\"sidebar-account-row account-title-balance\">\r\n <span class=\"title\">{{wallet.name}}</span>\r\n <span class=\"balance\">{{wallet.unlocked_balance | intToMoney : '3' }} {{variablesService.defaultCurrency}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-alias\">\r\n <span>{{wallet.alias}}</span>\r\n <span>$ {{wallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-staking\" *ngIf=\"!(!wallet.loaded && variablesService.daemon_state === 2)\">\r\n <span class=\"text\">{{ 'SIDEBAR.ACCOUNT.STAKING' | translate }}</span>\r\n <app-staking-switch [(wallet_id)]=\"wallet.wallet_id\" [(staking)]=\"wallet.staking\"></app-staking-switch>\r\n </div>\r\n <div class=\"sidebar-account-row account-messages\" *ngIf=\"!(!wallet.loaded && variablesService.daemon_state === 2)\">\r\n <span class=\"text\">{{ 'SIDEBAR.ACCOUNT.MESSAGES' | translate }}</span>\r\n <span class=\"indicator\">{{wallet.new_contracts}}</span>\r\n </div>\r\n <div class=\"sidebar-account-row account-synchronization\" *ngIf=\"!wallet.loaded && variablesService.daemon_state === 2\">\r\n <span class=\"status\">{{ 'SIDEBAR.ACCOUNT.SYNCING' | translate }}</span>\r\n <div class=\"progress-bar-container\">\r\n <div class=\"progress-bar\">\r\n <div class=\"fill\" [style.width]=\"wallet.progress + '%'\"></div>\r\n </div>\r\n <div class=\"progress-percent\">{{ wallet.progress }}%</div>\r\n </div>\r\n </div>\r\n </div>\r\n </div>\r\n</div>\r\n<div class=\"sidebar-settings\">\r\n <button [routerLink]=\"['/settings']\" routerLinkActive=\"active\">\r\n <i class=\"icon settings\"></i>\r\n <span>{{ 'SIDEBAR.SETTINGS' | translate }}</span>\r\n </button>\r\n <button (click)=\"logOut()\">\r\n <i class=\"icon logout\"></i>\r\n <span>{{ 'SIDEBAR.LOG_OUT' | translate }}</span>\r\n </button>\r\n</div>\r\n<div class=\"sidebar-synchronization-status\">\r\n <div class=\"status-container\">\r\n <span class=\"offline\" *ngIf=\"variablesService.daemon_state === 0\">{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }} <span class=\"testnet\">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>\r\n <span class=\"syncing\" *ngIf=\"variablesService.daemon_state === 1\">{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }} <span class=\"testnet\">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>\r\n <span class=\"online\" *ngIf=\"variablesService.daemon_state === 2\">{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }} <span class=\"testnet\">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>\r\n <span class=\"loading\" *ngIf=\"variablesService.daemon_state === 3\">{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}</span>\r\n <span class=\"offline\" *ngIf=\"variablesService.daemon_state === 4\">{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }} <span class=\"testnet\">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>\r\n <span class=\"online\" *ngIf=\"variablesService.daemon_state === 5\">{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }} <span class=\"testnet\">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>\r\n </div>\r\n <div class=\"progress-bar-container\">\r\n <div class=\"syncing\" *ngIf=\"variablesService.daemon_state === 1\">\r\n <div class=\"progress-bar\">\r\n <div class=\"fill\" [style.width]=\"variablesService.sync.progress_value + '%'\"></div>\r\n </div>\r\n <div class=\"progress-percent\">{{ variablesService.sync.progress_value_text }}%</div>\r\n </div>\r\n <div class=\"loading\" *ngIf=\"variablesService.daemon_state === 3\"></div>\r\n </div>\r\n</div>\r\n"
/***/ }),

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -44,12 +44,12 @@
</div>
<div class="sidebar-synchronization-status">
<div class="status-container">
<span class="offline" *ngIf="variablesService.daemon_state === 0">{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }}</span>
<span class="syncing" *ngIf="variablesService.daemon_state === 1">{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }}</span>
<span class="online" *ngIf="variablesService.daemon_state === 2">{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }}</span>
<span class="offline" *ngIf="variablesService.daemon_state === 0">{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>
<span class="syncing" *ngIf="variablesService.daemon_state === 1">{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>
<span class="online" *ngIf="variablesService.daemon_state === 2">{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>
<span class="loading" *ngIf="variablesService.daemon_state === 3">{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}</span>
<span class="offline" *ngIf="variablesService.daemon_state === 4">{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }}</span>
<span class="online" *ngIf="variablesService.daemon_state === 5">{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }}</span>
<span class="offline" *ngIf="variablesService.daemon_state === 4">{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>
<span class="online" *ngIf="variablesService.daemon_state === 5">{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }} <span class="testnet">{{ 'SIDEBAR.SYNCHRONIZATION.TESTNET' | translate }}</span></span>
</div>
<div class="progress-bar-container">
<div class="syncing" *ngIf="variablesService.daemon_state === 1">

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

@ -36,7 +36,8 @@
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data"
"LOADING": "Loading blockchain data",
"TESTNET": "(testnet)"
}
},
"MAIN": {

7
src/gui/qt-daemon/html_source/src/assets/scss/layout/_sidebar.scss
View file

@ -167,6 +167,13 @@ app-sidebar {
background-color: themed(onlineColor);
}
}
.testnet {
@include themify($themes) {
color: themed(mainTextColor);
}
}
}
.progress-bar-container {