diff --git a/src/app/components/fastreward/fastreward.component.html b/src/app/components/fastreward/fastreward.component.html index d66bbf0..fbfff65 100644 --- a/src/app/components/fastreward/fastreward.component.html +++ b/src/app/components/fastreward/fastreward.component.html @@ -1,19 +1,80 @@ - - - Send Reward - - - + + + Reward a Kid + + + - - - 1 - - - 2 - - + + + + + WrenchBoard + + {{item.firstname}} ({{item.age}}) + + + + + + + + + + + + + + Family Acounts + + + - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/components/fastreward/fastreward.component.scss b/src/app/components/fastreward/fastreward.component.scss index 4c180b5..90d7511 100644 --- a/src/app/components/fastreward/fastreward.component.scss +++ b/src/app/components/fastreward/fastreward.component.scss @@ -3,8 +3,57 @@ ion-card{ height: 250px; padding: 0px; --background: red; + .left-col{ background-color: yellow; height: 100%; } } +.left-col_pic{ + background-image: url("/assets/images/reward.png"); + background-size: contain; + background-repeat: no-repeat; +} +.fast1{ + ion-list{ + --background-color: transparent; + ion-item{ + --background: aliceblue; + } + } + .title{ + font-weight: bolder; + margin-left: 10px; + } + .list_img { + height: auto; + max-width: 20px; + border-radius: 100%; + } + margin:20px 0px 0px 0px; + height: 250px; + padding: 0px; + background: aliceblue; // rgba(78, 61, 130, 0.86); + border-radius: 20px; + .left-col{ + background-color: yellow; + height: 100%; + } + + .name_bg_text{ + color: #8b198e; + font-weight: bolder; + } + + .back_image { + margin-top: 10px; + width: 100%; + height: 200px; + + .back { + font-size: 25px; + color: white; + } + } + +} diff --git a/src/app/components/fastreward/fastreward.component.ts b/src/app/components/fastreward/fastreward.component.ts index 5059ae6..bb3f998 100644 --- a/src/app/components/fastreward/fastreward.component.ts +++ b/src/app/components/fastreward/fastreward.component.ts @@ -1,4 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-fastreward', @@ -6,9 +10,50 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./fastreward.component.scss'], }) export class FastrewardComponent implements OnInit { + total_family:number = 0; + family_active:number = 0; + session_image_server:string=''; + curr_session:string=''; + constructor(private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService) { } - constructor() { } + ngOnInit() { + this.getFamilyData(); + } + familyAcc(){ + this.router.navigate(['family']); + } + usrData: { + action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0 + }; + familyTotalData:any; + familyData: []; + getFamilyData(){ + this.usrData = {action:22010, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:20, page:1,offset: 0}; + this.curr_session = this.sessionDataProviderService.session; - ngOnInit() {} + this.wrenchService.getFamilyList(this.usrData).subscribe( + familyTotalData => { + this.familyTotalData = familyTotalData; + console.log("FAMILY RETURN->", this.familyTotalData); + this.familyData = this.familyTotalData.result_list.slice(0,3); + // debugger; + this.session_image_server = this.familyTotalData.session_image_server; + console.log("FAMILY RETURN DATA->", this.familyData); + this.total_family = this.familyData.length; + } + ); + + } + + familyMemebr(item){ + + } } diff --git a/src/app/pages/blogdetail/blogdetail.page.html b/src/app/pages/blogdetail/blogdetail.page.html index abdf921..20d568e 100644 --- a/src/app/pages/blogdetail/blogdetail.page.html +++ b/src/app/pages/blogdetail/blogdetail.page.html @@ -1,8 +1,22 @@ - + + + + + + + + + + + + + {{blogData.post_title}} + +
- +
@@ -207,10 +221,10 @@
- - -
- Return -
-
-
+ + + + + + + diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index a269ecf..a980b8e 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -118,7 +118,7 @@ - + diff --git a/src/assets/images/reward.png b/src/assets/images/reward.png new file mode 100644 index 0000000..f845a31 Binary files /dev/null and b/src/assets/images/reward.png differ