diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 218772b..b722b8a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -162,6 +162,10 @@ const routes: Routes = [ path: 'jobinterest', loadChildren: () => import('./pages/jobinterest/jobinterest.module').then(m => m.JobinterestPageModule) }, + { + path: 'joblist', + loadChildren: () => import('./pages/joblist/joblist.module').then(m => m.JoblistPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index 8fb3243..127c940 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -30,7 +30,7 @@
- 0 Tasks + {{family_active}} Tasks
diff --git a/src/app/pages/joblist/joblist-routing.module.ts b/src/app/pages/joblist/joblist-routing.module.ts new file mode 100644 index 0000000..ed59d23 --- /dev/null +++ b/src/app/pages/joblist/joblist-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { JoblistPage } from './joblist.page'; + +const routes: Routes = [ + { + path: '', + component: JoblistPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class JoblistPageRoutingModule {} diff --git a/src/app/pages/joblist/joblist.module.ts b/src/app/pages/joblist/joblist.module.ts new file mode 100644 index 0000000..29cfb42 --- /dev/null +++ b/src/app/pages/joblist/joblist.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 { JoblistPageRoutingModule } from './joblist-routing.module'; + +import { JoblistPage } from './joblist.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + JoblistPageRoutingModule + ], + declarations: [JoblistPage] +}) +export class JoblistPageModule {} diff --git a/src/app/pages/joblist/joblist.page.html b/src/app/pages/joblist/joblist.page.html new file mode 100644 index 0000000..a603c13 --- /dev/null +++ b/src/app/pages/joblist/joblist.page.html @@ -0,0 +1,9 @@ + + + joblist + + + + + + diff --git a/src/app/pages/joblist/joblist.page.scss b/src/app/pages/joblist/joblist.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/joblist/joblist.page.spec.ts b/src/app/pages/joblist/joblist.page.spec.ts new file mode 100644 index 0000000..e39b833 --- /dev/null +++ b/src/app/pages/joblist/joblist.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { JoblistPage } from './joblist.page'; + +describe('JoblistPage', () => { + let component: JoblistPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ JoblistPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(JoblistPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/joblist/joblist.page.ts b/src/app/pages/joblist/joblist.page.ts new file mode 100644 index 0000000..bf27701 --- /dev/null +++ b/src/app/pages/joblist/joblist.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-joblist', + templateUrl: './joblist.page.html', + styleUrls: ['./joblist.page.scss'], +}) +export class JoblistPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 5d7a262..f1d897a 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -15,7 +15,7 @@
3D Design
- + My Jobs
@@ -39,60 +39,19 @@
- + Active - + Review - + Past Due -
- Mentor - -
-
-
-
- Jonathon Williams - Senier UI/UX designer at google -
-
- -
- - About Course - - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi - commodi - - - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi - commodi - - - Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi - commodi - - - Tools - - Figma -
- -
-
- Most Popular Courses - See all -
- -
- Section 1 - Introduction - 15 min -
+
+ Currently Active
@@ -108,83 +67,45 @@
-
- Section 2 - Figma Basic - 60 min -
- -
-
-
- -
- Why Using Figma ? - 10 mins -
-
-
- -
-
- -
- Section 3 - Let's Practice - 75 min -
- - -
-
-
- -
- Why Using Figma ? - 10 mins -
-
-
- -
-
-
-
-
- - 4.8 (5456 Reviews) -
- See all -
+
+ Jobs Ready for Review +
+
+
- -
-
-
-
-
- Jonathon Williams -
-
-
-
- - 5 -
- +
+ Why Using Figma ? + 10 mins
- The course is very good. the experience of the menter is very clear and easy to understand - - - + +
+ +
+ Jobs Past Due Date + +
+
+
+ +
+ Why Using Figma ? + 10 mins +
+
+
+ +
+
+
diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts index bc85059..f846741 100644 --- a/src/app/pages/jobmanager/jobmanager.page.ts +++ b/src/app/pages/jobmanager/jobmanager.page.ts @@ -11,7 +11,7 @@ import { NavController } from '@ionic/angular'; export class JobmanagerPage implements OnInit { - tabs = 'about'; + tabs = 'active'; constructor( private navctr: NavController, @@ -21,6 +21,9 @@ export class JobmanagerPage implements OnInit { ngOnInit() { } + onMyJobs(){ + this.router.navigate(['joblist']); + } onBack() { this.navctr.back(); }