From 6ac7faa2e331de513dd9a8ea4584c0513e6375c7 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Fri, 9 Feb 2024 12:44:40 -0500 Subject: [PATCH] exta section --- REMEMBER.txt | 3 ++ .../familiy-dash/familiy-dash.component.ts | 5 ++- .../extra2box/extra2box.component.html | 14 ++++++++ .../extra2box/extra2box.component.scss | 35 +++++++++++++++++++ .../extra2box/extra2box.component.spec.ts | 24 +++++++++++++ .../extra2box/extra2box.component.ts | 20 +++++++++++ .../familiy-notask.component.html | 28 +++++++-------- .../fastreward/fastreward.component.html | 30 ++++++++-------- .../fastreward/fastreward.component.scss | 3 +- src/app/pages/home/home-routing.module.ts | 9 +++-- 10 files changed, 139 insertions(+), 32 deletions(-) create mode 100644 src/app/components/familycards/extra2box/extra2box.component.html create mode 100644 src/app/components/familycards/extra2box/extra2box.component.scss create mode 100644 src/app/components/familycards/extra2box/extra2box.component.spec.ts create mode 100644 src/app/components/familycards/extra2box/extra2box.component.ts diff --git a/REMEMBER.txt b/REMEMBER.txt index 25632de..8c97391 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -22,6 +22,9 @@ ionic generate page jobactive ionic generate component taskactivities ionic generate component suggestedlist +ionic generate component extra2box + + ionic generate page addjob diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index 0aee814..1202c04 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -50,7 +50,10 @@ export class FamiliyDashComponent implements OnInit { this.pageItem.family_action = ""; this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); - +// + addEventListener('app_familiy_go_wallet', () => { + this.router.navigate(['tabs/tab4'],{state: {page_name: 0, family_action: ''}}); + }); this.bannerData = this.bannersDataService.bannerData; this.homebannerCount = this.bannersDataService.homebannerCount; diff --git a/src/app/components/familycards/extra2box/extra2box.component.html b/src/app/components/familycards/extra2box/extra2box.component.html new file mode 100644 index 0000000..77c6290 --- /dev/null +++ b/src/app/components/familycards/extra2box/extra2box.component.html @@ -0,0 +1,14 @@ + + + +
+
Add Kids
+
+ + +
+
Wallet
+
+ + + \ No newline at end of file diff --git a/src/app/components/familycards/extra2box/extra2box.component.scss b/src/app/components/familycards/extra2box/extra2box.component.scss new file mode 100644 index 0000000..2db3b44 --- /dev/null +++ b/src/app/components/familycards/extra2box/extra2box.component.scss @@ -0,0 +1,35 @@ +.extra-grid{ + margin: 10px 0px 10px 0px; + padding: 0px; + height: 150px; + .ext-col{ + padding: 5px; + + //background-color: #2dd36f; + height: 150px; + .ext-in{ + &.l{ + background-image: linear-gradient(to right, #1f1f3b, #152f49,#152f49,#1f1f3b); + color: white; + } + &.r{ + background-image: linear-gradient(to right, #866508, #906D0B,#866508); + color: white; + } + background-color: antiquewhite; + height: 140px; + border-radius: 10px; + + box-shadow: 1px 1px lightgray; + text-align: center; + + .ban-text{ + font-size: 24px; + font-weight: bolder; + padding-top: 80px; + // color: #8b198e; + } + + } + } +} \ No newline at end of file diff --git a/src/app/components/familycards/extra2box/extra2box.component.spec.ts b/src/app/components/familycards/extra2box/extra2box.component.spec.ts new file mode 100644 index 0000000..c33eb85 --- /dev/null +++ b/src/app/components/familycards/extra2box/extra2box.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { Extra2boxComponent } from './extra2box.component'; + +describe('Extra2boxComponent', () => { + let component: Extra2boxComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ Extra2boxComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(Extra2boxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/familycards/extra2box/extra2box.component.ts b/src/app/components/familycards/extra2box/extra2box.component.ts new file mode 100644 index 0000000..87843b8 --- /dev/null +++ b/src/app/components/familycards/extra2box/extra2box.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-extra2box', + templateUrl: './extra2box.component.html', + styleUrls: ['./extra2box.component.scss'], +}) +export class Extra2boxComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + + lAction(){ + dispatchEvent(new Event("app_familiy_nokids_action")); + } + rAction(){ + dispatchEvent(new Event("app_familiy_go_wallet")); + } +} 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 de2c222..ddc4ba0 100644 --- a/src/app/components/familycards/familiy-notask/familiy-notask.component.html +++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.html @@ -7,17 +7,17 @@ - - - -
- AAAA -
- - -
- BBB -
- - - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/components/familycards/fastreward/fastreward.component.html b/src/app/components/familycards/fastreward/fastreward.component.html index 702a2e4..e75fa76 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.html +++ b/src/app/components/familycards/fastreward/fastreward.component.html @@ -24,17 +24,19 @@ - - - -
-
Add Kids
-
- - -
-
Wallet
-
- - - \ 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 4f8bf9e..a5d5029 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.scss +++ b/src/app/components/familycards/fastreward/fastreward.component.scss @@ -1,6 +1,7 @@ ion-card { margin: 20px 0px 0px 0px; background-color: #4e0650; + box-shadow: 1px 1px lightgray; color: white; ion-card-title { color: white; @@ -19,7 +20,7 @@ ion-card { background-color: antiquewhite; height: 140px; border-radius: 10px; - box-shadow: 2px 2px; + box-shadow: 1px 1px lightgray; text-align: center; .ban-text{ font-size: 24px; diff --git a/src/app/pages/home/home-routing.module.ts b/src/app/pages/home/home-routing.module.ts index 061d1a8..e15459f 100644 --- a/src/app/pages/home/home-routing.module.ts +++ b/src/app/pages/home/home-routing.module.ts @@ -10,6 +10,8 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { HomePage } from './home.page'; +import {Extra2boxComponent} from "../../components/familycards/extra2box/extra2box.component"; +import {IonicModule} from "@ionic/angular"; const routes: Routes = [ { @@ -19,7 +21,10 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], + imports: [RouterModule.forChild(routes), IonicModule], + exports: [RouterModule, Extra2boxComponent], + declarations: [ + Extra2boxComponent + ] }) export class HomePageRoutingModule { }