diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss index 40f3f49..a1ea7ce 100644 --- a/src/app/pages/familymember/familymember.page.scss +++ b/src/app/pages/familymember/familymember.page.scss @@ -5,7 +5,7 @@ ion-content { height: 130px; background-size: contain; background-repeat: no-repeat; - + .back { font-size: 25px; color: white; diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index f92bda3..41dbe8b 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -24,52 +24,80 @@ -->
-
-
-
+
-
-
-
- - -
-
- -
+ + + + + My Suggested Tasks + + + -
- {{item.short_title}} - {{item.short_description}} +
+
+
+
- - - - - - - - - +
+ Why Using Figma ? + 10 mins +
+
+
+ +
- -
-
- Recommended Blog - See all +
-
-
- -
- {{item.post_title}} -
+ +
+
- -
+
+
+
+ + +
+
+ +
+
+ {{item.short_title}} + {{item.short_description}} + + + + + + + + + + +
+
+ +
+
+ Recommended Blog + See all +
+
+
+ +
+ {{item.post_title}} +
+
+ +
+ diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.scss index 08514b4..65993de 100644 --- a/src/app/pages/home/home.page.scss +++ b/src/app/pages/home/home.page.scss @@ -39,8 +39,80 @@ ion-header { } } +.fam1{ + margin:10px 0px 10px 0px; + background-color: aliceblue; + min-height: 100px; + .famleft{ + background-image: url("https://www.wrenchboard.com/assets/images/apps/family/kids-waiting.jpg"); + background-size: cover; + background-repeat: no-repeat; + width:100%; + height: 130px; + border-radius: 10px 0px 0px 10px; + } +} ion-content { + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + .short_style{ background-color: transparent; border-color: #a2d7f1; diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index a0969be..097bc12 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -15,7 +15,7 @@ export class HomePage implements OnInit { firstname: string = ''; have_jobs:number = 0; blogData: []; - + accountType:string=""; constructor( private router: Router, public sessionDataProviderService: SessionDataProviderService, @@ -23,24 +23,41 @@ export class HomePage implements OnInit { private onesignalService: OnesignalService, public blogDataService: BlogDataService ) { - this.firstname = this.sessionDataProviderService.firstname; - // debugger; - this.blogData = this.blogDataService.blogData; - console.log("BLOG HOME 001->", this.blogDataService.blogData); + this.accountType = sessionDataProviderService.account_type; + this.firstname = this.sessionDataProviderService.firstname; + this.blogData = this.blogDataService.blogData; } ngOnInit() { - // this.getBlogData([]); - // this.getBannersData(); - console.log("BLOG HOME 002->", this.blogDataService.blogData); - // this.firstname = this.sessionDataProviderService.firstname; - this.onesignalService.Init(this.sessionDataProviderService.member_uid); + if ( this.sessionDataProviderService.member_uid != ''){ + console.log("BLOG HOME 002->", this.blogDataService.blogData); + // this.firstname = this.sessionDataProviderService.firstname; + this.onesignalService.Init(this.sessionDataProviderService.member_uid); + + if (this.accountType == 'FULL'){ + this.getBlogData([]); + this.getBannersData(); + } + + if (this.accountType == 'FAMILY'){ + + } + + } + + } ionViewDidEnter(){ - this.getBlogData([]); - this.getBannersData(); + if (this.accountType == 'FULL'){ + this.getBlogData([]); + this.getBannersData(); + } + + if (this.accountType == 'FAMILY'){ + + } } blogResult:any; bannerResult:any;