From 946828563cf7f4cfbcdd89f5ce68bd2b5e1ad788 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Tue, 26 Jul 2022 10:00:17 -0500
Subject: [PATCH] Update formatting for list of orders

---
 src/app/listorders/listorders.component.css  | 21 ++++++++++++-----
 src/app/listorders/listorders.component.html | 24 ++++++++------------
 src/app/listorders/listorders.component.ts   |  1 -
 src/app/login/login.component.ts             |  1 +
 src/app/user.service.ts                      | 16 ++++++-------
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/app/listorders/listorders.component.css b/src/app/listorders/listorders.component.css
index 7e750e5..0ef4229 100644
--- a/src/app/listorders/listorders.component.css
+++ b/src/app/listorders/listorders.component.css
@@ -51,18 +51,18 @@ img.icon{
 }
 
 .total{
-	font-family: Roboto Mono;
+	font-family:'Roboto Mono';
 	margin:  auto;
 }
 
 .tbheader {
-	font-family:  Roboto Mono;
+	font-family: 'Roboto Mono';
 	font-size: 14px;
 	font-weight: 700;
 }
 
 .tbdetail {
-	font-family:  Roboto Mono;
+	font-family: 'Roboto Mono';
 	font-size: 14px;
 	font-weight: 400;
 }
@@ -76,7 +76,7 @@ img.icon{
 }
 
 .totalsHdr {
-	font-family:  Roboto Mono !important;
+	font-family: 'Roboto Mono' !important;
 	text-align: center;
 	margin-bottom: 50px;
 }
@@ -93,10 +93,11 @@ img.icon{
 }
 
 .orderList {
-	font-family:  Roboto Mono !important;
+	font-family: 'Roboto Mono' !important;
 }
 
 .orderListTitle {
+	font-family: 'Roboto Mono';
 	font-size: 16px;
 	font-weight: 600;
 }
@@ -105,4 +106,12 @@ img.icon{
 	font-size: 16px;
 	font-weight: 600;
 	text-align:  justify;
-}
\ No newline at end of file
+}
+
+.minibutton {
+	font-family: 'Spartan', sans-serif;
+}
+
+.spacer {
+	flex: 1 1 auto;
+}
diff --git a/src/app/listorders/listorders.component.html b/src/app/listorders/listorders.component.html
index 9440561..be4a866 100644
--- a/src/app/listorders/listorders.component.html
+++ b/src/app/listorders/listorders.component.html
@@ -59,7 +59,7 @@
 
 		<table style="width: 100%;" 
 		       cellspacing="0">
-			<tr style="font-family: Roboto Mono;
+			<tr style="font-family: 'Roboto Mono';
 			           font-weight: 700;
 			           font-size: 16px;
 			           height: 20px;">
@@ -70,7 +70,7 @@
 					>{{ order.totalZec  | number: '1.08'}}
 				</td>
 			</tr>
-			<tr style="font-family: Roboto Mono;
+			<tr style="font-family: 'Roboto Mono';
 			           font-size: 15px;
 			           font-weight: 400;
 			           height: 18px;">
@@ -122,19 +122,13 @@
 				</tr>
 			</tbody>
 		</table>
-		<div style="display: flex;
-								justify-content: space-between;
-							  padding: 5px;
-							  height: 25px;
-							  background: lightblue;
-							  cursor: pointer;">
-			<button style="background: #ff5722;
-										 color: white;"
-			        (click)="invoice(order)">Invoice</button>
-
-			<button style="background: #ff5722;
-										 color: white;"
-							 (click)="receipt(order)">Receipt</button>
+		<div align="center">
+			<span>
+				<button mat-stroked-button class="minibutton" color="primary" (click)="invoice(order)">Invoice</button>
+			</span>
+			<span>
+				<button mat-stroked-button class="minibutton" color="primary" (click)="receipt(order)">Receipt</button>
+			</span>
 		</div>
 	</mat-expansion-panel>
   </mat-accordion>
diff --git a/src/app/listorders/listorders.component.ts b/src/app/listorders/listorders.component.ts
index eb7b4af..6a97314 100644
--- a/src/app/listorders/listorders.component.ts
+++ b/src/app/listorders/listorders.component.ts
@@ -60,7 +60,6 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 			this.todayTotal = 0;
 			var today = new Date();
 			this.orders = orders;
-			console.log('lisord', this.orders.length);
 			for (let i=0; i < this.orders.length; i++){
 				this.total += this.orders[i].totalZec;
 				var date = new Date(this.orders[i]!.timestamp!);
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 245ee2b..1253927 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -205,6 +205,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
 		this.userService.validateUser(this.pinForm.value.pinValue).subscribe((val) => {
 			if (val) {
 				this.router.navigate(['/biz']);
+				clearInterval(this.intervalHolder);
 			} else {
 				this.pinError = true;
 			}
diff --git a/src/app/user.service.ts b/src/app/user.service.ts
index 6e28903..ba7cf35 100644
--- a/src/app/user.service.ts
+++ b/src/app/user.service.ts
@@ -152,10 +152,10 @@ export class UserService{
 		let obs = this.http.post(this.beUrl+'api/owner', {payload: owner}, {headers: this.reqHeaders});
 
 		obs.subscribe((responseData) => {
-			console.log("Entra a console log");
+			//console.log("Entra a console log");
 			this.getOwner(this.dataStore.user.address);
 		}, (error) => {
-			console.log("Status is : [" + error.status + "]");
+			//console.log("Status is : [" + error.status + "]");
 			if ( error.status = 500 ) {
 				this.notifierService
 				    .showNotification("Invalid Viewing Key, changes not saved!!","Close",'error');
@@ -171,14 +171,12 @@ export class UserService{
 		let obs = this.http.get<{message:string, owner: any}>(this.beUrl+'api/owner', { headers: this.reqHeaders, params: ownParams, observe: 'response'});
 
 		obs.subscribe((OwnerDataResponse) => {
-			console.log('api/getowner', OwnerDataResponse.status);
+			//console.log('api/getowner', OwnerDataResponse.status);
 			if (OwnerDataResponse.status == 200) {
 				this.dataStore.owner = OwnerDataResponse.body!.owner;
-				console.log('getOwner object', this.dataStore.owner);
-				console.log('Payment Conf.?: [' + (
-					         this.dataStore.owner.payconf ? "On]" : "Off]") );
-				console.log('Viewkey : [' + 
-					         this.dataStore.owner.viewkey + "]");
+				//console.log('getOwner object', this.dataStore.owner);
+				//console.log('Payment Conf.?: [' + ( this.dataStore.owner.payconf ? "On]" : "Off]") );
+				//console.log('Viewkey : [' + this.dataStore.owner.viewkey + "]");
 				this._ownerUpdated.next(Object.assign({},this.dataStore).owner);
 				this._paidUpdated.next(Object.assign({}, this.dataStore).owner.paid);
 			}
@@ -191,7 +189,7 @@ export class UserService{
 		let obs = this.http.delete<{message: string}>(this.beUrl+'api/user/'+this.dataStore.user._id, {headers: this.reqHeaders });
 
 		obs.subscribe(UserResponse => {
-			console.log('User delete request sent.');
+			//console.log('User delete request sent.');
 			this.findUser();
 		});