diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index ef0bc8f..0262b15 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -17,7 +17,8 @@ export class FamiliyDashComponent implements OnInit { family_dash_show:number =10; pageItem:{ - page_name: number + page_name: number, + family_action: string } constructor(private navctr: NavController, private router: Router, @@ -26,25 +27,34 @@ export class FamiliyDashComponent implements OnInit { private wrenchService: WrenchService) { addEventListener('app_fastreward_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + // this.pageItem.family_action = "FAMILY_ACTION_SEND_REWARD"; + this.router.navigate(['family'],{state: {page_name: 0, family_action: 'FAMILY_ACTION_SEND_REWARD'}}); }); addEventListener('app_familiy_nokids_action', () => { - this.router.navigate(['addfamilykid'],{state: this.pageItem}); + // this.pageItem.family_action = "FAMILY_ACTION_NO_KIDS"; + this.router.navigate(['addfamilykid'],{state: {page_name: 0, family_action: 'FAMILY_ACTION_NO_KIDS'}}); }); addEventListener('app_familiy_notask_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); addEventListener('app_familiy_addfamily_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); addEventListener('app_familiy_allowance_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); + + this.bannerData = this.bannersDataService.bannerData; + this.homebannerCount = this.bannersDataService.homebannerCount; + // let us keep refreshing - internal so serve call var interval = setInterval( ()=> { this.bannerData = this.bannersDataService.bannerData; this.homebannerCount = this.bannersDataService.homebannerCount; diff --git a/src/app/components/familycards/fastreward/fastreward.component.html b/src/app/components/familycards/fastreward/fastreward.component.html index 2715933..5b898c3 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.html +++ b/src/app/components/familycards/fastreward/fastreward.component.html @@ -1,91 +1,16 @@ -
-
-
- - - - Send a Reward -
-
- - - . - - - - -
+ + Silhouette of mountains + + Send a Reward + + - - - - - - - - - - - - - - - - - - + + Rewards for chores, goals met, or simply allowance. +
+ - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +
+ + \ No newline at end of file diff --git a/src/app/components/familycards/fastreward/fastreward.component.scss b/src/app/components/familycards/fastreward/fastreward.component.scss index 8ded5cf..af78128 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.scss +++ b/src/app/components/familycards/fastreward/fastreward.component.scss @@ -1,89 +1,8 @@ -ion-card{ - margin:20px 0px 0px 0px; - height: 150px; - padding: 0px; - --background: #f3f9fd; - ion-card-header{ - --margin-bottom: 0px; - margin-bottom: 0px; +ion-card { + margin: 20px 0px 0px 0px; + background-color: #4e0650; + color: white; + ion-card-title{ + color: white; } - .kid-card-title{ - margin-left: 10px; - font-weight: bolder; - } - ion-card-content{ - --margin-top: 0px; - --margin-bottom: 0px; - f-item, ion-item{ - //--background-color: #3dc2ff; - font-size: 14px; - } - // background-color: #3dc2ff; - // font-weight: bolder; - // background-image: linear-gradient(to top, #3dc2ff, #ffffff); - } - .left-col{ - background-color: yellow; - height: 100%; - } -} -.kid-line{ - color: #3dc2ff; - line-height: 3px; - background-color: #3dc2ff; -} -.left-col_pic{ - // background-image: url("/assets/images/reward.png"); - background-size: contain; - background-repeat: no-repeat; - margin: auto 5px auto 5px; - img { - border-radius: 4px; - width: 150px; - } -} -.fast1{ - ion-list{ - --background-color: transparent; - ion-item{ - --background: aliceblue; - } - } - .title{ - //font-family: "Lucida Console", "Courier New", monospace; - font-weight: bolder; - margin-left: 20px; - font-size: 28px; - } - .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; - } - } - -} +} \ No newline at end of file