From 8c7d6bddbd38577e5ae916b978ea7f58850fac7e Mon Sep 17 00:00:00 2001 From: Rene Vergara A Date: Tue, 31 Jan 2023 22:36:53 -0500 Subject: [PATCH] UI language management: Shop inteface ready (English, Spanish, Portuguese) --- src/app/app.component.html | 12 ++++++ src/app/app.component.ts | 7 +++ src/app/header/header.component.html | 4 +- src/app/header/header.component.ts | 38 +++++++++++++++-- .../items/item-add/item-add.component.html | 10 +++-- src/app/items/item-add/item-add.component.ts | 34 ++++++++++++++- .../item-create/item-create.component.html | 18 ++++---- .../item-create/item-create.component.ts | 40 +++++++++++++++++- .../item-delete/item-delete.component.html | 12 +++--- .../item-delete/item-delete.component.ts | 35 ++++++++++++++- .../items/item-edit/item-edit.component.html | 16 ++++--- .../items/item-edit/item-edit.component.ts | 39 ++++++++++++++++- .../items/item-list/item-list.component.html | 4 +- .../items/item-list/item-list.component.ts | 35 ++++++++++++++- src/app/login/login.component.html | 6 +-- src/app/login/login.component.ts | 19 ++++----- src/app/order/order.component.html | 2 +- src/app/order/order.component.ts | 33 +++++++++++++-- src/app/viewer/viewer.component.html | 2 +- src/app/viewer/viewer.component.ts | 31 +++++++++++++- src/assets/zgo-brazil-flag-default.png | Bin 0 -> 14874 bytes src/assets/zgo-brazil-flag.png | Bin 0 -> 13303 bytes 22 files changed, 337 insertions(+), 60 deletions(-) create mode 100644 src/assets/zgo-brazil-flag-default.png create mode 100644 src/assets/zgo-brazil-flag.png diff --git a/src/app/app.component.html b/src/app/app.component.html index 714d0d2..3a86501 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -28,6 +28,18 @@ (click)="esFlagClicked()" height="24px" title="Spanish"/> + + +

© 2023 Vergara Technologies LLC

diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b92ec18..c420c01 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -55,5 +55,12 @@ export class AppComponent { } } + brFlagClicked() { + if ( this.zgoLanguage != 'br-US' ) { + localStorage.setItem('zgo_language','br-US'); + window.location.reload(); + } + } + } diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index f538328..ad06466 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -4,8 +4,8 @@ -

Currency: {{ getCurrency() }}

-

Last block:

+

{{ vE.headerGetCurrency }} {{ getCurrency() }}

+

{{ vE.headerLastBlock }}

