diff --git a/REMEMBER.txt b/REMEMBER.txt index 1bcea84..38ce74d 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -5,4 +5,5 @@ npx capacitor-assets generate ionic generate page familylogin ionic generate page blogdetail -ionic generate page marketdetail \ No newline at end of file +ionic generate page marketdetail +ionic generate page activetask \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bc0b09f..2d79eec 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -142,6 +142,10 @@ const routes: Routes = [ path: 'marketdetail', loadChildren: () => import('./pages/marketdetail/marketdetail.module').then(m => m.MarketdetailPageModule) }, + { + path: 'activetask', + loadChildren: () => import('./pages/activetask/activetask.module').then(m => m.ActivetaskPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/activetask/activetask-routing.module.ts b/src/app/pages/activetask/activetask-routing.module.ts new file mode 100644 index 0000000..5654d15 --- /dev/null +++ b/src/app/pages/activetask/activetask-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ActivetaskPage } from './activetask.page'; + +const routes: Routes = [ + { + path: '', + component: ActivetaskPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ActivetaskPageRoutingModule {} diff --git a/src/app/pages/activetask/activetask.module.ts b/src/app/pages/activetask/activetask.module.ts new file mode 100644 index 0000000..0007535 --- /dev/null +++ b/src/app/pages/activetask/activetask.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 { ActivetaskPageRoutingModule } from './activetask-routing.module'; + +import { ActivetaskPage } from './activetask.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ActivetaskPageRoutingModule + ], + declarations: [ActivetaskPage] +}) +export class ActivetaskPageModule {} diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html new file mode 100644 index 0000000..d23133b --- /dev/null +++ b/src/app/pages/activetask/activetask.page.html @@ -0,0 +1,214 @@ + + +
+
+ +
+
+ +
+
+ {{jobData.title}} + +
+ +
+ {{jobData.contract}} +
+ + +
+
+ + Price: {{jobData.price*0.01}} {{jobData.currency}} + +
+
+ + Timeline: {{jobData.timeline_days}} days +
+ + + + +
+ + + + Details + + + Send Updates + + + Completed ? + + + +
+ Mentor + +
+
+
+
+ Due Date + {{jobData.delivery_date}} +
+
+ +
+ + Description + {{jobData.job_description}} + + + Delivery Details + {{jobData.description}} + +
+ +
+
+ Most Popular Courses + See all +
+ +
+ Section 1 - Introduction + 15 min +
+ +
+
+
+ +
+ Why Using Figma ? + 10 mins +
+
+
+ +
+
+ +
+ 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 +
+ +
+
+
+
+ + All +
+
+ + 1 +
+
+ + 2 +
+
+ + 3 +
+
+ + 4 +
+
+ + 5 +
+
+
+
+ +
+
+
+
+
+ Jonathon Williams +
+
+
+
+ + 5 +
+ +
+
+ The course is very good. the experience of the menter is very clear and easy to understand + + + +
+
+ +
+ + + + +
+ Return +
+ + + diff --git a/src/app/pages/activetask/activetask.page.scss b/src/app/pages/activetask/activetask.page.scss new file mode 100644 index 0000000..1c3cf7a --- /dev/null +++ b/src/app/pages/activetask/activetask.page.scss @@ -0,0 +1,385 @@ + +ion-content { + .back_image { + width: 100%; + height: 230px; + + .back { + font-size: 25px; + color: white; + } + } + + .flex { + display: flex; + justify-content: space-between; + align-items: center; + + ion-icon { + font-size: 22px; + } + } + + .row { + display: flex; + align-items: center; + margin-top: 10px; + + .bg_text { + color: var(--ion-color-primary); + background: #dfe1f3; + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + margin-right: 10px; + } + + .rate { + display: flex; + align-items: center; + + .review { + margin-left: 5px; + } + } + } + + .color_text { + margin-top: 10px; + font-size: 22px; + font-family: 'semi-bold'; + color: var(--ion-color-primary); + } + + .items { + display: flex; + justify-content: space-between; + margin-top: 10px; + margin-bottom: 20px; + border-bottom: 1px solid lightgrey; + padding-bottom: 10px; + + .stud { + display: flex; + align-items: center; + + ion-icon { + margin-right: 5px; + } + + ion-label { + color: grey; + } + } + } + + .about { + margin-top: 10px; + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } + } + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + + .review_tab { + margin-top: 20px; + + .total { + display: flex; + align-items: center; + justify-content: space-between; + + .star-rate { + display: flex; + align-items: center; + + .bold { + font-size: 17px; + font-family: 'semi-bold'; + margin-left: 5px; + } + } + + .color { + color: var(--ion-color-primary); + font-size: 14px; + } + } + + + .story-item { + overflow: scroll; + display: flex; + flex-direction: row; + margin-top: 20px; + + .menu { + width: 100%; + display: flex; + flex-direction: row; + + .item { + padding: 5px; + margin: 5px; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + ion-thumbnail { + border-radius: 15px; + width: max-content; + height: 60px; + width: 60px; + --border-radius: 50%; + } + + ion-label { + font-size: 14px; + font-family: "medium"; + color: var(--ion-color-medium); + } + } + + .text { + + display: flex; + align-items: center; + text-align: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + .show { + background-color: var(--ion-color-primary); + } + + .white { + color: white !important; + } + + .choice { + display: flex; + } + } + } + } + + .reviw_list { + margin-top: 25px; + + .profile { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + + .left { + display: flex; + align-items: center; + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + .right { + display: flex; + align-items: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + ion-icon { + font-size: 20px; + } + } + } + + .like { + display: flex; + align-items: center; + margin-top: 10px; + + .heart { + font-size: 25px; + margin-right: 5px; + } + + .count { + margin-right: 10px; + } + + .time { + color: grey; + font-size: 14px; + } + } + } + } + + + + .bold_text { + font-size: 20px; + font-family: 'bold'; + } +} + + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} diff --git a/src/app/pages/activetask/activetask.page.spec.ts b/src/app/pages/activetask/activetask.page.spec.ts new file mode 100644 index 0000000..b2a1f1b --- /dev/null +++ b/src/app/pages/activetask/activetask.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ActivetaskPage } from './activetask.page'; + +describe('ActivetaskPage', () => { + let component: ActivetaskPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ActivetaskPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ActivetaskPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts new file mode 100644 index 0000000..73079b4 --- /dev/null +++ b/src/app/pages/activetask/activetask.page.ts @@ -0,0 +1,43 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-activetask', + templateUrl: './activetask.page.html', + styleUrls: ['./activetask.page.scss'], +}) +export class ActivetaskPage implements OnInit { + + + tabs = 'about'; + + jobData: any; + constructor( + private navctr: NavController, + private router: Router + ) { + + 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(); + } + + onMentor() { + this.router.navigate(['mentor']); + } + + onEnroll() { + this.router.navigate(['enroll']); + } + + +} diff --git a/src/app/pages/inbox/inbox.page.html b/src/app/pages/inbox/inbox.page.html index 554f9c7..a2dd644 100644 --- a/src/app/pages/inbox/inbox.page.html +++ b/src/app/pages/inbox/inbox.page.html @@ -6,7 +6,7 @@ - Current Tasks + My Tasks @@ -25,7 +25,7 @@
-
+
diff --git a/src/app/pages/inbox/inbox.page.ts b/src/app/pages/inbox/inbox.page.ts index 8720fa2..f7cc776 100644 --- a/src/app/pages/inbox/inbox.page.ts +++ b/src/app/pages/inbox/inbox.page.ts @@ -31,6 +31,10 @@ export class InboxPage implements OnInit { onMessage() { this.router.navigate(['message']); } + activeSeleted(item) { + this.router.navigate(['activetask'],{state: item}); + } + usrData: { action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:0, offset: 0, job_mode: string };