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

fix countdown + counter of blocks (#112)

Browse source 
* test details & close btn

* compiled

* confirm modal

* delete "cancel" btn from aliases

* fix copy btn

* text alias fix

* confirm pop up

* lock & unlock transaction

* confirm pop up comment fix

* compiled

* rebuild html

* contact service

* rebuild html

* fix add contact + rebuild html

* allow symbols at name field diffrent from latin

* fix export import

* alias fix

* fix master pass (immigration 41 > 43)

* rebuild html

* commit

* fix

* rebuild

* fix modal width

* add type '.csv',validation empty contact list/file

* merge

* fix data.foreach & rebuild html

* fix countdown + counter of blocks
This commit is contained in:
zetov 2019-09-04 14:34:03 +03:00 • committed by cryptozoidberg
parent dbbef6a642
commit a849237b31
13 changed files with 981 additions and 1290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,9 @@
"CRITICAL_TOOLTIP": "<span class=\"critical-update\">Critical update available.</span><i class=\"icon\"></i><span>Update strongly recommended!</span>",
"TIME": "System time differs from network",
"TIME_TOOLTIP": "<span class=\"wrong-time\">Wrong system time!</span><br><span>Check and repair your system time.</span>"
}
},
"BLOCK": "Block",
"OF": "of"
},
"MAIN": {
"TITLE": "Create or open the wallet to start using Zano",

94
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

4
src/gui/qt-daemon/html/polyfills.js
View file

@ -5800,8 +5800,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(/*! c:\Projects\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! c:\Projects\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
__webpack_require__(/*! c:\Projects\Now\zano\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! c:\Projects\Now\zano\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
/***/ })

4
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

2119
src/gui/qt-daemon/html/vendor.js
View file

File diff suppressed because it is too large Load diff

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

File diff suppressed because one or more lines are too long

15
src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts
View file

@ -22,6 +22,7 @@ export class VariablesService {
public exp_med_ts = 0;
public net_time_delta_median = 0;
public height_app = 0;
public height_max = 0;
public last_build_available = '';
public last_build_displaymode = 0;
public daemon_state = 3;
@ -59,18 +60,23 @@ export class VariablesService {
getExpMedTsEvent = new BehaviorSubject(null);
getHeightAppEvent = new BehaviorSubject(null);
getHeightMaxEvent = new BehaviorSubject(null);
getRefreshStackingEvent = new BehaviorSubject(null);
getAliasChangedEvent = new BehaviorSubject(null);
public idle = new Idle()
.whenNotInteractive()
.do(() => {
this.ngZone.run(() => {
if (this.appPass == '') {
this.restartCountdown();
} else {
this.ngZone.run(() => {
this.idle.stop();
this.appPass = '';
this.appLogin = false;
this.router.navigate(['/login'], {queryParams: {type: 'auth'}});
});
}
});
public allContextMenu: ContextMenuComponent;
@ -94,6 +100,13 @@ export class VariablesService {
}
}
setHeightMax(height: number) {
if (height !== this.height_max) {
this.height_max = height;
this.getHeightMaxEvent.next(height);
}
}
setRefreshStacking(wallet_id: number) {
this.getHeightAppEvent.next(wallet_id);
}

1
src/gui/qt-daemon/html_source/src/app/app.component.ts
View file

@ -172,6 +172,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.variablesService.last_build_available = data.last_build_available;
this.variablesService.last_build_displaymode = data.last_build_displaymode;
this.variablesService.setHeightApp(data.height);
this.variablesService.setHeightMax(data.max_net_seen_height);
this.ngZone.run(() => {
this.variablesService.daemon_state = data['daemon_network_state'];

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

@ -87,6 +87,11 @@
<div class="loading" *ngIf="variablesService.daemon_state === 3"></div>
</div>
</div>
<ng-container *ngIf="variablesService.daemon_state === 1 || variablesService.daemon_state === 3">
<ng-container *ngIf="variablesService.daemon_state === 1">
<div class="progress-height">{{ 'SIDEBAR.BLOCK' | translate }} {{ variablesService.height_app }} {{ 'SIDEBAR.OF' | translate }} {{ variablesService.height_max }}</div>
</ng-container>
</ng-container>
<div class="update-container" *ngIf="(variablesService.daemon_state === 0 || variablesService.daemon_state === 2) && [2, 3, 4].indexOf(variablesService.last_build_displaymode) !== -1">
<ng-container *ngIf="variablesService.last_build_displaymode === 2">
<div class="update-text standard">
@ -118,3 +123,4 @@
<i class="icon time" tooltip="{{ 'SIDEBAR.UPDATE.TIME_TOOLTIP' | translate }}" placement="right-bottom" tooltipClass="update-tooltip important" [delay]="500"></i>
</div>
</div>

14
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.scss
View file

@ -225,14 +225,17 @@
.sidebar-synchronization-status {
display: flex;
align-items: center;
justify-content: flex-start;
flex: 0 0 7rem;
flex-direction: column;
justify-content: center;
flex: 0 0 8rem;
font-size: 1.3rem;
.progress-height {
margin-top: 1rem;
}
.status-container {
position: relative;
flex-grow: 1;
text-align: left;
.offline, .online {
@ -280,6 +283,9 @@
line-height: 0.7rem;
padding-left: 0.7rem;
}
}
.loading {

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

@ -60,7 +60,9 @@
"CRITICAL_TOOLTIP": "<span class=\"critical-update\">Critical update available.</span><i class=\"icon\"></i><span>Update strongly recommended!</span>",
"TIME": "System time differs from network",
"TIME_TOOLTIP": "<span class=\"wrong-time\">Wrong system time!</span><br><span>Check and repair your system time.</span>"
}
},
"BLOCK": "Block",
"OF": "of"
},
"MAIN": {
"TITLE": "Create or open the wallet to start using Zano",