diff --git a/.gitignore b/.gitignore index ea9ebec..ae22f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ testem.log Thumbs.db txs.json +.angular diff --git a/src/app/cancel/cancel.component.css b/src/app/cancel/cancel.component.css index c921a22..d3d6318 100644 --- a/src/app/cancel/cancel.component.css +++ b/src/app/cancel/cancel.component.css @@ -1,3 +1,3 @@ .text { - font-family: "Roboto Mono", monospace; + font-family: 'Saira Semi Condensed', sans-serif; } diff --git a/src/app/checkout/checkout.component.css b/src/app/checkout/checkout.component.css index c921a22..d3d6318 100644 --- a/src/app/checkout/checkout.component.css +++ b/src/app/checkout/checkout.component.css @@ -1,3 +1,3 @@ .text { - font-family: "Roboto Mono", monospace; + font-family: 'Saira Semi Condensed', sans-serif; } diff --git a/src/app/header/header.component.css b/src/app/header/header.component.css index a2fe255..78200ee 100644 --- a/src/app/header/header.component.css +++ b/src/app/header/header.component.css @@ -1,5 +1,5 @@ .text { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } a{ @@ -18,9 +18,12 @@ ul{ } .mini { - font-size: 9px; + font-size: 10px; line-height: 0.8; } .icon { font-family: "Material Icons"; } +.logo { + margin-top: 5px; +} diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 5f2346e..dae1b4f 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,6 +1,6 @@ - + diff --git a/src/app/items/item-add/item-add.component.css b/src/app/items/item-add/item-add.component.css index 0e0c7d0..582c441 100644 --- a/src/app/items/item-add/item-add.component.css +++ b/src/app/items/item-add/item-add.component.css @@ -1,5 +1,5 @@ .text { - font-family: "Roboto Mono", monospace; + font-family: 'Saira Semi Condensed', sans-serif; } input[type=number]{ diff --git a/src/app/items/item-create/item-create.component.css b/src/app/items/item-create/item-create.component.css index 043c7e9..582c441 100644 --- a/src/app/items/item-create/item-create.component.css +++ b/src/app/items/item-create/item-create.component.css @@ -1,5 +1,5 @@ .text { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } input[type=number]{ diff --git a/src/app/items/item-delete/item-delete.component.css b/src/app/items/item-delete/item-delete.component.css index 57c4236..d3d6318 100644 --- a/src/app/items/item-delete/item-delete.component.css +++ b/src/app/items/item-delete/item-delete.component.css @@ -1,3 +1,3 @@ .text { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } diff --git a/src/app/items/item-list/item-list.component.css b/src/app/items/item-list/item-list.component.css index ad00bab..ffa7dd4 100644 --- a/src/app/items/item-list/item-list.component.css +++ b/src/app/items/item-list/item-list.component.css @@ -1,9 +1,9 @@ .card { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } .text { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } .small { font-size: 75%; diff --git a/src/app/listorders/listorders.component.css b/src/app/listorders/listorders.component.css index a9d0799..b2fcd13 100644 --- a/src/app/listorders/listorders.component.css +++ b/src/app/listorders/listorders.component.css @@ -1,4 +1,7 @@ .text{ + font-family: 'Saira Semi Condensed', sans-serif; +} +.number{ font-family: 'Roboto Mono', monospace; } img.icon{ @@ -19,6 +22,7 @@ img.icon{ } .total{ font-size: large; + font-family: 'Roboto Mono', monospace; } img.total{ margin-bottom:-2px; diff --git a/src/app/listorders/listorders.component.html b/src/app/listorders/listorders.component.html index e14b581..fbb9e91 100644 --- a/src/app/listorders/listorders.component.html +++ b/src/app/listorders/listorders.component.html @@ -25,7 +25,7 @@ - {{order.totalZec}} + {{order.totalZec}} {{order.timestamp | date: 'short'}} @@ -39,3 +39,7 @@

No orders

+ +
+

copyright 2021 ZGo

+
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 098a2c1..9ec2ca3 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -8,6 +8,7 @@ import { ScanComponent} from '../scan/scan.component'; import { Tx } from '../tx.model'; import {User} from '../user.model'; import { Subscription, Observable } from 'rxjs'; +import { take } from 'rxjs/operators'; import { v4 as uuidv4 } from 'uuid'; var QRCode = require('easyqrcodejs'); var URLSafeBase64 = require('urlsafe-base64'); @@ -146,7 +147,7 @@ export class LoginComponent implements OnInit { dialogRef.afterClosed().subscribe((val) => { console.log('Awaiting confirmation'); this.confirmedMemo = val; - this.heightUpdate.subscribe((block) => { + this.heightUpdate.pipe(take(1)).subscribe(block => { this.targetBlock = block + 10; }); }); diff --git a/src/app/order/order.component.css b/src/app/order/order.component.css index d3b08a9..bf376dd 100644 --- a/src/app/order/order.component.css +++ b/src/app/order/order.component.css @@ -1,7 +1,10 @@ .text { - font-family: "Roboto Mono", monospace; + font-family: 'Saira Semi Condensed', sans-serif; } +.number{ + font-family: 'Roboto Mono', monospace; +} img.icon{ margin-bottom: -3px; } diff --git a/src/app/order/order.component.html b/src/app/order/order.component.html index ba2c49d..cd07ec9 100644 --- a/src/app/order/order.component.html +++ b/src/app/order/order.component.html @@ -8,8 +8,8 @@ Order Total: -

{{total | currency: 'USD'}}

-

{{(total/price) | number: '1.0-6'}}

+

{{total | currency: 'USD'}}

+

{{(total/price) | number: '1.0-6'}}

diff --git a/src/app/viewer/viewer.component.css b/src/app/viewer/viewer.component.css index f4e7eaf..d53e72f 100644 --- a/src/app/viewer/viewer.component.css +++ b/src/app/viewer/viewer.component.css @@ -1,9 +1,13 @@ * { - font-family: 'Roboto Mono', monospace; + font-family: 'Saira Semi Condensed', sans-serif; } .icon{ font-family: 'Material Icons'; } .small{ font-size: x-small; + margin-top: 0px; +} +h3{ + margin-bottom: 0px; } diff --git a/src/app/viewer/viewer.component.html b/src/app/viewer/viewer.component.html index 0ef72f0..941ae97 100644 --- a/src/app/viewer/viewer.component.html +++ b/src/app/viewer/viewer.component.html @@ -3,11 +3,32 @@

{{(ownerUpdate | async)!.name}}

{{ shortenZaddr((ownerUpdate | async)!.address) }}

+ + + help + - +
+
+
+ + + + + +
+ + + +
+
+ +
+

copyright 2021 ZGo

+
diff --git a/src/app/viewer/viewer.component.ts b/src/app/viewer/viewer.component.ts index a13abe9..4497eb3 100644 --- a/src/app/viewer/viewer.component.ts +++ b/src/app/viewer/viewer.component.ts @@ -32,6 +32,7 @@ export class ViewerComponent implements OnInit { public addrUpdate: Observable; public ownerUpdate: Observable; public userUpdate: Observable; + orientation: boolean = false; constructor( public fullnodeService: FullnodeService, @@ -51,6 +52,7 @@ export class ViewerComponent implements OnInit { } ngOnInit(){ + this.orientation = (window.innerWidth <= 500); this.ownerUpdate.subscribe((owner) => { this.message = owner.name; }); @@ -63,12 +65,17 @@ export class ViewerComponent implements OnInit { ngOnDestroy(){ } + onResize(event: any){ + this.orientation = (event.target.innerWidth <= 500); + } + shortenZaddr(address:string) { var addr = address; var end = addr.length; var last = end - 5; return addr.substring(0,5).concat('...').concat(addr.substring(last, end)); } + openSettings() { const dialogConfig = new MatDialogConfig(); @@ -88,7 +95,7 @@ export class ViewerComponent implements OnInit { loginCheck(){ var today = new Date().getTime() / 1000; - console.log('User check', this.user.validated); + //console.log('User check', this.user.validated); if (this.user.expiration < today || !this.user.validated) { console.log('Log in expired!'); this.router.navigate(['/login']);