From d6a3bd8b657fa8d6e4324c016f900677cbb274df Mon Sep 17 00:00:00 2001 From: wildkif Date: Wed, 9 Jan 2019 15:31:41 +0200 Subject: [PATCH] latest GUI source --- src/gui/qt-daemon/html_source/angular.json | 3 +- .../modal-container.component.html | 12 +-- .../modal-container.component.scss | 45 ++++++-- .../modal-container.component.ts | 20 +++- .../staking-switch.component.ts | 6 +- .../_helpers/directives/tooltip.directive.ts | 44 +++++--- .../app/_helpers/services/backend.service.ts | 66 ++++++------ .../_helpers/services/modal.service.spec.ts | 12 +++ .../app/_helpers/services/modal.service.ts | 52 +++++++++ .../_helpers/services/variables.service.ts | 2 +- .../html_source/src/app/app-routing.module.ts | 2 +- .../html_source/src/app/app.component.ts | 4 +- .../html_source/src/app/app.module.ts | 5 + .../app/contracts/contracts.component.scss | 101 ++++++++++-------- .../src/app/contracts/contracts.component.ts | 3 +- .../create-wallet.component.html | 2 +- .../create-wallet/create-wallet.component.ts | 12 ++- .../src/app/history/history.component.html | 12 ++- .../src/app/history/history.component.ts | 13 +-- .../src/app/login/login.component.scss | 4 +- .../src/app/login/login.component.ts | 22 ++-- .../src/app/main/main.component.html | 2 +- .../src/app/main/main.component.scss | 1 + .../src/app/main/main.component.ts | 10 +- .../open-wallet/open-wallet.component.html | 2 +- .../app/open-wallet/open-wallet.component.ts | 28 +++-- .../src/app/purchase/purchase.component.html | 30 +++++- .../src/app/purchase/purchase.component.ts | 83 ++++++++------ .../restore-wallet.component.html | 2 +- .../restore-wallet.component.ts | 10 +- .../seed-phrase/seed-phrase.component.html | 2 +- .../app/seed-phrase/seed-phrase.component.ts | 14 +-- .../src/app/send/send.component.ts | 4 +- .../src/app/sidebar/sidebar.component.html | 4 +- .../src/app/sidebar/sidebar.component.ts | 10 -- .../wallet-details.component.html | 2 +- .../src/app/wallet/wallet.component.html | 2 +- .../src/app/wallet/wallet.component.ts | 37 +++---- .../src/assets/fonts/OpenSans-Bold.ttf | Bin 0 -> 224452 bytes .../src/assets/fonts/OpenSans-ExtraBold.ttf | Bin 0 -> 222424 bytes .../src/assets/fonts/OpenSans-Light.ttf | Bin 0 -> 222236 bytes .../src/assets/fonts/OpenSans-Regular.ttf | Bin 0 -> 217276 bytes .../src/assets/fonts/OpenSans-SemiBold.ttf | Bin 0 -> 221164 bytes .../html_source/src/assets/i18n/en.json | 55 ++++++++-- .../src/assets/icons/{modal => }/close.svg | 0 .../html_source/src/assets/icons/logo.svg | 31 ++++++ .../{modal/alert.svg => modal-alert.svg} | 0 .../icons/{modal/info.svg => modal-info.svg} | 0 .../{modal/success.svg => modal-success.svg} | 0 .../src/assets/scss/base/_base.scss | 100 ++++++++++++++++- .../src/assets/scss/base/_theme.scss | 19 +++- .../src/assets/scss/layout/_main.scss | 24 ----- .../src/assets/scss/modules/_head.scss | 1 + .../html_source/src/files/Zano.desktop | 8 ++ .../html_source/src/files/app22macos.png | Bin 0 -> 992 bytes .../src/files/app22macos_blocked.png | Bin 0 -> 15225 bytes .../html_source/src/files/app22windows.png | Bin 0 -> 724 bytes .../src/files/app22windows_blocked.png | Bin 0 -> 1247 bytes .../src/files/desktop_linux_icon.png | Bin 0 -> 1293 bytes src/gui/qt-daemon/html_source/src/index.html | 1 - src/gui/qt-daemon/html_source/src/styles.scss | 61 ++++++----- 61 files changed, 666 insertions(+), 319 deletions(-) create mode 100644 src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.spec.ts create mode 100644 src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.ts create mode 100644 src/gui/qt-daemon/html_source/src/assets/fonts/OpenSans-Bold.ttf create mode 100644 src/gui/qt-daemon/html_source/src/assets/fonts/OpenSans-ExtraBold.ttf create mode 100644 src/gui/qt-daemon/html_source/src/assets/fonts/OpenSans-Light.ttf create mode 100644 src/gui/qt-daemon/html_source/src/assets/fonts/OpenSans-Regular.ttf create mode 100644 src/gui/qt-daemon/html_source/src/assets/fonts/OpenSans-SemiBold.ttf rename src/gui/qt-daemon/html_source/src/assets/icons/{modal => }/close.svg (100%) create mode 100644 src/gui/qt-daemon/html_source/src/assets/icons/logo.svg rename src/gui/qt-daemon/html_source/src/assets/icons/{modal/alert.svg => modal-alert.svg} (100%) rename src/gui/qt-daemon/html_source/src/assets/icons/{modal/info.svg => modal-info.svg} (100%) rename src/gui/qt-daemon/html_source/src/assets/icons/{modal/success.svg => modal-success.svg} (100%) create mode 100644 src/gui/qt-daemon/html_source/src/files/Zano.desktop create mode 100644 src/gui/qt-daemon/html_source/src/files/app22macos.png create mode 100644 src/gui/qt-daemon/html_source/src/files/app22macos_blocked.png create mode 100644 src/gui/qt-daemon/html_source/src/files/app22windows.png create mode 100644 src/gui/qt-daemon/html_source/src/files/app22windows_blocked.png create mode 100644 src/gui/qt-daemon/html_source/src/files/desktop_linux_icon.png diff --git a/src/gui/qt-daemon/html_source/angular.json b/src/gui/qt-daemon/html_source/angular.json index d3e64ded..93ec133e 100644 --- a/src/gui/qt-daemon/html_source/angular.json +++ b/src/gui/qt-daemon/html_source/angular.json @@ -24,7 +24,8 @@ "tsConfig": "src/tsconfig.app.json", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/files" ], "styles": [ "src/styles.scss" diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.html b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.html index ef33c21f..135ca9fa 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.html +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.html @@ -1,11 +1,11 @@
- -
- Success - Successfully + +
+ {{title}} + {{message}}
- - + +
diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.scss b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.scss index c0eacb22..2b2f4287 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.scss +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.scss @@ -13,28 +13,53 @@ position: relative; display: flex; flex-direction: column; + background-position: center; + background-size: 200%; padding: 2rem; width: 34rem; - background: #1a1a1a; .content { display: flex; margin: 1.2rem 0; .icon { + flex: 0 0 auto; width: 4.4rem; height: 4.4rem; + + &.error { + mask: url(~src/assets/icons/modal-alert.svg) no-repeat center; + } + + &.success { + mask: url(~src/assets/icons/modal-success.svg) no-repeat center; + } + + &.info { + mask: url(~src/assets/icons/modal-info.svg) no-repeat center; + } } - .message { + .message-container { display: flex; flex-direction: column; margin-left: 2rem; + + .title { + font-size: 1.8rem; + font-weight: 600; + line-height: 2.2rem; + } + + .message { + font-size: 1.3rem; + line-height: 1.8rem; + margin-top: 0.4rem; + } } } .action-button { - background: #2c95f1; margin: 1.2rem auto 0.6rem; width: 10rem; height: 2.4rem; @@ -42,15 +67,21 @@ .close-button { position: absolute; - top: 0.5rem; - right: 0.5rem; + top: 0; + right: 0; display: flex; align-items: center; justify-content: center; background: transparent; margin: 0; padding: 0; - width: 1.5rem; - height: 1.5rem; + width: 2.4rem; + height: 2.4rem; + + .icon { + mask: url(~src/assets/icons/close.svg) no-repeat center; + width: 2.4rem; + height: 2.4rem; + } } } diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.ts index c9ca6c83..88ffa313 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/modal-container/modal-container.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'app-modal-container', @@ -7,9 +7,25 @@ import { Component, OnInit } from '@angular/core'; }) export class ModalContainerComponent implements OnInit { - constructor() { } + public title: string; + @Input() type: string; + @Input() message: string; + @Output() close = new EventEmitter(); + @ViewChild('btn') button: ElementRef; + + constructor() {} ngOnInit() { + this.button.nativeElement.focus(); + switch (this.type) { + case 'error': this.title = 'Wrong'; break; + case 'success': this.title = 'Success'; break; + case 'info': this.title = 'Information'; break; + default: this.title = 'Unexpected'; break; + } } + onClose() { + this.close.emit(); + } } diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/staking-switch/staking-switch.component.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/staking-switch/staking-switch.component.ts index 96b6679b..01f937ec 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/staking-switch/staking-switch.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/staking-switch/staking-switch.component.ts @@ -13,11 +13,9 @@ export class StakingSwitchComponent implements OnInit { @Input() staking: boolean; @Output() stakingChange = new EventEmitter(); - constructor(private backend: BackendService, private variablesService: VariablesService) { - } + constructor(private backend: BackendService, private variablesService: VariablesService) {} - ngOnInit() { - } + ngOnInit() {} toggleStaking() { const wallet = this.variablesService.getWallet(this.wallet_id); diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/tooltip.directive.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/tooltip.directive.ts index 437bab7f..1cc4176b 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/directives/tooltip.directive.ts +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/directives/tooltip.directive.ts @@ -1,28 +1,36 @@ -import {Directive, Input, ElementRef, HostListener, Renderer2} from '@angular/core'; +import {Directive, Input, ElementRef, HostListener, Renderer2, HostBinding} from '@angular/core'; @Directive({ - selector: '[tooltip]', - host: { - '[style.cursor]': '"pointer"' - } + selector: '[tooltip]' }) export class TooltipDirective { + + @HostBinding('style.cursor') cursor = 'pointer'; + @Input('tooltip') tooltipTitle: string; @Input() placement: string; @Input() tooltipClass: string; @Input() delay: number; tooltip: HTMLElement; - offset = 10; - constructor(private el: ElementRef, private renderer: Renderer2) {} + removeTooltipTimeout; + + constructor(private el: ElementRef, private renderer: Renderer2) { + } @HostListener('mouseenter') onMouseEnter() { - if (!this.tooltip) { this.show(); } + if (!this.tooltip) { + this.show(); + } else { + this.cancelHide(); + } } @HostListener('mouseleave') onMouseLeave() { - if (this.tooltip) { this.hide(); } + if (this.tooltip) { + this.hide(); + } } show() { @@ -32,12 +40,17 @@ export class TooltipDirective { hide() { this.renderer.setStyle(this.tooltip, 'opacity', '0'); - window.setTimeout(() => { + this.removeTooltipTimeout = setTimeout(() => { this.renderer.removeChild(document.body, this.tooltip); this.tooltip = null; }, this.delay); } + cancelHide() { + clearTimeout(this.removeTooltipTimeout); + this.renderer.setStyle(this.tooltip, 'opacity', '1'); + } + create() { this.tooltip = this.renderer.createElement('span'); this.renderer.appendChild(this.tooltip, this.renderer.createText(this.tooltipTitle)); @@ -76,8 +89,15 @@ export class TooltipDirective { } if (this.placement === 'bottom') { - this.renderer.setStyle(this.tooltip, 'top', hostPos.bottom + 'px'); - this.renderer.setStyle(this.tooltip, 'left', hostPos.left + 'px'); + if (window.innerHeight < hostPos.bottom + this.tooltip.offsetHeight + parseInt(getComputedStyle(this.tooltip).marginTop, 10)) { + this.renderer.removeClass(this.tooltip, 'ng-tooltip-bottom'); + this.renderer.addClass(this.tooltip, 'ng-tooltip-top'); + this.renderer.setStyle(this.tooltip, 'top', hostPos.top - tooltipPos.height + 'px'); + this.renderer.setStyle(this.tooltip, 'left', hostPos.left + 'px'); + } else { + this.renderer.setStyle(this.tooltip, 'top', hostPos.bottom + 'px'); + this.renderer.setStyle(this.tooltip, 'left', hostPos.left + 'px'); + } } if (this.placement === 'left') { diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts index 3b385ba3..85f820ca 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts @@ -1,6 +1,8 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; +import {TranslateService} from '@ngx-translate/core'; import {VariablesService} from './variables.service'; +import {ModalService} from './modal.service'; import {MoneyToIntPipe} from '../pipes/money-to-int.pipe'; @Injectable() @@ -9,9 +11,7 @@ export class BackendService { backendObject: any; backendLoaded = false; - constructor(private variablesService: VariablesService, private moneyToIntPipe: MoneyToIntPipe) { - } - + constructor(private translate: TranslateService, private variablesService: VariablesService, private modalService: ModalService, private moneyToIntPipe: MoneyToIntPipe) {} private Debug(type, message) { switch (type) { @@ -35,11 +35,11 @@ export class BackendService { switch (error) { case 'NOT_ENOUGH_MONEY': - error_translate = 'ERROR.NOT_ENOUGH_MONEY'; + error_translate = 'ERRORS.NOT_ENOUGH_MONEY'; break; case 'CORE_BUSY': if (command !== 'get_all_aliases') { - error_translate = 'INFORMER.CORE_BUSY'; + error_translate = 'ERRORS.CORE_BUSY'; } break; case 'OVERFLOW': @@ -48,62 +48,62 @@ export class BackendService { } break; case 'INTERNAL_ERROR:daemon is busy': - error_translate = 'INFORMER.DAEMON_BUSY'; + error_translate = 'ERRORS.DAEMON_BUSY'; break; case 'INTERNAL_ERROR:not enough money': case 'INTERNAL_ERROR:NOT_ENOUGH_MONEY': if (command === 'cancel_offer') { - // error_translate = $filter('translate')('INFORMER.NO_MONEY_REMOVE_OFFER', { - // 'fee': CONFIG.standart_fee, - // 'currency': CONFIG.currency_symbol - // }); + error_translate = this.translate.instant('ERRORS.NO_MONEY_REMOVE_OFFER', { + 'fee': '0.01', + 'currency': 'ZAN' + }); } else { error_translate = 'INFORMER.NO_MONEY'; } break; case 'INTERNAL_ERROR:not enough outputs to mix': - error_translate = 'MESSAGE.NOT_ENOUGH_OUTPUTS_TO_MIX'; + error_translate = 'ERRORS.NOT_ENOUGH_OUTPUTS_TO_MIX'; break; case 'INTERNAL_ERROR:transaction is too big': - error_translate = 'MESSAGE.TRANSACTION_IS_TO_BIG'; + error_translate = 'ERRORS.TRANSACTION_IS_TO_BIG'; break; case 'INTERNAL_ERROR:Transfer attempt while daemon offline': - error_translate = 'MESSAGE.TRANSFER_ATTEMPT'; + error_translate = 'ERRORS.TRANSFER_ATTEMPT'; break; case 'ACCESS_DENIED': - error_translate = 'INFORMER.ACCESS_DENIED'; + error_translate = 'ERRORS.ACCESS_DENIED'; break; case 'INTERNAL_ERROR:transaction was rejected by daemon': - if (command === 'request_alias_registration') { - error_translate = 'INFORMER.ALIAS_IN_REGISTER'; - } else { - error_translate = 'INFORMER.TRANSACTION_ERROR'; - } + // if (command === 'request_alias_registration') { + // error_translate = 'INFORMER.ALIAS_IN_REGISTER'; + // } else { + error_translate = 'ERRORS.TRANSACTION_ERROR'; + // } break; case 'INTERNAL_ERROR': - error_translate = 'INFORMER.TRANSACTION_ERROR'; + error_translate = 'ERRORS.TRANSACTION_ERROR'; break; case 'BAD_ARG': - error_translate = 'INFORMER.BAD_ARG'; + error_translate = 'ERRORS.BAD_ARG'; break; case 'WALLET_WRONG_ID': - error_translate = 'INFORMER.WALLET_WRONG_ID'; + error_translate = 'ERRORS.WALLET_WRONG_ID'; break; case 'WRONG_PASSWORD': case 'WRONG_PASSWORD:invalid password': params = JSON.parse(params); if (!params.testEmpty) { - error_translate = 'INFORMER.WRONG_PASSWORD'; + error_translate = 'ERRORS.WRONG_PASSWORD'; } break; case 'FILE_RESTORED': if (command === 'open_wallet') { - // error_translate = $filter('translate')('INFORMER.FILE_RESTORED'); + error_translate = 'ERRORS.FILE_RESTORED'; } break; case 'FILE_NOT_FOUND': if (command !== 'open_wallet' && command !== 'get_alias_info_by_name' && command !== 'get_alias_info_by_address') { - // error_translate = $filter('translate')('INFORMER.FILE_NOT_FOUND'); + error_translate = this.translate.instant('ERRORS.FILE_NOT_FOUND'); params = JSON.parse(params); if (params.path) { error_translate += ': ' + params.path; @@ -119,16 +119,16 @@ export class BackendService { } break; case 'ALREADY_EXISTS': - error_translate = 'INFORMER.FILE_EXIST'; + error_translate = 'ERRORS.FILE_EXIST'; break; default: error_translate = error; } if (error.indexOf('FAIL:failed to save file') > -1) { - error_translate = 'INFORMER.FILE_NOT_SAVED'; + error_translate = 'ERRORS.FILE_NOT_SAVED'; } if (error_translate !== '') { - alert(error_translate); + this.modalService.prepareModal('error', error_translate); } } @@ -272,7 +272,7 @@ export class BackendService { } storeSecureAppData(callback) { - if ( this.variablesService.appPass === '' ) { + if (this.variablesService.appPass === '') { return callback(false); } const wallets = []; @@ -461,6 +461,10 @@ export class BackendService { this.runCommand('stop_pos_mining', {wallet_id: parseInt(wallet_id, 10)}, callback); } + openUrlInBrowser(url, callback?) { + this.runCommand('open_url_in_browser', url, callback); + } + } @@ -653,9 +657,7 @@ export class BackendService { return this.runCommand('print_log', {msg: msg, log_level: log_level}); }, - openUrlInBrowser: function (url, callback) { - return this.runCommand('open_url_in_browser', url, callback); - }, + diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.spec.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.spec.ts new file mode 100644 index 00000000..1b736866 --- /dev/null +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { ModalService } from './modal.service'; + +describe('ModalService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: ModalService = TestBed.get(ModalService); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.ts new file mode 100644 index 00000000..04d1fe79 --- /dev/null +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/services/modal.service.ts @@ -0,0 +1,52 @@ +import {Injectable, Injector, ComponentFactoryResolver, EmbeddedViewRef, ApplicationRef, NgZone} from '@angular/core'; +import {TranslateService} from '@ngx-translate/core'; +import {ModalContainerComponent} from '../directives/modal-container/modal-container.component'; + +@Injectable() +export class ModalService { + + private components: any[] = []; + + constructor( + private componentFactoryResolver: ComponentFactoryResolver, + private appRef: ApplicationRef, + private injector: Injector, + private ngZone: NgZone, + private translate: TranslateService + ) {} + + prepareModal(type, message) { + const length = this.components.push( + this.componentFactoryResolver.resolveComponentFactory(ModalContainerComponent).create(this.injector) + ); + + this.components[length - 1].instance['type'] = type; + this.components[length - 1].instance['message'] = this.translate.instant(message); + this.components[length - 1].instance['close'].subscribe(() => { + this.removeModal(length - 1); + }); + + this.ngZone.run(() => { + this.appendModal(length - 1); + }); + } + + appendModal(index) { + this.appRef.attachView(this.components[index].hostView); + const domElem = (this.components[index].hostView as EmbeddedViewRef).rootNodes[0] as HTMLElement; + document.body.appendChild(domElem); + } + + removeModal(index) { + if (this.components[index]) { + this.appRef.detachView(this.components[index].hostView); + this.components[index].destroy(); + this.components.splice(index, 1); + } else { + const last = this.components.length - 1; + this.appRef.detachView(this.components[last].hostView); + this.components[last].destroy(); + this.components.splice(last, 1); + } + } +} diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts index c6ddb1fa..a567b7e4 100644 --- a/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts +++ b/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts @@ -82,7 +82,7 @@ export class VariablesService { } startCountdown() { - this.idle.restart(); + this.idle.start(); } stopCountdown() { diff --git a/src/gui/qt-daemon/html_source/src/app/app-routing.module.ts b/src/gui/qt-daemon/html_source/src/app/app-routing.module.ts index 52214b5e..0c2228e1 100644 --- a/src/gui/qt-daemon/html_source/src/app/app-routing.module.ts +++ b/src/gui/qt-daemon/html_source/src/app/app-routing.module.ts @@ -75,7 +75,7 @@ const routes: Routes = [ }, { path: '', - redirectTo: 'send', + redirectTo: 'history', pathMatch: 'full' } ] diff --git a/src/gui/qt-daemon/html_source/src/app/app.component.ts b/src/gui/qt-daemon/html_source/src/app/app.component.ts index e3c56615..3e5db8cf 100644 --- a/src/gui/qt-daemon/html_source/src/app/app.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/app.component.ts @@ -385,7 +385,6 @@ export class AppComponent implements OnInit, OnDestroy { } getMoneyEquivalent() { - // todo now start only once, need check daemon state and re-init this.http.get('https://api.coinmarketcap.com/v2/ticker/2').subscribe( result => { if (result.hasOwnProperty('data')) { @@ -393,6 +392,9 @@ export class AppComponent implements OnInit, OnDestroy { } }, error => { + setTimeout(() => { + this.getMoneyEquivalent(); + }, 60000); console.warn('Error coinmarketcap', error); } ); diff --git a/src/gui/qt-daemon/html_source/src/app/app.module.ts b/src/gui/qt-daemon/html_source/src/app/app.module.ts index 8340191c..b172e201 100644 --- a/src/gui/qt-daemon/html_source/src/app/app.module.ts +++ b/src/gui/qt-daemon/html_source/src/app/app.module.ts @@ -29,6 +29,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TypingMessageComponent } from './typing-message/typing-message.component'; import { BackendService } from './_helpers/services/backend.service'; +import { ModalService } from './_helpers/services/modal.service'; import { MoneyToIntPipe } from './_helpers/pipes/money-to-int.pipe'; import { IntToMoneyPipe } from './_helpers/pipes/int-to-money.pipe'; import { StakingSwitchComponent } from './_helpers/directives/staking-switch/staking-switch.component'; @@ -105,10 +106,14 @@ Highcharts.setOptions({ ], providers: [ BackendService, + ModalService, MoneyToIntPipe, IntToMoneyPipe, // {provide: HIGHCHARTS_MODULES, useFactory: () => [ highstock, more, exporting ] } ], + entryComponents: [ + ModalContainerComponent + ], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.scss b/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.scss index a15d011b..32e5a0dd 100644 --- a/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.scss +++ b/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.scss @@ -10,60 +10,71 @@ margin: -3rem -3rem 0 -3rem; overflow-x: auto; - .contract { - position: relative; - display: flex; - align-items: center; + table { - .icon { - flex-shrink: 0; + tbody { - &.new, &.alert { - position: absolute; - top: 0; - } + tr { + cursor: pointer; + outline: none !important; - &.new { - left: -2.3rem; - mask: url(../../assets/icons/new.svg) no-repeat center; - width: 1.7rem; - height: 1.7rem; - } + .contract { + position: relative; + display: flex; + align-items: center; - &.alert { - top: 0.2rem; - left: -2.1rem; - mask: url(../../assets/icons/alert.svg) no-repeat center; - width: 1.2rem; - height: 1.2rem; - } + .icon { + flex-shrink: 0; - &.purchase, &.sell { - margin-right: 1rem; - width: 1.5rem; - height: 1.5rem; - } + &.new, &.alert { + position: absolute; + top: 0; + } - &.purchase { - mask: url(../../assets/icons/purchase.svg) no-repeat center; - } + &.new { + left: -2.3rem; + mask: url(../../assets/icons/new.svg) no-repeat center; + width: 1.7rem; + height: 1.7rem; + } - &.sell { - mask: url(../../assets/icons/sell.svg) no-repeat center; + &.alert { + top: 0.2rem; + left: -2.1rem; + mask: url(../../assets/icons/alert.svg) no-repeat center; + width: 1.2rem; + height: 1.2rem; + } + + &.purchase, &.sell { + margin-right: 1rem; + width: 1.5rem; + height: 1.5rem; + } + + &.purchase { + mask: url(../../assets/icons/purchase.svg) no-repeat center; + } + + &.sell { + mask: url(../../assets/icons/sell.svg) no-repeat center; + } + } + + span { + text-overflow: ellipsis; + overflow: hidden; + max-width: 20vw; + } + } + + .status, .comment { + text-overflow: ellipsis; + overflow: hidden; + max-width: 20vw; + } } } - - span { - text-overflow: ellipsis; - overflow: hidden; - max-width: 20vw; - } - } - - .status, .comment { - text-overflow: ellipsis; - overflow: hidden; - max-width: 20vw; } } diff --git a/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.ts b/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.ts index 633989c7..44b259c5 100644 --- a/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/contracts/contracts.component.ts @@ -16,7 +16,8 @@ export class ContractsComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private router: Router, private variablesService: VariablesService - ) {} + ) { + } ngOnInit() { this.parentRouting = this.route.parent.params.subscribe(params => { diff --git a/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.html b/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.html index 3201daec..f6ad6a5e 100644 --- a/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.html +++ b/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.html @@ -2,7 +2,7 @@
- {{ 'BREADCRUMBS.ADD_WALLET' | translate }} + {{ 'BREADCRUMBS.ADD_WALLET' | translate }} {{ 'BREADCRUMBS.CREATE_WALLET' | translate }}
diff --git a/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.ts b/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.ts index a289e4e6..33c61245 100644 --- a/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/create-wallet/create-wallet.component.ts @@ -2,8 +2,10 @@ import {Component, NgZone, OnInit} from '@angular/core'; import {FormGroup, FormControl, Validators} from '@angular/forms'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; import {Router} from '@angular/router'; import {Wallet} from '../_helpers/models/wallet.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-create-wallet', @@ -37,7 +39,9 @@ export class CreateWalletComponent implements OnInit { private router: Router, private backend: BackendService, private variablesService: VariablesService, - private ngZone: NgZone + private modalService: ModalService, + private ngZone: NgZone, + private translate: TranslateService ) { } @@ -50,7 +54,7 @@ export class CreateWalletComponent implements OnInit { saveWallet() { if (this.createForm.valid) { - this.backend.saveFileDialog('Save the wallet file.', '*', this.variablesService.settings.default_path, (file_status, file_data) => { + this.backend.saveFileDialog(this.translate.instant('CREATE_WALLET.TITLE_SAVE'), '*', this.variablesService.settings.default_path, (file_status, file_data) => { if (file_status) { this.variablesService.settings.default_path = file_data.path.substr(0, file_data.path.lastIndexOf('/')); this.backend.generateWallet(file_data.path, this.createForm.get('password').value, (generate_status, generate_data, errorCode) => { @@ -72,9 +76,9 @@ export class CreateWalletComponent implements OnInit { }); } else { if (errorCode && errorCode === 'ALREADY_EXISTS') { - alert('You cannot record a file on top of another file'); + this.modalService.prepareModal('error', 'CREATE_WALLET.ERROR_CANNOT_SAVE_TOP'); } else { - alert('You cannot save a safe file to the system partition'); + this.modalService.prepareModal('error', 'CREATE_WALLET.ERROR_CANNOT_SAVE_SYSTEM'); } } }); diff --git a/src/gui/qt-daemon/html_source/src/app/history/history.component.html b/src/gui/qt-daemon/html_source/src/app/history/history.component.html index 7f0cc12e..09d739c9 100644 --- a/src/gui/qt-daemon/html_source/src/app/history/history.component.html +++ b/src/gui/qt-daemon/html_source/src/app/history/history.component.html @@ -13,15 +13,19 @@
-
-
-
+ +
+
+
+ {{ (item.is_income ? 'HISTORY.RECEIVED' : 'HISTORY.SEND') | translate }}
{{item.timestamp * 1000 | date : 'dd-MM-yyyy HH:mm'}} - {{item.sortAmount | intToMoney}} {{variablesService.defaultCurrency}} + + {{item.sortAmount | intToMoney}} {{variablesService.defaultCurrency}} + {{item.sortFee | intToMoney}} {{variablesService.defaultCurrency}} diff --git a/src/gui/qt-daemon/html_source/src/app/history/history.component.ts b/src/gui/qt-daemon/html_source/src/app/history/history.component.ts index 0811a1fe..169d8863 100644 --- a/src/gui/qt-daemon/html_source/src/app/history/history.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/history/history.component.ts @@ -1,6 +1,4 @@ import {Component, OnInit, OnDestroy} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; @Component({ @@ -9,19 +7,11 @@ import {VariablesService} from '../_helpers/services/variables.service'; styleUrls: ['./history.component.scss'] }) export class HistoryComponent implements OnInit, OnDestroy { - parentRouting; - constructor( - private route: ActivatedRoute, - private backend: BackendService, - private variablesService: VariablesService - ) { + constructor(private variablesService: VariablesService) { } ngOnInit() { - this.parentRouting = this.route.parent.params.subscribe(() => { - console.log(this.variablesService.currentWallet.history); - }); } getHeight(item) { @@ -37,7 +27,6 @@ export class HistoryComponent implements OnInit, OnDestroy { } ngOnDestroy() { - this.parentRouting.unsubscribe(); } } diff --git a/src/gui/qt-daemon/html_source/src/app/login/login.component.scss b/src/gui/qt-daemon/html_source/src/app/login/login.component.scss index 8a78855c..e1894e0d 100644 --- a/src/gui/qt-daemon/html_source/src/app/login/login.component.scss +++ b/src/gui/qt-daemon/html_source/src/app/login/login.component.scss @@ -14,9 +14,9 @@ max-width: 40rem; .logo { - background: url("../../assets/images/logo.png") no-repeat center top; + background: url(../../assets/icons/logo.svg) no-repeat center; width: 100%; - height: 14rem; + height: 20rem; } .form-login { diff --git a/src/gui/qt-daemon/html_source/src/app/login/login.component.ts b/src/gui/qt-daemon/html_source/src/app/login/login.component.ts index 2c627881..ae7146b0 100644 --- a/src/gui/qt-daemon/html_source/src/app/login/login.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/login/login.component.ts @@ -1,8 +1,9 @@ -import {Component, NgZone, OnInit} from '@angular/core'; +import {Component, NgZone, OnInit, OnDestroy} from '@angular/core'; import {FormGroup, FormControl, Validators} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; import {Wallet} from '../_helpers/models/wallet.model'; @Component({ @@ -10,7 +11,9 @@ import {Wallet} from '../_helpers/models/wallet.model'; templateUrl: './login.component.html', styleUrls: ['./login.component.scss'] }) -export class LoginComponent implements OnInit { +export class LoginComponent implements OnInit, OnDestroy { + + queryRouting; regForm = new FormGroup({ password: new FormControl('', Validators.required), @@ -30,12 +33,13 @@ export class LoginComponent implements OnInit { private router: Router, private backend: BackendService, private variablesService: VariablesService, + private modalService: ModalService, private ngZone: NgZone ) { } ngOnInit() { - this.route.queryParams.subscribe(params => { + this.queryRouting = this.route.queryParams.subscribe(params => { if (params.type) { this.type = params.type; } @@ -51,7 +55,6 @@ export class LoginComponent implements OnInit { this.router.navigate(['/']); }); } else { - // TODO error sign in console.log(data['error_code']); } }); @@ -62,10 +65,7 @@ export class LoginComponent implements OnInit { if (this.authForm.valid) { const appPass = this.authForm.get('password').value; this.backend.getSecureAppData({pass: appPass}, (status, data) => { - if (data.error_code && data.error_code === 'WRONG_PASSWORD') { - // TODO error log in informer.error('MESSAGE.INCORRECT_PASSWORD'); - console.log('WRONG_PASSWORD'); - } else { + if (!data.error_code) { this.variablesService.startCountdown(); this.variablesService.appPass = appPass; if (this.variablesService.wallets.length) { @@ -139,4 +139,10 @@ export class LoginComponent implements OnInit { }); } } + + + ngOnDestroy() { + this.queryRouting.unsubscribe(); + } + } diff --git a/src/gui/qt-daemon/html_source/src/app/main/main.component.html b/src/gui/qt-daemon/html_source/src/app/main/main.component.html index c525611d..8c941668 100644 --- a/src/gui/qt-daemon/html_source/src/app/main/main.component.html +++ b/src/gui/qt-daemon/html_source/src/app/main/main.component.html @@ -6,7 +6,7 @@
-
+
{{ 'MAIN.HELP' | translate }}
diff --git a/src/gui/qt-daemon/html_source/src/app/main/main.component.scss b/src/gui/qt-daemon/html_source/src/app/main/main.component.scss index b61102c4..493d6704 100644 --- a/src/gui/qt-daemon/html_source/src/app/main/main.component.scss +++ b/src/gui/qt-daemon/html_source/src/app/main/main.component.scss @@ -29,6 +29,7 @@ .add-wallet-help { display: flex; + cursor: pointer; font-size: 1.3rem; line-height: 1.4rem; diff --git a/src/gui/qt-daemon/html_source/src/app/main/main.component.ts b/src/gui/qt-daemon/html_source/src/app/main/main.component.ts index ada574d2..8fbefbc1 100644 --- a/src/gui/qt-daemon/html_source/src/app/main/main.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/main/main.component.ts @@ -2,6 +2,7 @@ import {Component, NgZone, OnInit} from '@angular/core'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; import {Router} from '@angular/router'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-main', @@ -14,13 +15,14 @@ export class MainComponent implements OnInit { private router: Router, private backend: BackendService, private variablesService: VariablesService, - private ngZone: NgZone + private ngZone: NgZone, + private translate: TranslateService ) {} ngOnInit() {} openWallet() { - this.backend.openFileDialog('Open the wallet file.', '*', this.variablesService.settings.default_path, (file_status, file_data) => { + this.backend.openFileDialog(this.translate.instant('MAIN.CHOOSE_PATH'), '*', this.variablesService.settings.default_path, (file_status, file_data) => { if (file_status) { this.variablesService.settings.default_path = file_data.path.substr(0, file_data.path.lastIndexOf('/')); this.ngZone.run(() => { @@ -32,4 +34,8 @@ export class MainComponent implements OnInit { }); } + openInBrowser() { + this.backend.openUrlInBrowser('zano.org'); + } + } diff --git a/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.html b/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.html index 600de489..f026a4f8 100644 --- a/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.html +++ b/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.html @@ -2,7 +2,7 @@
- {{ 'BREADCRUMBS.ADD_WALLET' | translate }} + {{ 'BREADCRUMBS.ADD_WALLET' | translate }} {{ 'BREADCRUMBS.OPEN_WALLET' | translate }}
diff --git a/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.ts b/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.ts index 8f2d982a..d3febb19 100644 --- a/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/open-wallet/open-wallet.component.ts @@ -1,17 +1,20 @@ -import {Component, NgZone, OnInit} from '@angular/core'; +import {Component, NgZone, OnDestroy, OnInit} from '@angular/core'; import {FormGroup, FormControl, Validators} from '@angular/forms'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; import {ActivatedRoute, Router} from '@angular/router'; import {Wallet} from '../_helpers/models/wallet.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-open-wallet', templateUrl: './open-wallet.component.html', styleUrls: ['./open-wallet.component.scss'] }) -export class OpenWalletComponent implements OnInit { +export class OpenWalletComponent implements OnInit, OnDestroy { + queryRouting; filePath: string; openForm = new FormGroup({ @@ -31,12 +34,14 @@ export class OpenWalletComponent implements OnInit { private router: Router, private backend: BackendService, private variablesService: VariablesService, - private ngZone: NgZone + private modalService: ModalService, + private ngZone: NgZone, + private translate: TranslateService ) { } ngOnInit() { - this.route.queryParams.subscribe(params => { + this.queryRouting = this.route.queryParams.subscribe(params => { if (params.path) { this.filePath = params.path; let filename = ''; @@ -57,11 +62,11 @@ export class OpenWalletComponent implements OnInit { if (this.openForm.valid) { this.backend.openWallet(this.filePath, this.openForm.get('password').value, false, (open_status, open_data, open_error) => { if (open_error && open_error === 'FILE_NOT_FOUND') { - // var error_translate = $filter('translate')('INFORMER.SAFE_FILE_NOT_FOUND1'); + let error_translate = this.translate.instant('OPEN_WALLET.SAFE_FILE_NOT_FOUND1'); // error_translate += ':
' + $scope.safe.path; - // error_translate += $filter('translate')('INFORMER.SAFE_FILE_NOT_FOUND2'); - // informer.fileNotFound(error_translate); - alert('FILE_NOT_FOUND'); + error_translate += ':
' + this.filePath; + error_translate += this.translate.instant('OPEN_WALLET.SAFE_FILE_NOT_FOUND2'); + this.modalService.prepareModal('error', error_translate); } else { if (open_status || open_error === 'FILE_RESTORED') { @@ -73,9 +78,8 @@ export class OpenWalletComponent implements OnInit { }); if (exists) { - alert('SAFES.WITH_ADDRESS_ALREADY_OPEN'); + this.modalService.prepareModal('error', 'OPEN_WALLET.WITH_ADDRESS_ALREADY_OPEN'); this.backend.closeWallet(open_data.wallet_id, (close_status, close_data) => { - console.log(close_status, close_data); this.ngZone.run(() => { this.router.navigate(['/']); }); @@ -122,4 +126,8 @@ export class OpenWalletComponent implements OnInit { } } + ngOnDestroy() { + this.queryRouting.unsubscribe(); + } + } diff --git a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html index 3ddec254..eba46a42 100644 --- a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html +++ b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html @@ -1,6 +1,6 @@
- {{ 'BREADCRUMBS.CONTRACTS' | translate }} + {{ 'BREADCRUMBS.CONTRACTS' | translate }} {{ 'BREADCRUMBS.NEW_PURCHASE' | translate }} {{ 'BREADCRUMBS.OLD_PURCHASE' | translate }}
@@ -78,7 +78,7 @@
- +
+
+ + +
@@ -105,7 +113,7 @@ - {{ 'DEALS.CUSTOMER_WAITING_ANSWER' | translate }} + {{ 'Waiting for seller respond to contract proposal' | translate }} {{ 'The seller ignored your contract proposal' | translate }} @@ -167,8 +175,9 @@ - {{variablesService.height_app - currentContract.height}}/10 - {{(historyBlock.is_income ? '+' : '') + (historyBlock.sortAmount | intToMoney)}} + 0/10 + {{variablesService.height_app - currentContract.height}}/10 + {{(historyBlock.is_income ? '+' : '') + (historyBlock.sortAmount | intToMoney)}} {{variablesService.defaultCurrency}}
@@ -204,6 +213,17 @@
+
+
+ + +
+
+
diff --git a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.ts b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.ts index 3861f0a5..9646b421 100644 --- a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.ts @@ -3,8 +3,10 @@ import {ActivatedRoute} from '@angular/router'; import {FormControl, FormGroup, Validators} from '@angular/forms'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; import {Location} from '@angular/common'; import {IntToMoneyPipe} from '../_helpers/pipes/int-to-money.pipe'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-purchase', @@ -15,6 +17,7 @@ export class PurchaseComponent implements OnInit, OnDestroy { currentWalletId; newPurchase = false; parentRouting; + subRouting; historyBlock; purchaseForm = new FormGroup({ @@ -26,19 +29,24 @@ export class PurchaseComponent implements OnInit, OnDestroy { sameAmount: new FormControl(false), comment: new FormControl(''), fee: new FormControl('0.01'), + time: new FormControl({value: '12', disabled: false}), + timeCancel: new FormControl('12'), payment: new FormControl('') }); additionalOptions = false; currentContract = null; + heightAppEvent; constructor( private route: ActivatedRoute, private backend: BackendService, private variablesService: VariablesService, + private modalService: ModalService, private ngZone: NgZone, private location: Location, - private intToMoneyPipe: IntToMoneyPipe + private intToMoneyPipe: IntToMoneyPipe, + private translate: TranslateService ) { } @@ -54,7 +62,7 @@ export class PurchaseComponent implements OnInit, OnDestroy { this.parentRouting = this.route.parent.params.subscribe(params => { this.currentWalletId = params['id']; }); - this.route.params.subscribe(params => { + this.subRouting = this.route.params.subscribe(params => { if (params.hasOwnProperty('id')) { this.currentContract = this.variablesService.currentWallet.getContract(params['id']); this.purchaseForm.setValue({ @@ -66,23 +74,12 @@ export class PurchaseComponent implements OnInit, OnDestroy { sameAmount: false, comment: this.currentContract.private_detailes.c, fee: '0.01', + time: '12', + timeCancel: '12', payment: this.currentContract.payment_id }); this.newPurchase = false; - - // todo original code watch height_v - if (this.currentContract.state === 201 && this.currentContract.height !== 0 && (this.variablesService.height_app - this.currentContract.height) >= 10) { - this.currentContract.state = 2; - this.currentContract.is_new = true; - this.variablesService.currentWallet.recountNewContracts(); - } else if (this.currentContract.state === 601 && this.currentContract.height !== 0 && (this.variablesService.height_app - this.currentContract.height) >= 10) { - this.currentContract.state = 6; - this.currentContract.is_new = true; - this.variablesService.currentWallet.recountNewContracts(); - } - - if (this.currentContract.is_new) { if (this.currentContract.is_a && this.currentContract.state === 2) { this.currentContract.state = 120; @@ -109,19 +106,27 @@ export class PurchaseComponent implements OnInit, OnDestroy { } this.currentContract.is_new = false; - // todo need remove timeout setTimeout(() => { this.variablesService.currentWallet.recountNewContracts(); }, 0); - - this.checkAndChangeHistory(); - } + this.checkAndChangeHistory(); } else { this.newPurchase = true; } }); + this.heightAppEvent = this.variablesService.getHeightAppEvent.subscribe((newHeight: number) => { + if (this.currentContract && this.currentContract.state === 201 && this.currentContract.height !== 0 && (newHeight - this.currentContract.height) >= 10) { + this.currentContract.state = 2; + this.currentContract.is_new = true; + this.variablesService.currentWallet.recountNewContracts(); + } else if (this.currentContract && this.currentContract.state === 601 && this.currentContract.height !== 0 && (newHeight - this.currentContract.height) >= 10) { + this.currentContract.state = 6; + this.currentContract.is_new = true; + this.variablesService.currentWallet.recountNewContracts(); + } + }); } toggleOptions() { @@ -129,11 +134,17 @@ export class PurchaseComponent implements OnInit, OnDestroy { } getProgressBarWidth() { - if (this.newPurchase) { - return '9rem'; - } else { - return '50%'; + let progress = '9rem'; + if (!this.newPurchase) { + if (this.currentContract) { + if ([110, 3, 4, 6, 140].indexOf(this.currentContract.state) !== -1) { + progress = '100%'; + } else { + progress = '50%'; + } + } } + return progress; } sameAmountChange() { @@ -172,10 +183,12 @@ export class PurchaseComponent implements OnInit, OnDestroy { this.purchaseForm.get('amount').value, this.purchaseForm.get('yourDeposit').value, this.purchaseForm.get('sellerDeposit').value, - 12, + this.purchaseForm.get('time').value, this.purchaseForm.get('payment').value, - () => { - this.back(); + (create_status) => { + if (create_status) { + this.back(); + } }); } } @@ -187,7 +200,7 @@ export class PurchaseComponent implements OnInit, OnDestroy { acceptState() { this.backend.acceptProposal(this.currentWalletId, this.currentContract.contract_id, (accept_status) => { if (accept_status) { - alert('You have accepted the contract proposal. Please wait for the pledges to be made'); + this.modalService.prepareModal('info', 'PURCHASE.ACCEPT_STATE_WAIT_BIG'); this.back(); } }); @@ -217,7 +230,7 @@ export class PurchaseComponent implements OnInit, OnDestroy { this.currentContract.time = this.currentContract.expiration_time; this.variablesService.currentWallet.recountNewContracts(); - alert('You have ignored the contract proposal'); + this.modalService.prepareModal('info', 'PURCHASE.IGNORED_ACCEPT'); this.back(); } @@ -225,7 +238,7 @@ export class PurchaseComponent implements OnInit, OnDestroy { productNotGot() { this.backend.releaseProposal(this.currentWalletId, this.currentContract.contract_id, 'REL_B', (release_status) => { if (release_status) { - alert('The pledges have been nullified.'); + this.modalService.prepareModal('info', 'PURCHASE.BURN_PROPOSAL'); this.back(); } }); @@ -234,16 +247,16 @@ export class PurchaseComponent implements OnInit, OnDestroy { dealsDetailsFinish() { this.backend.releaseProposal(this.currentWalletId, this.currentContract.contract_id, 'REL_N', (release_status) => { if (release_status) { - alert('The contract is complete. The payment has been sent.'); + this.modalService.prepareModal('success', 'PURCHASE.SUCCESS_FINISH_PROPOSAL'); this.back(); } }); } dealsDetailsCancel() { - this.backend.requestCancelContract(this.currentWalletId, this.currentContract.contract_id, 12, (cancel_status) => { + this.backend.requestCancelContract(this.currentWalletId, this.currentContract.contract_id, this.purchaseForm.get('timeCancel').value, (cancel_status) => { if (cancel_status) { - alert('Proposal to cancel contract sent to seller'); + this.modalService.prepareModal('info', 'PURCHASE.SEND_CANCEL_PROPOSAL'); this.back(); } }); @@ -273,14 +286,14 @@ export class PurchaseComponent implements OnInit, OnDestroy { this.currentContract.time = this.currentContract.cancel_expiration_time; this.variablesService.currentWallet.recountNewContracts(); - alert('You have ignored the proposal to cancel the contract'); + this.modalService.prepareModal('info', 'PURCHASE.IGNORED_CANCEL'); this.back(); } dealsDetailsSellerCancel() { this.backend.acceptCancelContract(this.currentWalletId, this.currentContract.contract_id, (accept_status) => { if (accept_status) { - alert('The contract is being cancelled. Please wait for the pledge to be returned'); + this.modalService.prepareModal('info', 'PURCHASE.DEALS_CANCELED_WAIT'); this.back(); } }); @@ -288,6 +301,8 @@ export class PurchaseComponent implements OnInit, OnDestroy { ngOnDestroy() { this.parentRouting.unsubscribe(); + this.subRouting.unsubscribe(); + this.heightAppEvent.unsubscribe(); } } diff --git a/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.html b/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.html index 87613cbc..ae0b962c 100644 --- a/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.html +++ b/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.html @@ -1,7 +1,7 @@
- {{ 'BREADCRUMBS.ADD_WALLET' | translate }} + {{ 'BREADCRUMBS.ADD_WALLET' | translate }} {{ 'BREADCRUMBS.RESTORE_WALLET' | translate }}
diff --git a/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.ts b/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.ts index b50f1540..f7518683 100644 --- a/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/restore-wallet/restore-wallet.component.ts @@ -3,7 +3,9 @@ import {FormGroup, FormControl, Validators} from '@angular/forms'; import {Router} from '@angular/router'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; import {Wallet} from '../_helpers/models/wallet.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-restore-wallet', @@ -38,7 +40,9 @@ export class RestoreWalletComponent implements OnInit { private router: Router, private backend: BackendService, private variablesService: VariablesService, - private ngZone: NgZone + private modalService: ModalService, + private ngZone: NgZone, + private translate: TranslateService ) { } @@ -59,7 +63,7 @@ export class RestoreWalletComponent implements OnInit { this.restoreForm.get('key').setErrors({key_not_valid: true}); }); } else { - this.backend.saveFileDialog('Save the wallet file.', '*', this.variablesService.settings.default_path, (save_status, save_data) => { + this.backend.saveFileDialog(this.translate.instant('RESTORE_WALLET.CHOOSE_PATH'), '*', this.variablesService.settings.default_path, (save_status, save_data) => { if (save_status) { this.variablesService.settings.default_path = save_data.path.substr(0, save_data.path.lastIndexOf('/')); this.backend.restoreWallet(save_data.path, this.restoreForm.get('password').value, this.restoreForm.get('key').value, (restore_status, restore_data) => { @@ -90,7 +94,7 @@ export class RestoreWalletComponent implements OnInit { this.walletSaved = true; }); } else { - alert('SAFES.NOT_CORRECT_FILE_OR_PASSWORD'); + this.modalService.prepareModal('error', 'RESTORE_WALLET.NOT_CORRECT_FILE_OR_PASSWORD'); } }); } diff --git a/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.html b/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.html index 687fcc20..899e3496 100644 --- a/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.html +++ b/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.html @@ -1,7 +1,7 @@
- {{ 'BREADCRUMBS.ADD_WALLET' | translate }} + {{ 'BREADCRUMBS.ADD_WALLET' | translate }} {{ 'BREADCRUMBS.SAVE_PHRASE' | translate }}
diff --git a/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.ts b/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.ts index 07f04de3..a9122c78 100644 --- a/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/seed-phrase/seed-phrase.component.ts @@ -1,4 +1,4 @@ -import {Component, NgZone, OnInit} from '@angular/core'; +import {Component, NgZone, OnDestroy, OnInit} from '@angular/core'; import {BackendService} from '../_helpers/services/backend.service'; import {ActivatedRoute, Router} from '@angular/router'; import {VariablesService} from '../_helpers/services/variables.service'; @@ -8,8 +8,9 @@ import {VariablesService} from '../_helpers/services/variables.service'; templateUrl: './seed-phrase.component.html', styleUrls: ['./seed-phrase.component.scss'] }) -export class SeedPhraseComponent implements OnInit { +export class SeedPhraseComponent implements OnInit, OnDestroy { + queryRouting; seedPhrase = ''; wallet_id: number; @@ -22,7 +23,7 @@ export class SeedPhraseComponent implements OnInit { ) {} ngOnInit() { - this.route.queryParams.subscribe(params => { + this.queryRouting = this.route.queryParams.subscribe(params => { if (params.wallet_id) { this.wallet_id = params.wallet_id; this.backend.getSmartSafeInfo(params.wallet_id, (status, data) => { @@ -56,9 +57,6 @@ export class SeedPhraseComponent implements OnInit { } else { console.log(run_data['error_code']); } - // $rootScope.reloadCounters(); - // $rootScope.$broadcast('NEED_REFRESH_HISTORY'); - // $rootScope.saveSecureData(); }); } else { this.variablesService.opening_wallet = null; @@ -71,4 +69,8 @@ export class SeedPhraseComponent implements OnInit { } } + ngOnDestroy() { + this.queryRouting.unsubscribe(); + } + } diff --git a/src/gui/qt-daemon/html_source/src/app/send/send.component.ts b/src/gui/qt-daemon/html_source/src/app/send/send.component.ts index fd9a8ecd..f5d19003 100644 --- a/src/gui/qt-daemon/html_source/src/app/send/send.component.ts +++ b/src/gui/qt-daemon/html_source/src/app/send/send.component.ts @@ -3,6 +3,7 @@ import {FormGroup, FormControl, Validators} from '@angular/forms'; import {ActivatedRoute} from '@angular/router'; import {BackendService} from '../_helpers/services/backend.service'; import {VariablesService} from '../_helpers/services/variables.service'; +import {ModalService} from '../_helpers/services/modal.service'; @Component({ selector: 'app-send', @@ -26,6 +27,7 @@ export class SendComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private backend: BackendService, private variablesService: VariablesService, + private modalService: ModalService, private ngZone: NgZone ) {} @@ -65,7 +67,7 @@ export class SendComponent implements OnInit, OnDestroy { this.sendForm.get('comment').value, (send_status, send_data) => { if (send_status) { - alert('SEND_MONEY.SUCCESS_SENT'); + this.modalService.prepareModal('success', 'SEND.SUCCESS_SENT'); this.sendForm.reset({address: '', amount: null, comment: '', mixin: 0, fee: '0.01'}); } }); diff --git a/src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html b/src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html index 989353ac..bd88e927 100644 --- a/src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html +++ b/src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html @@ -3,7 +3,7 @@

{{ 'SIDEBAR.TITLE' | translate }}

-