diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7aaf5b0..d161240 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -182,6 +182,10 @@ const routes: Routes = [ path: 'jobactive', loadChildren: () => import('./pages/jobactive/jobactive.module').then(m => m.JobactivePageModule) }, + { + path: 'resetpass', + loadChildren: () => import('./pages/resetpass/resetpass.module').then(m => m.ResetpassPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html index 02cfefa..a7e68d3 100644 --- a/src/app/pages/jobactive/jobactive.page.html +++ b/src/app/pages/jobactive/jobactive.page.html @@ -1,9 +1,258 @@ - - - jobactive - - +
+
+ +
+
+
+
+
+ +
+
+ {{jobData.title}} +
+ +
+ {{jobData.offer_code}} +
+ + Due date: {{jobData.delivery_date}} +
+
+ + Price: {{jobData.price*0.01}} {{jobData.currency}} + +
+
+ + Timeline: {{jobData.timeline_days}} days +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activities + + + + + + Send Message + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + Load messages + + + + + ... + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + Send Message to task owner + + + + + + + Send Message + {{interest_msg_status}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+ + + +
+ Return +
+ + + + diff --git a/src/app/pages/jobactive/jobactive.page.scss b/src/app/pages/jobactive/jobactive.page.scss index 1c3cf7a..8fd1874 100644 --- a/src/app/pages/jobactive/jobactive.page.scss +++ b/src/app/pages/jobactive/jobactive.page.scss @@ -2,7 +2,7 @@ ion-content { .back_image { width: 100%; - height: 230px; + height: 130px; .back { font-size: 25px; diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts index f462e48..274b368 100644 --- a/src/app/pages/jobactive/jobactive.page.ts +++ b/src/app/pages/jobactive/jobactive.page.ts @@ -1,4 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-jobactive', @@ -7,9 +11,30 @@ import { Component, OnInit } from '@angular/core'; }) export class JobactivePage implements OnInit { - constructor() { } + jobData: any; + tabs = 'activities'; + + constructor( + private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService + ) { + + this.jobData = this.router.getCurrentNavigation().extras.state; + console.log("XXXXX 1", this.router.getCurrentNavigation().extras); + console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); + //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); + } + ngOnInit() { } + onBack() { + this.navctr.back(); + } + + + } diff --git a/src/app/pages/jobpastdue/jobpastdue.page.scss b/src/app/pages/jobpastdue/jobpastdue.page.scss index 1c3cf7a..8fd1874 100644 --- a/src/app/pages/jobpastdue/jobpastdue.page.scss +++ b/src/app/pages/jobpastdue/jobpastdue.page.scss @@ -2,7 +2,7 @@ ion-content { .back_image { width: 100%; - height: 230px; + height: 130px; .back { font-size: 25px; diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html index 1eff38f..d7f03d9 100644 --- a/src/app/pages/jobreview/jobreview.page.html +++ b/src/app/pages/jobreview/jobreview.page.html @@ -1,9 +1,258 @@ - - - jobreview - - +
+
+ +
+
+
+
+
+ In Review + +
+
+ {{jobData.title}} +
+ +
+ {{jobData.offer_code}} +
+ + Due date: {{jobData.delivery_date}} +
+
+ + Price: {{jobData.price*0.01}} {{jobData.currency}} + +
+
+ + Timeline: {{jobData.timeline_days}} days +
+ + + + +
+ + + + Task Actions + + + This job is in review, you can accept or reject completion. + + Reject Completion + Accept Completion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activities + + + + + + Send Message + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + Load messages + + + + + ... + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + Send Message to task owner + + + + + + + Send Message + {{interest_msg_status}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+ + + +
+ Return +
+ + + diff --git a/src/app/pages/jobreview/jobreview.page.scss b/src/app/pages/jobreview/jobreview.page.scss index 1c3cf7a..8fd1874 100644 --- a/src/app/pages/jobreview/jobreview.page.scss +++ b/src/app/pages/jobreview/jobreview.page.scss @@ -2,7 +2,7 @@ ion-content { .back_image { width: 100%; - height: 230px; + height: 130px; .back { font-size: 25px; diff --git a/src/app/pages/jobreview/jobreview.page.ts b/src/app/pages/jobreview/jobreview.page.ts index a81ac22..58bef43 100644 --- a/src/app/pages/jobreview/jobreview.page.ts +++ b/src/app/pages/jobreview/jobreview.page.ts @@ -1,4 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-jobreview', @@ -6,10 +10,29 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./jobreview.page.scss'], }) export class JobreviewPage implements OnInit { + jobData: any; + tabs = 'activities'; + + constructor( + private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService + ) { + + this.jobData = this.router.getCurrentNavigation().extras.state; + console.log("XXXXX 1", this.router.getCurrentNavigation().extras); + console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); + //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); + } - constructor() { } ngOnInit() { } + onBack() { + this.navctr.back(); + } + + } diff --git a/src/app/pages/resetpass/resetpass-routing.module.ts b/src/app/pages/resetpass/resetpass-routing.module.ts new file mode 100644 index 0000000..0cb796a --- /dev/null +++ b/src/app/pages/resetpass/resetpass-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ResetpassPage } from './resetpass.page'; + +const routes: Routes = [ + { + path: '', + component: ResetpassPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ResetpassPageRoutingModule {} diff --git a/src/app/pages/resetpass/resetpass.module.ts b/src/app/pages/resetpass/resetpass.module.ts new file mode 100644 index 0000000..b9822a6 --- /dev/null +++ b/src/app/pages/resetpass/resetpass.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ResetpassPageRoutingModule } from './resetpass-routing.module'; + +import { ResetpassPage } from './resetpass.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ResetpassPageRoutingModule + ], + declarations: [ResetpassPage] +}) +export class ResetpassPageModule {} diff --git a/src/app/pages/resetpass/resetpass.page.html b/src/app/pages/resetpass/resetpass.page.html new file mode 100644 index 0000000..dabc556 --- /dev/null +++ b/src/app/pages/resetpass/resetpass.page.html @@ -0,0 +1,9 @@ + + + resetpass + + + + + + diff --git a/src/app/pages/resetpass/resetpass.page.scss b/src/app/pages/resetpass/resetpass.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/resetpass/resetpass.page.spec.ts b/src/app/pages/resetpass/resetpass.page.spec.ts new file mode 100644 index 0000000..19613cb --- /dev/null +++ b/src/app/pages/resetpass/resetpass.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ResetpassPage } from './resetpass.page'; + +describe('ResetpassPage', () => { + let component: ResetpassPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ResetpassPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ResetpassPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/resetpass/resetpass.page.ts b/src/app/pages/resetpass/resetpass.page.ts new file mode 100644 index 0000000..c1d3b08 --- /dev/null +++ b/src/app/pages/resetpass/resetpass.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-resetpass', + templateUrl: './resetpass.page.html', + styleUrls: ['./resetpass.page.scss'], +}) +export class ResetpassPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/security/security.page.html b/src/app/pages/security/security.page.html index 7ec4002..a219cb1 100644 --- a/src/app/pages/security/security.page.html +++ b/src/app/pages/security/security.page.html @@ -30,7 +30,7 @@ - + Change Password diff --git a/src/app/pages/security/security.page.ts b/src/app/pages/security/security.page.ts index 6aa0c82..80caac5 100644 --- a/src/app/pages/security/security.page.ts +++ b/src/app/pages/security/security.page.ts @@ -61,6 +61,10 @@ export class SecurityPage implements OnInit { this.router.navigate(['login']); } + onResetPass(){ + // + this.router.navigate(['resetpass']); + } async requestDelete() { const alert = await this.alertController.create({ header: "Account Delete", diff --git a/src/global.scss b/src/global.scss index 079702f..ac4d642 100644 --- a/src/global.scss +++ b/src/global.scss @@ -119,4 +119,9 @@ ion-modal.custom_modal_bottom { font-size: 20px; font-family: 'bold'; color:red; +} +.bold_text_green{ + font-size: 20px; + font-family: 'bold'; + color:green; } \ No newline at end of file