diff --git a/src/app/pages/allblog/allblog.page.scss b/src/app/pages/allblog/allblog.page.scss
index 1c3cf7a..54a4089 100644
--- a/src/app/pages/allblog/allblog.page.scss
+++ b/src/app/pages/allblog/allblog.page.scss
@@ -355,7 +355,9 @@ ion-content {
}
}
-
+ion-card{
+ margin: 0px;
+}
ion-footer {
--background: white;
diff --git a/src/app/pages/allblog/allblog.page.ts b/src/app/pages/allblog/allblog.page.ts
index 7de3ccc..fc06cb6 100644
--- a/src/app/pages/allblog/allblog.page.ts
+++ b/src/app/pages/allblog/allblog.page.ts
@@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
import {NavController} from "@ionic/angular";
import {Router} from "@angular/router";
+import { SessionDataProviderService } from 'src/app/store/session-data-provider.service';
+import { BlogDataService } from 'src/app/store/blog-data.service';
+import { WrenchService } from 'src/app/services/wrench.service';
@Component({
selector: 'app-allblog',
@@ -10,22 +13,47 @@ import {Router} from "@angular/router";
export class AllblogPage implements OnInit {
tabs = 'about';
+
constructor(
+ private router: Router,
private navctr: NavController,
- private router: Router
- ) { }
+
+ public sessionDataProviderService: SessionDataProviderService,
+ private wrenchService: WrenchService,
+ public blogDataService: BlogDataService
+ ) {
+ }
ngOnInit() {
+ this.getBlogData([]);
}
onBack() {
this.navctr.back();
}
+ blogResult:any;
+ blogData:any;
+ getBlogData(blogReq=[]){
+ this.wrenchService.getBlogData(blogReq).subscribe(
+ blogResult => {
+ this.blogResult = blogResult;
+ console.log("BLOG RETURN->", this.blogResult);
+ this.blogData = this.blogResult.blogdata;
+ // debugger;
+ this.blogDataService.setBlogData(this.blogResult.blogdata);
+ }
+ );
+ }
onMentor() {
this.router.navigate(['mentor']);
}
+ blogDetails(item) {
+ var pageToNavigate = 'blogdetail';
+ this.router.navigate([pageToNavigate],{state: item} );
+ }
+
onEnroll() {
this.router.navigate(['enroll']);
}
diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html
index d7f03d9..e0dfdd7 100644
--- a/src/app/pages/jobreview/jobreview.page.html
+++ b/src/app/pages/jobreview/jobreview.page.html
@@ -10,7 +10,7 @@
In Review
-
+
{{jobData.title}}
@@ -39,13 +39,13 @@
- Task Actions
+ Task is Completed
This job is in review, you can accept or reject completion.
- Reject Completion
- Accept Completion
+ Reject
+ Accept