diff --git a/src/app/pages/forgot/forgot.page.html b/src/app/pages/forgot/forgot.page.html index e5ee5eb..9efdbb2 100644 --- a/src/app/pages/forgot/forgot.page.html +++ b/src/app/pages/forgot/forgot.page.html @@ -39,5 +39,7 @@ Continue - +
+ Already have an account? Login +
diff --git a/src/app/pages/forgot/forgot.page.ts b/src/app/pages/forgot/forgot.page.ts index 01f3044..4bfa901 100644 --- a/src/app/pages/forgot/forgot.page.ts +++ b/src/app/pages/forgot/forgot.page.ts @@ -29,5 +29,7 @@ export class ForgotPage implements OnInit { onPassword() { this.router.navigate(['new-password']); } - + onLogin(){ + this.router.navigate(['login']); + } } diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 88777f9..d4ad59c 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -94,4 +94,5 @@ export class HomePage implements OnInit { this.router.navigate(['search']); } + } diff --git a/src/app/pages/inbox/inbox.page.ts b/src/app/pages/inbox/inbox.page.ts index 665e645..d59eacb 100644 --- a/src/app/pages/inbox/inbox.page.ts +++ b/src/app/pages/inbox/inbox.page.ts @@ -30,14 +30,14 @@ export class InboxPage implements OnInit { this.router.navigate(['message']); } usrData: { - action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:1 + action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:0, offset: 0 }; jobsTotalData:any; jobsData: []; getJobsData(){ - this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , limit:20, page:1} - this.wrenchService.getJobsData(this.usrData).subscribe( + this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , limit:20, page:0, offset:0} + this.wrenchService.getMyActiveJobsData(this.usrData).subscribe( jobsTotalData => { this.jobsTotalData = jobsTotalData; console.log("PAH HX RETURN->", this.jobsTotalData); diff --git a/src/app/pages/register/register.page.html b/src/app/pages/register/register.page.html index e7edf7d..27d3d5a 100644 --- a/src/app/pages/register/register.page.html +++ b/src/app/pages/register/register.page.html @@ -8,9 +8,22 @@ + + + + + + + + + + + + + - + @@ -18,10 +31,10 @@ - - - - + + + + Register diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 8c28a36..4a4486e 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -48,6 +48,10 @@ export class WrenchService { getJobsData(usrData) { return this.getPostData("getjobsdata", usrData); } + + getMyActiveJobsData(usrData) { + return this.getPostData("activetaskslist", usrData); + } /*