Merge branch 'zgo-test' of https://gitlab.com/pitmutt/zgo into zgo-test

2022-07-22 - actualizacion

server.js

@@ -1,19 +0,0 @@
-var fs = require('fs');
-var http = require('http');
-//var https = require('https');
-
-//var certificate = fs.readFileSync('/etc/letsencrypt/live/zgo.cash/fullchain.pem');
-//var privateKey = fs.readFileSync('/etc/letsencrypt/live/zgo.cash/privkey.pem');
-
-//var credentials = {key: privateKey, cert: certificate};
-
-const app = require('./backend/app');
-const port = 3000;
-
-app.set('port', port);
-
-const httpServer = http.createServer(app);
-//const httpsServer = https.createServer(credentials, app);
-
-httpServer.listen(port);
-//httpsServer.listen(port);

src/app/items/item-list/item-list.component.html

@@ -23,10 +23,10 @@
 							<div class="rv_price" *ngIf="!owner.zats">
 								<img class="icon" 
 								     src="/assets/zec_rv.png" 
-								     height="16px">{{(item.cost/price) | number: '1.06'}}
+								     height="16px">{{(item.cost/zecPrice) | number: '1.06'}}
 								[{{item.cost | number: '1.02' | currency: getCurrency() }}]    
 							</div>
-							<p class="price" *ngIf="owner.zats"> &#x24e9;(item.cost/price)*100000000 | number: '1.0-0'}}</p>
+							<p class="price" *ngIf="owner.zats"> &#x24e9;(item.cost/zecPrice)*100000000 | number: '1.0-0'}}</p>
 						</td>
 					</tr>
 				</table>

src/app/items/item-list/item-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog, MatDialogConfig} from '@angular/material/dialog';
 import { Observable } from 'rxjs';
 import { Item } from '../item.model';
@@ -19,6 +19,10 @@ import { ItemAddComponent } from '../item-add/item-add.component';
 })
 
 export class ItemListComponent implements OnInit{
+
+	@Input()
+	zecPrice: number = 1;
+
 	public items: Item[] = [];
 	owner: Owner = {
 		_id: '',
@@ -45,10 +49,8 @@ export class ItemListComponent implements OnInit{
 		expiration: new Date(Date.now()).toISOString(),
 		viewkey: ''
 	};
-	public price: number = 1;
 	public ownerUpdate: Observable<Owner>;
 	public itemsUpdate: Observable<Item[]>;
-	public priceUpdate: Observable<number>;
 
 	constructor(
 		public itemService: ItemService,
@@ -59,18 +61,13 @@ export class ItemListComponent implements OnInit{
 	) {
 		this.ownerUpdate = userService.ownerUpdate;
 		this.itemsUpdate = itemService.itemsUpdated;
-		this.priceUpdate = fullnodeService.priceUpdate;
 		this.ownerUpdate.subscribe((owner) => {
 			this.owner = owner;
-			fullnodeService.getPrice(this.owner.currency);
 			itemService.getItems(this.owner.address);
 			this.itemsUpdate.subscribe((items) => {
 				this.items = items;
 			});
 		});
-		this.priceUpdate.subscribe((price) => {
-			this.price = price;
-		});
 	}
 
 	ngOnInit(){

src/app/viewer/viewer.component.html

@@ -14,7 +14,7 @@
 </div>
 <div *ngIf="orientation">
 <app-order></app-order>
-<app-item-list></app-item-list>
+<app-item-list [zecPrice]="price"></app-item-list>
 </div>
 <div *ngIf="!orientation" align="center">
 	<table cellspacing="0" width="75%">

src/app/viewer/viewer.component.ts

@@ -52,9 +52,11 @@ export class ViewerComponent implements OnInit {
 		expiration:  new Date(Date.now()).toISOString(),
 		viewkey: ''
 	};
+	public price: number = 1;
 	public addrUpdate: Observable<string>;
 	public ownerUpdate: Observable<Owner>;
 	public userUpdate: Observable<User>;
+	public priceUpdate: Observable<number>;
 	orientation: boolean = false;
 
 	constructor(
@@ -65,6 +67,7 @@ export class ViewerComponent implements OnInit {
 	){
 		this.addrUpdate = fullnodeService.addrUpdate;
 		this.ownerUpdate = userService.ownerUpdate;
+		this.priceUpdate = fullnodeService.priceUpdate;
 		this.ownerUpdate.subscribe((owner) => {
 			this.owner = owner;
 		});
@@ -72,6 +75,9 @@ export class ViewerComponent implements OnInit {
 		this.userUpdate.subscribe((user) => {
 			this.user = user;
 		});
+		this.priceUpdate.subscribe((price) => {
+			this.price = price;
+		});
 	}
 
 	ngOnInit(){