From 118e38b96c2aeb34f8d98bee4051360998c62c4d Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 12 Aug 2023 21:32:23 -0400 Subject: [PATCH] fix page --- src/app/pages/home/home.page.html | 2 +- src/app/pages/home/home.page.scss | 21 ++++ .../pages/jobinterest/jobinterest.page.html | 114 +++++++++--------- .../pages/jobinterest/jobinterest.page.scss | 10 ++ src/app/pages/jobinterest/jobinterest.page.ts | 41 ++++++- src/app/pages/tabs/tabs.page.html | 2 - src/app/pages/tabs/tabs.page.scss | 6 +- src/app/services/wrench.service.ts | 4 +- 8 files changed, 132 insertions(+), 68 deletions(-) diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 45d9476..9a832fd 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -60,7 +60,7 @@ -
+
diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.scss index 521365b..389c1d2 100644 --- a/src/app/pages/home/home.page.scss +++ b/src/app/pages/home/home.page.scss @@ -2,6 +2,7 @@ ion-header { --background: white; border-bottom: 0; + .heading { display: flex; justify-content: space-between; @@ -40,6 +41,24 @@ ion-header { ion-content { + .short_style{ + background-color: transparent; + border-color: #a2d7f1; + border-width: 3px; + } + .lr{ + background-color: #e1cace; + } + .lg{ + background-color: #a7dca7; + } + .lb{ + background-color: #b3ccd7; + } + .ly{ + background-color: #eeee67; + } + .search_box { background-color: rgb(228, 227, 227); padding: 10px 20px; @@ -290,3 +309,5 @@ ion-content { } } } + + diff --git a/src/app/pages/jobinterest/jobinterest.page.html b/src/app/pages/jobinterest/jobinterest.page.html index 00b1b0e..947351a 100644 --- a/src/app/pages/jobinterest/jobinterest.page.html +++ b/src/app/pages/jobinterest/jobinterest.page.html @@ -13,50 +13,52 @@
- 3D Design + ....
- - 4.8 (4478 reviews) + +
-
- - 9876 Students -
-
- - 2.5 hours -
-
- - Certificate -
+ + + + + + + + + + + +
- Most Popular Courses - See all + +
-
- Section 1 - Introduction - 15 min -
+ + + + -
+
- Why Using Figma ? - 10 mins + {{item.title}} + {{item.description}} + {{item.offer_code}} {{item.price*0.01}} {{item.currency}} + Expire: {{item.expire}}
@@ -64,45 +66,45 @@
-
- Section 2 - Figma Basic - 60 min -
+ + + + -
-
-
+ + + -
- Why Using Figma ? - 10 mins -
-
-
- -
-
+ + + + + + + + + -
- Section 3 - Let's Practice - 75 min -
+ + + + -
-
-
+ + + -
- Why Using Figma ? - 10 mins -
-
-
- -
-
+ + + + + + + + +
diff --git a/src/app/pages/jobinterest/jobinterest.page.scss b/src/app/pages/jobinterest/jobinterest.page.scss index 7b8b68d..473e87d 100644 --- a/src/app/pages/jobinterest/jobinterest.page.scss +++ b/src/app/pages/jobinterest/jobinterest.page.scss @@ -10,6 +10,16 @@ ion-content { } } + .due_date{ + color: red; + font-size: 12px; + } + .price_line{ + color: green; + font-weight: bolder; + font-size: 12px; + } + .flex { display: flex; justify-content: space-between; diff --git a/src/app/pages/jobinterest/jobinterest.page.ts b/src/app/pages/jobinterest/jobinterest.page.ts index 84b8471..8792bbb 100644 --- a/src/app/pages/jobinterest/jobinterest.page.ts +++ b/src/app/pages/jobinterest/jobinterest.page.ts @@ -1,7 +1,8 @@ -import { Router } from '@angular/router'; import { Component, OnInit } from '@angular/core'; -import { NavController } from '@ionic/angular'; - +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import { WrenchService } from 'src/app/services/wrench.service'; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; @Component({ selector: 'app-jobinterest', templateUrl: './jobinterest.page.html', @@ -13,10 +14,12 @@ export class JobinterestPage implements OnInit { constructor( private navctr: NavController, - private router: Router - ) { } - + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService + ) {} ngOnInit() { + this.getManagerOffersData(); } onBack() { @@ -31,5 +34,31 @@ export class JobinterestPage implements OnInit { this.router.navigate(['enroll']); } + usrData: { + action:number, member_id: number, uid: string, + sessionid: string, + limit:20, + page:1, offset:number + }; + jobManagerOffersTotalData:any; + jobManagerOffersJobsData: []; + getManagerOffersData(){ + this.usrData = {action:13024, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:20, page:1,offset: 0} + + this.wrenchService.getManagerOffersList(this.usrData).subscribe( + jobManagerOffersTotalData => { + this.jobManagerOffersTotalData = jobManagerOffersTotalData; + console.log("jobManagerOffersTotalData RETURN->", this.jobManagerOffersTotalData); + this.jobManagerOffersJobsData = this.jobManagerOffersTotalData.result_list; + // debugger; + console.log("jobManagerOffersJobsData RETURN DATA->", this.jobManagerOffersJobsData); + } + ); + + } } diff --git a/src/app/pages/tabs/tabs.page.html b/src/app/pages/tabs/tabs.page.html index 9743ee0..de04f17 100644 --- a/src/app/pages/tabs/tabs.page.html +++ b/src/app/pages/tabs/tabs.page.html @@ -27,7 +27,5 @@ more -
- diff --git a/src/app/pages/tabs/tabs.page.scss b/src/app/pages/tabs/tabs.page.scss index a6e7c5f..77ffbe0 100644 --- a/src/app/pages/tabs/tabs.page.scss +++ b/src/app/pages/tabs/tabs.page.scss @@ -3,11 +3,13 @@ border-radius: 40px; } .bottom_bardiv{ - background-color: red; - // position:absolute; + // background-color: red; + position:relative; + align-content: center; } .bottom_bar{ + position: relative; //background-color: red; max-width: 600px; } \ No newline at end of file diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 7fc1c17..80333e4 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -29,9 +29,11 @@ export class WrenchService { // } + getManagerOffersList(reqData){ + return this.getPostData('offersinterestlist', reqData); + } getJobManagerList(reqData){ return this.getPostData('jobmanagerlist', reqData); - // } verifyPassReset(reqData){