diff --git a/src/app/components/familiy-dash/familiy-dash.component.html b/src/app/components/familiy-dash/familiy-dash.component.html index cd26be2..16aac4f 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.html +++ b/src/app/components/familiy-dash/familiy-dash.component.html @@ -2,4 +2,5 @@ + diff --git a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.html b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.html index cb07f83..f8de017 100644 --- a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.html +++ b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.html @@ -1,3 +1,14 @@ -

- familiy-addfamily works! -

+ + + + Add Relatives +
+ + + + Task, Goals completed, well done, or promised - Time to send a reward. + + + + + \ No newline at end of file diff --git a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.scss b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.scss index e69de29..2425237 100644 --- a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.scss +++ b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.scss @@ -0,0 +1,25 @@ +ion-card{ + margin:20px 0px 0px 0px; + height: 150px; + padding: 0px; + --background: #f3f9fd; + ion-card-header{ + --margin-bottom: 0px; + margin-bottom: 0px; + } + 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%; + } +} \ No newline at end of file diff --git a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts index 7b7ccec..1a75a2f 100644 --- a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts +++ b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts @@ -11,4 +11,8 @@ export class FamiliyAddfamilyComponent implements OnInit { ngOnInit() {} + cardAction(){ + alert('card-action'); + } + } diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html new file mode 100644 index 0000000..dbee532 --- /dev/null +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html @@ -0,0 +1,14 @@ + + + + Add Allowance +
+ + + + Task, Goals completed, well done, or promised - Time to send a reward. + + + + + \ No newline at end of file diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.scss b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.scss new file mode 100644 index 0000000..2425237 --- /dev/null +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.scss @@ -0,0 +1,25 @@ +ion-card{ + margin:20px 0px 0px 0px; + height: 150px; + padding: 0px; + --background: #f3f9fd; + ion-card-header{ + --margin-bottom: 0px; + margin-bottom: 0px; + } + 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%; + } +} \ No newline at end of file diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.spec.ts b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.spec.ts new file mode 100644 index 0000000..aec4ebb --- /dev/null +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { FamiliyAllowanceComponent } from './familiy-allowance.component'; + +describe('FamiliyAllowanceComponent', () => { + let component: FamiliyAllowanceComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ FamiliyAllowanceComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(FamiliyAllowanceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts new file mode 100644 index 0000000..6d8f47b --- /dev/null +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-familiy-allowance', + templateUrl: './familiy-allowance.component.html', + styleUrls: ['./familiy-allowance.component.scss'], +}) +export class FamiliyAllowanceComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + + cardAction(){ + alert('card-action'); + } + +} diff --git a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.html b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.html index a9b2b44..f7b1374 100644 --- a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.html +++ b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.html @@ -1,3 +1,19 @@ -

- familiy-nokids works! -

+ + + Add Kids + +
+ + + + Task, Goals . + + + + \ No newline at end of file diff --git a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.scss b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.scss index e69de29..445731a 100644 --- a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.scss +++ b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.scss @@ -0,0 +1,27 @@ +ion-card{ + margin:20px 0px 0px 0px; + height: 130px; + padding: 0px; + background-image: url("https://www.wrenchboard.com/assets/images/apps/dash-family-card-nokid.png"); + background-size: cover; + --background: #240668; + ion-card-header{ + --margin-bottom: 0px; + margin-bottom: 0px; + } + 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%; + } +} \ No newline at end of file diff --git a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts index c5a52aa..2fd700f 100644 --- a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts +++ b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts @@ -11,4 +11,8 @@ export class FamiliyNokidsComponent implements OnInit { ngOnInit() {} + cardAction(){ + alert('card-action'); + } + } diff --git a/src/app/components/familycards/familiy-notask/familiy-notask.component.html b/src/app/components/familycards/familiy-notask/familiy-notask.component.html index 8cb0770..d0885dc 100644 --- a/src/app/components/familycards/familiy-notask/familiy-notask.component.html +++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.html @@ -1,3 +1,14 @@ -

- familiy-notask works! -

+ + + + No Tasks +
+ + + + Task, Goals completed, well done, or promised - Time to send a reward. + + + + + \ No newline at end of file diff --git a/src/app/components/familycards/familiy-notask/familiy-notask.component.scss b/src/app/components/familycards/familiy-notask/familiy-notask.component.scss index e69de29..2425237 100644 --- a/src/app/components/familycards/familiy-notask/familiy-notask.component.scss +++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.scss @@ -0,0 +1,25 @@ +ion-card{ + margin:20px 0px 0px 0px; + height: 150px; + padding: 0px; + --background: #f3f9fd; + ion-card-header{ + --margin-bottom: 0px; + margin-bottom: 0px; + } + 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%; + } +} \ No newline at end of file diff --git a/src/app/components/familycards/familiy-notask/familiy-notask.component.ts b/src/app/components/familycards/familiy-notask/familiy-notask.component.ts index ea7b273..7fa2638 100644 --- a/src/app/components/familycards/familiy-notask/familiy-notask.component.ts +++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.ts @@ -11,4 +11,8 @@ export class FamiliyNotaskComponent implements OnInit { ngOnInit() {} + cardAction(){ + alert('card-action'); + } + } diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts index 65ad242..7250204 100644 --- a/src/app/pages/home/home.module.ts +++ b/src/app/pages/home/home.module.ts @@ -18,6 +18,7 @@ import {FamiliyDashComponent} from "../../components/familiy-dash/familiy-dash.c import { FamiliyNokidsComponent } from '../../components/familycards/familiy-nokids/familiy-nokids.component'; import {FamiliyNotaskComponent} from "../../components/familycards/familiy-notask/familiy-notask.component"; import {FamiliyAddfamilyComponent} from "../../components/familycards/familiy-addfamily/familiy-addfamily.component"; +import {FamiliyAllowanceComponent} from "../../components/familycards/familiy-allowance/familiy-allowance.component"; // @NgModule({ // schemas: [CUSTOM_ELEMENTS_SCHEMA] @@ -35,7 +36,8 @@ import {FamiliyAddfamilyComponent} from "../../components/familycards/familiy-ad TrackingComponent,FastrewardComponent, LatestMarketComponent,HelpListingComponent, FamiliyDashComponent,FamiliyNokidsComponent, - FamiliyNotaskComponent,FamiliyAddfamilyComponent + FamiliyNotaskComponent,FamiliyAddfamilyComponent, + FamiliyAllowanceComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index ddcded7..babdfef 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -20,7 +20,7 @@ + Kids Login diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 6a29b7a..75310ab 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -2,7 +2,10 @@ ion-content { .family_box{ margin-bottom: 20px; } - +.login-type22{ + font-weight: bolder; + color:white; +} .pending-buttom{ padding-top: 25px; }