diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 6745724..30d48e7 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -11,18 +11,35 @@
- - + + + + Scan Login - - - + + + + + + + + + + + + + + + + Login to continue diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 0d43f18..d6e5e7a 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -105,6 +105,9 @@ getBlogData(){ this.router.navigate(['register']); } + moveToStartScan(){ + this.router.navigate(['startscan']); + } onLoginApple() { // -> 'web', 'ios' or 'android' diff --git a/src/app/pages/startscan/startscan.page.ts b/src/app/pages/startscan/startscan.page.ts index a960d4e..b768df2 100644 --- a/src/app/pages/startscan/startscan.page.ts +++ b/src/app/pages/startscan/startscan.page.ts @@ -52,10 +52,13 @@ export class StartscanPage implements OnInit { // alert(1000); this.wrenchService.qrLoginUser(this.loginQrData).subscribe( loginResult => { - // alert("Here 00009"); + alert("Here 00009"); this.loginResult = loginResult; console.log("INTERNAL RETURN->" + this.loginResult.internal_return); - if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) { + if (loginResult != null + && loginResult.internal_return == 100 + && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) { + alert("Here 00009a"); // this.getBlogData(); this.router.navigate(['tabs/tab1']); }