Merge data from main branch

CHANGELOG.md

@@ -9,6 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
         - configdata.ts created inside "src/app/" folder
     + Services modified to include config data
 
+
+
+### Changed
+
+- Added viewing key field to owner model
+>>>>>>> 4fe5857383294b3d5871f7df258d010d92ac40fc
 - (2022-07-11) Order's list UI updated (Alpha version)
     + Paid status icons added to order's title
     + Order detail redesigned 
@@ -20,7 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [1.1.2] - 2022-05-24
 
-## Added
+### Added
 
 - Button in QR code prompt to copy ZGo address.
 - Button in QR code prompt to copy transaction amount.

src/app/business/business.component.ts

@@ -65,7 +65,8 @@ export class BusinessComponent implements OnInit {
 			website: '',
 			zats: false,
 			invoices: false,
-			expiration: new Date(Date.now()).toISOString()
+			expiration: new Date(Date.now()).toISOString(),
+			viewkey: ''
 		}
 	public countriesUpdate: Observable<Country[]>;
 	public ownerUpdate: Observable<Owner>;
@@ -127,6 +128,7 @@ export class BusinessComponent implements OnInit {
 		this.ownerUpdate.subscribe(ownerData => {
 			if(ownerData.name.length > 0 && this.stepper!.selectedIndex == 0){
 				this.stepper!.next();
+				this.loginCheck();
 			}
 		});
 	}
@@ -170,7 +172,8 @@ export class BusinessComponent implements OnInit {
 			website: this.bizForm.get('website')!.value,
 			zats: false,
 			invoices: false,
-			expiration: new Date(Date.now()).toISOString()
+			expiration: new Date(Date.now()).toISOString(),
+			viewkey: ''
 		};
 		this.userService.addOwner(this.owner);
 		this.stepper!.next();

src/app/fullnode.service.ts

@@ -46,7 +46,8 @@ export class FullnodeService{
 		country: '',
 		zats: false,
 		invoices: false,
-		expiration: new Date(Date.now()).toISOString()
+		expiration: new Date(Date.now()).toISOString(),
+		viewkey: ''
 	};
 
 	constructor(private http: HttpClient, public userService: UserService){

src/app/header/header.component.ts

@@ -39,7 +39,8 @@ export class HeaderComponent implements OnInit, OnDestroy {
 		country: '',
 		zats: false,
 		invoices: false,
-		expiration: new Date(Date.now()).toISOString()
+		expiration: new Date(Date.now()).toISOString(),
+		viewkey: ''
 	};
 	private session: string | null = '';
 	public heightUpdate: Observable<number>;

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

@@ -42,7 +42,8 @@ export class ItemListComponent implements OnInit{
 		country: '',
 		zats: false,
 		invoices: false,
-		expiration: new Date(Date.now()).toISOString()
+		expiration: new Date(Date.now()).toISOString(),
+		viewkey: ''
 	};
 	public price: number = 1;
 	public ownerUpdate: Observable<Owner>;

src/app/login/login.component.ts

@@ -59,7 +59,8 @@ export class LoginComponent implements OnInit, AfterViewInit {
 		country: '',
 		zats: false,
 		invoices: false,
-		expiration: new Date(Date.now()).toISOString()
+		expiration: new Date(Date.now()).toISOString(),
+		viewkey: ''
 	};
 	private FullnodeSub: Subscription = new Subscription();
 	private UserSub: Subscription = new Subscription();
@@ -166,6 +167,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
 				}
 				//console.log('Log in found in blockchain!');
 				if (user.validated) {
+					clearInterval(this.intervalHolder);
 					if (this.owner.paid) {
 						this.router.navigate(['/shop']);
 					} else {

src/app/order/order.service.ts

@@ -47,7 +47,8 @@ export class OrderService {
 			country: '',
 			zats: false,
 			invoices: false,
-			expiration: new Date(Date.now()).toISOString()
+			expiration: new Date(Date.now()).toISOString(),
+			viewkey: ''
 		},
 		order: {
 			address: '',

src/app/owner.model.ts

@@ -21,4 +21,5 @@ export interface Owner {
 	zats: boolean;
 	invoices: boolean;
 	expiration: string;
+	viewkey: string;
 }

src/app/receipt.service.ts

@@ -37,7 +37,8 @@ export class ReceiptService {
 			country: '',
 			zats: false,
 			invoices: false,
-			expiration: new Date(Date.now()).toISOString()
+			expiration: new Date(Date.now()).toISOString(),
+			viewkey: ''
 		},
 		order: {
 			address: '',

src/app/user.service.ts

@@ -43,7 +43,8 @@ export class UserService{
 			country: '',
 			zats: false,
 			invoices: false,
-			expiration: new Date(Date.now()).toISOString()
+			expiration: new Date(Date.now()).toISOString(),
+			viewkey: ''
 		},
 		txs : [],
 		countries: []

src/app/viewer/viewer.component.ts

@@ -49,7 +49,8 @@ export class ViewerComponent implements OnInit {
 		country: '',
 		zats: false,
 		invoices: false,
-		expiration:  new Date(Date.now()).toISOString()
+		expiration:  new Date(Date.now()).toISOString(),
+		viewkey: ''
 	};
 	public addrUpdate: Observable<string>;
 	public ownerUpdate: Observable<Owner>;
@@ -79,9 +80,9 @@ export class ViewerComponent implements OnInit {
 			this.message = owner.name;
 		});
 		this.loginCheck();
-		this.intervalHolder = setInterval(() => {
+		//this.intervalHolder = setInterval(() => {
-			this.loginCheck();
+			//this.loginCheck();
-		}, 60000);
+		//}, 60000);
 	}
 
 	ngOnDestroy(){
@@ -123,7 +124,7 @@ export class ViewerComponent implements OnInit {
 			this.owner = owner;
 			this.userUpdate.subscribe((user) => {
 				this.user = user;
-				//console.log('Viewer loginCheck', this.user);
+				console.log('Viewer loginCheck', this.user);
 				if (!this.owner.paid || !this.user.validated) {
 					console.log('Log in expired!');
 					this.router.navigate(['/login']);