diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0deca09..c050c51 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -258,6 +258,11 @@ const routes: Routes = [ path: 'ownersjob', loadChildren: () => import('./pages/ownersjob/ownersjob.module').then(m => m.OwnersjobPageModule) }, + { + path: 'jobmessage', + loadChildren: () => import('./pages/jobmessage/jobmessage.module').then(m => m.JobmessagePageModule) + }, + diff --git a/src/app/components/market-messages/market-messages.component.ts b/src/app/components/market-messages/market-messages.component.ts index 9ae7c4a..06db192 100644 --- a/src/app/components/market-messages/market-messages.component.ts +++ b/src/app/components/market-messages/market-messages.component.ts @@ -52,7 +52,7 @@ messageResult:any; async marketMessageList(){ this.reqData = { - action:13025, + action:15045, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session, diff --git a/src/app/pages/allblog/allblog.page.html b/src/app/pages/allblog/allblog.page.html index 1aac065..f949f80 100644 --- a/src/app/pages/allblog/allblog.page.html +++ b/src/app/pages/allblog/allblog.page.html @@ -1,10 +1,21 @@ + + + + + + + + Blog + + + -
-
- -
-
+ + + + +
@@ -33,10 +44,10 @@
- - -
- Return -
-
-
+ + + + + + + diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 3591980..e9895f3 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -42,25 +42,35 @@
- - {{total_active}} Active + + + + + My Jobs
- - - My Jobs + + + + + + Pending
- - - Pending + + + Messages
diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts index 40a5097..db3e4d1 100644 --- a/src/app/pages/jobmanager/jobmanager.page.ts +++ b/src/app/pages/jobmanager/jobmanager.page.ts @@ -125,4 +125,9 @@ menuData:any; this.router.navigate(['pendingoffers']); } + + onMyJobsMessage(){ + this.router.navigate(['jobmessage']); + + } } diff --git a/src/app/pages/jobmessage/jobmessage-routing.module.ts b/src/app/pages/jobmessage/jobmessage-routing.module.ts new file mode 100644 index 0000000..37f9449 --- /dev/null +++ b/src/app/pages/jobmessage/jobmessage-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { JobmessagePage } from './jobmessage.page'; + +const routes: Routes = [ + { + path: '', + component: JobmessagePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class JobmessagePageRoutingModule {} diff --git a/src/app/pages/jobmessage/jobmessage.module.ts b/src/app/pages/jobmessage/jobmessage.module.ts new file mode 100644 index 0000000..a737171 --- /dev/null +++ b/src/app/pages/jobmessage/jobmessage.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 { JobmessagePageRoutingModule } from './jobmessage-routing.module'; + +import { JobmessagePage } from './jobmessage.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + JobmessagePageRoutingModule + ], + declarations: [JobmessagePage] +}) +export class JobmessagePageModule {} diff --git a/src/app/pages/jobmessage/jobmessage.page.html b/src/app/pages/jobmessage/jobmessage.page.html new file mode 100644 index 0000000..4d965f1 --- /dev/null +++ b/src/app/pages/jobmessage/jobmessage.page.html @@ -0,0 +1,78 @@ + + + + + + + + Job Messages + + + + + + + +
+
+
+ Messages +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + diff --git a/src/app/pages/jobmessage/jobmessage.page.scss b/src/app/pages/jobmessage/jobmessage.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/jobmessage/jobmessage.page.spec.ts b/src/app/pages/jobmessage/jobmessage.page.spec.ts new file mode 100644 index 0000000..d23930f --- /dev/null +++ b/src/app/pages/jobmessage/jobmessage.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { JobmessagePage } from './jobmessage.page'; + +describe('JobmessagePage', () => { + let component: JobmessagePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ JobmessagePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(JobmessagePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/jobmessage/jobmessage.page.ts b/src/app/pages/jobmessage/jobmessage.page.ts new file mode 100644 index 0000000..fc68e5c --- /dev/null +++ b/src/app/pages/jobmessage/jobmessage.page.ts @@ -0,0 +1,34 @@ +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-jobmessage', + templateUrl: './jobmessage.page.html', + styleUrls: ['./jobmessage.page.scss'], +}) +export class JobmessagePage implements OnInit { + + constructor( + private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService + ) { } + + ngOnInit() { + // this.getPendingOffersData(); + } + + onBack() { + const event = new Event("app-myjob-offers-clear-modals"); + // Dispatch the event. + dispatchEvent(event); + this.navctr.back(); + } + + + +}