{{heightUpdate | async}}

 diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 303aa18..cd7c33e 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,13 +1,16 @@ import {Component, OnInit, OnDestroy} from '@angular/core'; import { MatDialog, MatDialogConfig} from '@angular/material/dialog'; -import {FullnodeService} from '../fullnode.service'; +import { FullnodeService } from '../fullnode.service'; import { Router } from '@angular/router'; import { UserService } from '../user.service'; import { CancelComponent } from '../cancel/cancel.component'; -import {Subscription, Observable} from 'rxjs'; +import { Subscription, Observable } from 'rxjs'; import {Owner} from '../owner.model'; +import { LanguageService } from '../language.service'; +import { LanguageData } from '../language.model'; + @Component({ selector: 'app-header', templateUrl: './header.component.html', @@ -49,11 +52,21 @@ export class HeaderComponent implements OnInit, OnDestroy { public ownerUpdate: Observable; public uZaddrUpdate: Observable; + // + // Language Support + // + vE = { + headerGetCurrency : '', + headerLastBlock : '' + } + // + // ------------------------------------------------------------ constructor( public fullnodeService: FullnodeService, public userService: UserService, private dialog: MatDialog, - private router: Router + private router: Router, + private languageService: LanguageService ){ this.heightUpdate = fullnodeService.heightUpdate; this.uZaddrUpdate = userService.uZaddrUpdate; @@ -63,8 +76,8 @@ export class HeaderComponent implements OnInit, OnDestroy { }); } - ngOnInit(){ + this.chgUILanguage(); } ngOnDestroy(){ @@ -93,4 +106,21 @@ export class HeaderComponent implements OnInit, OnDestroy { } }); } + + chgUILanguage(){ + console.log('HEADER.chgUILanguage Called '); + this.languageService.getViewElements('header').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.headerLastBlock = response.data.header_last_block; + this.vE.headerGetCurrency = response.data.header_get_currency; + }, + error => { console.log('Error >> ',error); } + ); + } + } diff --git a/src/app/items/item-add/item-add.component.html b/src/app/items/item-add/item-add.component.html index e98376a..02d6c8c 100644 --- a/src/app/items/item-add/item-add.component.html +++ b/src/app/items/item-add/item-add.component.html @@ -1,4 +1,4 @@ -
Add to Order
+
{{ vE.itemaddAdd2Order }}
@@ -9,13 +9,15 @@
+ justify-content: space-between; + margin-top: 20px; + padding: 20px;"> + (click)="close()">{{ vE.itemaddCancelBtn }} + (click)="save()">{{ vE.itemaddSaveBtn }}
\ No newline at end of file diff --git a/src/app/items/item-add/item-add.component.ts b/src/app/items/item-add/item-add.component.ts index 3f9db9e..02f5280 100644 --- a/src/app/items/item-add/item-add.component.ts +++ b/src/app/items/item-add/item-add.component.ts @@ -4,6 +4,9 @@ import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@ import { LineItem } from '../lineitem.model'; import { Order } from '../../order/order.model'; +import { LanguageService } from '../../language.service'; +import { LanguageData } from '../../language.model'; + @Component({ selector: 'app-item-add', templateUrl: './item-add.component.html', @@ -15,8 +18,18 @@ export class ItemAddComponent implements OnInit { orderForm: UntypedFormGroup; lineItem: LineItem; //order: Order; - + // + // Language Support + // + vE = { + itemaddAdd2Order : '', + itemaddCancelBtn : '', + itemaddSaveBtn : '' + } + // + // ------------------------------------------------------------ constructor( + private languageService : LanguageService, private fb: UntypedFormBuilder, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: LineItem @@ -32,6 +45,7 @@ export class ItemAddComponent implements OnInit { } ngOnInit() { + this.chgUILanguage(); } close() { @@ -42,4 +56,22 @@ export class ItemAddComponent implements OnInit { this.lineItem.qty = this.orderForm.value.qty; this.dialogRef.close(this.lineItem); } + + chgUILanguage(){ + console.log('ITEMADD.chgUILanguage Called '); + this.languageService.getViewElements('itemadd').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.itemaddAdd2Order = response.data.itemadd_add_2order; + this.vE.itemaddCancelBtn = response.data.itemadd_cancel_btn; + this.vE.itemaddSaveBtn = response.data.itemadd_save_btn; + }, + error => { console.log('Error >> ',error); } + ); + } + } diff --git a/src/app/items/item-create/item-create.component.html b/src/app/items/item-create/item-create.component.html index 2055b1f..5a420e9 100644 --- a/src/app/items/item-create/item-create.component.html +++ b/src/app/items/item-create/item-create.component.html @@ -1,11 +1,11 @@ -
Add Item
+
{{ vE.itemcreateAddItem }}
- Item + {{ vE.itemcreateItemLbl }} - Description + {{ vE.itemcreateItemDescr }} - Price + {{ vE.itemcreateItemPrice }}
-
Use only numbers
+
{{ vE.itemcreateUseNums }}
- - + justify-content: space-between; + margin-top: 20px; + padding: 20px;"> + +
\ No newline at end of file diff --git a/src/app/items/item-create/item-create.component.ts b/src/app/items/item-create/item-create.component.ts index 7f2c9bf..4b4ae2b 100644 --- a/src/app/items/item-create/item-create.component.ts +++ b/src/app/items/item-create/item-create.component.ts @@ -3,6 +3,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { UntypedFormBuilder, Validators, UntypedFormGroup, UntypedFormControl } from '@angular/forms'; import { Item } from '../item.model'; +import { LanguageService } from '../../language.service'; +import { LanguageData } from '../../language.model'; @Component({ selector: 'app-item-create', @@ -15,8 +17,22 @@ export class ItemCreateComponent implements OnInit { form: UntypedFormGroup; id: string | undefined = ''; numberRegEx = /\d*\.?\d{1,2}/; - + // + // Language Support + // + vE = { + itemcreateAddItem : '', + itemcreateItemLbl : '', + itemcreateItemDescr : '', + itemcreateItemPrice : '', + itemcreateUseNums : '', + itemcreateCloseBtn : '', + itemcreateSaveBtn : '' + } + // + // ------------------------------------------------------------ constructor( + private languageService : LanguageService, private fb: UntypedFormBuilder, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: Item @@ -46,6 +62,7 @@ export class ItemCreateComponent implements OnInit { } ngOnInit () { + this.chgUILanguage(); } save() { @@ -56,4 +73,25 @@ export class ItemCreateComponent implements OnInit { close () { this.dialogRef.close(); } + + chgUILanguage(){ + console.log('ITEMLREATE.chgUILanguage Called '); + this.languageService.getViewElements('itemcreate').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.itemcreateAddItem = response.data.itemcreate_add_item; + this.vE.itemcreateItemLbl = response.data.itemcreate_item_lbl; + this.vE.itemcreateItemDescr = response.data.itemcreate_item_descr; + this.vE.itemcreateItemPrice = response.data.itemcreate_item_price; + this.vE.itemcreateUseNums = response.data.itemcreate_use_nums; + this.vE.itemcreateCloseBtn = response.data.itemcreate_close_btn; + this.vE.itemcreateSaveBtn = response.data.itemcreate_save_btn; + }, + error => { console.log('Error >> ',error); } + ); + } } diff --git a/src/app/items/item-delete/item-delete.component.html b/src/app/items/item-delete/item-delete.component.html index c1bb616..e393d90 100644 --- a/src/app/items/item-delete/item-delete.component.html +++ b/src/app/items/item-delete/item-delete.component.html @@ -1,4 +1,4 @@ -
Delete Item
+
{{ vE.itemdelDelItem }}
@@ -6,15 +6,17 @@ -

Are you sure you want to delete "{{item.name}}"?

+

{{ vE.itemdelConfirmDel }}"{{item.name}}"?
- - + justify-content: space-between; + margin-top: 20px; + padding: 20px;"> + +
\ No newline at end of file diff --git a/src/app/items/item-delete/item-delete.component.ts b/src/app/items/item-delete/item-delete.component.ts index aa58f21..a921b94 100644 --- a/src/app/items/item-delete/item-delete.component.ts +++ b/src/app/items/item-delete/item-delete.component.ts @@ -2,6 +2,8 @@ import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angula import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Item } from '../item.model'; +import { LanguageService } from '../../language.service'; +import { LanguageData } from '../../language.model'; @Component({ selector: 'app-item-delete', @@ -11,8 +13,19 @@ import { Item } from '../item.model'; export class ItemDeleteComponent implements OnInit{ item: Item; - + // + // Language Support + // + vE = { + itemdelDelItem : '', + itemdelConfirmDel : '', + itemdelCloseBtn : '', + itemdelDeleteBtn : '' + } + // + // ------------------------------------------------------------ constructor( + private languageService : LanguageService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: Item ) { @@ -20,6 +33,7 @@ export class ItemDeleteComponent implements OnInit{ } ngOnInit() { + this.chgUILanguage(); } save() { @@ -29,4 +43,23 @@ export class ItemDeleteComponent implements OnInit{ close() { this.dialogRef.close(); } + + chgUILanguage(){ + console.log('ITEMDEL.chgUILanguage Called '); + this.languageService.getViewElements('itemdel').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.itemdelDelItem = response.data.itemdel_del_item; + this.vE.itemdelConfirmDel = response.data.itemdel_confirm_del; + this.vE.itemdelCloseBtn = response.data.itemdel_close_btn; + this.vE.itemdelDeleteBtn = response.data.itemdel_delete_btn; + }, + error => { console.log('Error >> ',error); } + ); + } + } diff --git a/src/app/items/item-edit/item-edit.component.html b/src/app/items/item-edit/item-edit.component.html index 58827f0..4e6891a 100644 --- a/src/app/items/item-edit/item-edit.component.html +++ b/src/app/items/item-edit/item-edit.component.html @@ -1,11 +1,11 @@ -
Edit Item
+
{{ vE.itemeditEditItem }}
- Item + {{ vE.itemeditItemLabel}} - Description + {{ vE.itemeditItemDescr }} - Price + {{ vE.itemeditItemPrice }}
Use only numbers
@@ -31,9 +31,11 @@
- - + justify-content: space-between; + margin-top: 20px; + padding: 20px;"> + +
\ No newline at end of file diff --git a/src/app/items/item-edit/item-edit.component.ts b/src/app/items/item-edit/item-edit.component.ts index 07c0a07..c1c00d9 100644 --- a/src/app/items/item-edit/item-edit.component.ts +++ b/src/app/items/item-edit/item-edit.component.ts @@ -3,6 +3,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { UntypedFormBuilder, Validators, UntypedFormGroup, UntypedFormControl } from '@angular/forms'; import { Item } from '../item.model'; +import { LanguageService } from '../../language.service'; +import { LanguageData } from '../../language.model'; @Component({ selector: 'app-item-edit', @@ -15,8 +17,21 @@ export class ItemEditComponent implements OnInit { form: UntypedFormGroup; id: string | undefined = ''; numberRegEx = /\d*\.?\d{1,2}/; - + // + // Language Support + // + vE = { + itemeditEditItem : '', + itemeditItemLabel : '', + itemeditItemDescr : '', + itemeditItemPrice : '', + itemeditCloseBtn : '', + itemeditSaveBtn : '' + } + // + // ------------------------------------------------------------ constructor( + private languageService : LanguageService, private fb: UntypedFormBuilder, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: Item @@ -46,6 +61,7 @@ export class ItemEditComponent implements OnInit { } ngOnInit () { + this.chgUILanguage(); } save() { @@ -56,4 +72,25 @@ export class ItemEditComponent implements OnInit { close () { this.dialogRef.close(); } + + chgUILanguage(){ + console.log('ITEMEDIT.chgUILanguage Called '); + this.languageService.getViewElements('itemedit').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.itemeditEditItem = response.data.itemedit_edit_item; + this.vE.itemeditItemLabel = response.data.itemedit_item_label; + this.vE.itemeditItemDescr = response.data.itemedit_item_descr; + this.vE.itemeditItemPrice = response.data.itemedit_item_price; + this.vE.itemeditCloseBtn = response.data.itemedit_close_btn; + this.vE.itemeditSaveBtn = response.data.itemedit_save_btn; + }, + error => { console.log('Error >> ',error); } + ); + } + } diff --git a/src/app/items/item-list/item-list.component.html b/src/app/items/item-list/item-list.component.html index db2cf75..5d5b7c9 100644 --- a/src/app/items/item-list/item-list.component.html +++ b/src/app/items/item-list/item-list.component.html @@ -1,7 +1,7 @@
- Available Items: + {{ vE.itemlistAvailItems }} @@ -82,7 +82,7 @@
- No items yet! + {{ vE.itemlistListEmpty }} diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 9089795..af227e3 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -21,14 +21,6 @@ var QRCode = require('easyqrcodejs'); var URLSafeBase64 = require('urlsafe-base64'); var Buffer = require('buffer/').Buffer; -interface _vE_login { - login_confirm_login : string, - login_connect_to_zgo : string, - login_enter_pin : string, - login_last_block : string, - login_link_wallet : string -} - @Component({ selector: 'app-login', templateUrl: './login.component.html', @@ -101,7 +93,10 @@ export class LoginComponent implements OnInit, AfterViewInit { loginConnectToZGo : '', loginEnterPin : '', loginLastBlock : '', - loginLinkWallet : '' + loginLinkWallet : '', + loginCheckWallet : '', + loginWrongPin : '', + loginConfirmPin : '' } // // ------------------------------------------------------------ @@ -241,14 +236,16 @@ export class LoginComponent implements OnInit, AfterViewInit { console.log('Language Code : ', response.language); console.log('Component Name : ',response.component); console.log('Language data : ',response.data); - console.log('Login_Last_Block -> ',response.data.login_last_block); this.vE.loginLastBlock = response.data.login_last_block; this.vE.loginConnectToZGo = response.data.login_connect_to_zgo; this.vE.loginLinkWallet = response.data.login_link_wallet; this.vE.loginConfirmLogin = response.data.login_confirm_login; this.vE.loginEnterPin = response.data.login_enter_pin; - }, + this.vE.loginCheckWallet = response.data.login_check_wallet; + this.vE.loginWrongPin = response.data.login_wrong_pin; + this.vE.loginConfirmPin = response.data.login_confirm_pin; + }, error => { console.log('Error >> ',error); } ); } diff --git a/src/app/order/order.component.html b/src/app/order/order.component.html index 2a9d609..33dd670 100644 --- a/src/app/order/order.component.html +++ b/src/app/order/order.component.html @@ -1,6 +1,6 @@
- No open order! + {{ vE.orderNoOpenorder }}
diff --git a/src/app/order/order.component.ts b/src/app/order/order.component.ts index 0f5e61d..df46aa9 100644 --- a/src/app/order/order.component.ts +++ b/src/app/order/order.component.ts @@ -19,6 +19,9 @@ import { faSignOut } from '@fortawesome/free-solid-svg-icons'; import { NotifierService } from '../notifier.service'; +import { LanguageService } from '../language.service'; +import { LanguageData } from '../language.model'; + @Component({ selector: 'app-order', templateUrl: './order.component.html', @@ -65,9 +68,16 @@ export class OrderComponent implements OnInit{ faChevronRight = faChevronRight; faSignOut = faSignOut; // ------------------------------------- - - + // + // Language Support + // + vE = { + orderNoOpenorder : '' + } + // + // ------------------------------------------------------------ constructor( + private languageService : LanguageService, public fullnodeService: FullnodeService, public orderService: OrderService, private dialog: MatDialog, @@ -111,6 +121,7 @@ export class OrderComponent implements OnInit{ } ngOnInit() { + this.chgUILanguage(); } cancelOrder() { @@ -245,7 +256,21 @@ export class OrderComponent implements OnInit{ console.log('Returning to order'); } }); - - } + + chgUILanguage(){ + console.log('ORDER.chgUILanguage Called '); + this.languageService.getViewElements('order').subscribe( + response => { + console.log('Received >> ', response ); + console.log('Language Code : ', response.language); + console.log('Component Name : ',response.component); + console.log('Language data : ',response.data); + + this.vE.orderNoOpenorder = response.data.order_no_openorder; + }, + error => { console.log('Error >> ',error); } + ); + } + } diff --git a/src/app/viewer/viewer.component.html b/src/app/viewer/viewer.component.html index 01c37b7..767a6f0 100644 --- a/src/app/viewer/viewer.component.html +++ b/src/app/viewer/viewer.component.html @@ -12,7 +12,7 @@