diff --git a/REMEMBER.txt b/REMEMBER.txt index 48649da..1dc10be 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -62,11 +62,12 @@ ionic generate service waiting-interest ionic generate component tracking ionic generate page addcredit +ionic generate page ownersjob ionic generate component latest-market ionic generate service tasks-data - +ionic generate service banners-data diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index 817e9c5..647f10d 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -5,7 +5,7 @@ - This Jobs + {{jobData.title}} @@ -18,25 +18,16 @@
- - - +
- + {{jobData.title}}
- -
- {{jobData.contract}} -
- - -
-
- - Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}} -
+ + Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}} +
+
Timeline: {{jobData.timeline_days}} days
@@ -87,18 +78,50 @@ - - - Activities + + + Assign Job - - - - - Send Message + + Details + + + Manage + +
+ + + + + + Place in Market + +
First Content
+
+ + + Assign to individual + +
Second Content
+
+
+
+ + +
+ + +
+ +
+ + +
+ + @@ -123,16 +146,7 @@ -
-
- - -
- - - -
diff --git a/src/app/pages/ownersjob/ownersjob.page.scss b/src/app/pages/ownersjob/ownersjob.page.scss index f9fda44..d63650a 100644 --- a/src/app/pages/ownersjob/ownersjob.page.scss +++ b/src/app/pages/ownersjob/ownersjob.page.scss @@ -84,6 +84,14 @@ ion-content { } } + .jobowner{ + padding: 10px; + border-radius: 10px; + background-color: aliceblue; + margin-top: 15px; + min-height: 250px; + } + .about { margin-top: 10px; @@ -93,35 +101,37 @@ ion-content { 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; - } - } + //.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; diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts index 26696fc..862f212 100644 --- a/src/app/pages/ownersjob/ownersjob.page.ts +++ b/src/app/pages/ownersjob/ownersjob.page.ts @@ -14,7 +14,7 @@ export class OwnersjobPage implements OnInit { item_banner:string = 'default.jpg'; session_image_server:string=''; curr_session:string=""; - tabs = 'activities'; + tabs = 'assignjob'; constructor( private navctr: NavController, private router: Router, @@ -22,9 +22,12 @@ export class OwnersjobPage implements OnInit { private wrenchService: WrenchService ) { - this.jobData = this.router.getCurrentNavigation().extras.state.jobData; + this.jobData = this.router.getCurrentNavigation().extras.state?.jobData; this.session_image_server = this.router.getCurrentNavigation().extras.state.session_image_server; this.item_banner = this.jobData.banner; + if (this.jobData== undefined){ + this.onBack(); + } } onBack() { this.navctr.back();