-
-
-
-
+
Invite a Family
-
+
+
diff --git a/src/app/components/add-relatives/add-relatives.component.ts b/src/app/components/add-relatives/add-relatives.component.ts
index 9d5d862..b4379bb 100644
--- a/src/app/components/add-relatives/add-relatives.component.ts
+++ b/src/app/components/add-relatives/add-relatives.component.ts
@@ -16,18 +16,19 @@ export class AddRelativesComponent implements OnInit {
@ViewChild('firstname') firstname;
@ViewChild('lastname') lastname;
@ViewChild('email') email;
+ @ViewChild('family_type') family_type;
+ // @ViewChild('year') year;
- @ViewChild('month') month;
- @ViewChild('year') year;
- addFamilyResult:string='';
-
+ familyTypeData:any;
constructor(
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
private loadingCtrl: LoadingController,
private commonfuncService: CommonfuncService
- ) { }
+ ) {
+ this.familyTypeData= this.sessionDataProviderService.family_types;
+ }
regMonth:any;
regYear:any;
@@ -55,7 +56,10 @@ export class AddRelativesComponent implements OnInit {
isDisabled:boolean= true;
verifyEntry(){
this.isDisabled= true;
- if ( this.firstname.length> 1 && this.lastname.length> 1 && this.commonfuncService.validateEmail(this.email)== true ){
+ if ( this.firstname.length> 1
+ && this.lastname.length> 1
+ && this.family_type.length > 2
+ && this.commonfuncService.validateEmail(this.email)== true ){
this.isDisabled= false;
}
}
@@ -77,9 +81,11 @@ export class AddRelativesComponent implements OnInit {
firstname:string,
lastname: string,
email: number,
+ family_type: string
};
- createFamilyResult:any;
+ addFamilyResult:any;
+ addFamilyResultText:string='';
async inviteFamily(){
const loading = await this.loadingCtrl.create({
@@ -95,20 +101,21 @@ export class AddRelativesComponent implements OnInit {
firstname: this.firstname,
lastname: this.lastname,
email: this.email,
+ family_type: this.family_type
}
loading.present();
this.wrenchService.familyInvite(this.reqData).subscribe(
- createFamilyResult => {
+ addFamilyResult => {
loading.dismiss();
- this.createFamilyResult = createFamilyResult;
- console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.createFamilyResult);
- if (this.createFamilyResult.internal_return> 0){
+ this.addFamilyResult = addFamilyResult;
+ console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.addFamilyResult);
+ if (this.addFamilyResult.internal_return> 0){
this.firstname='';
this.lastname='';
this.email='';
- this.createFamilyResult = "Invite Sent.";
+ this.addFamilyResultText = "Invite Sent.";
setTimeout(()=>{
- this.createFamilyResult="";
+ this.addFamilyResultText="";
this.setCloseModal();
},3000);
}
diff --git a/src/app/pages/forgot/forgot.page.scss b/src/app/pages/forgot/forgot.page.scss
index 6b4a3f8..fec26e4 100644
--- a/src/app/pages/forgot/forgot.page.scss
+++ b/src/app/pages/forgot/forgot.page.scss
@@ -68,4 +68,16 @@ ion-content {
width: 100px;
}
}
+
+ .last_lbl {
+ text-align: center;
+ margin-top: 16px;
+ font-size: 16px;
+ color: #be2e7e;
+
+ span {
+ color: var(--ion-color-primary);
+ font-family: "bold";
+ }
+ }
}
diff --git a/src/app/pages/forgot/forgot.page.ts b/src/app/pages/forgot/forgot.page.ts
index 9c91116..bd2515e 100644
--- a/src/app/pages/forgot/forgot.page.ts
+++ b/src/app/pages/forgot/forgot.page.ts
@@ -3,7 +3,7 @@ import {Component, OnInit, ViewChild} from '@angular/core';
import { WrenchService } from 'src/app/services/wrench.service';
import { SessionDataProviderService } from 'src/app/store/session-data-provider.service';
import { BlogDataService } from 'src/app/store/blog-data.service';
-import {AlertController} from "@ionic/angular";
+import {AlertController, LoadingController} from "@ionic/angular";
@Component({
selector: 'app-forgot',
@@ -14,7 +14,7 @@ export class ForgotPage implements OnInit {
@ViewChild('username') username;
@ViewChild('password') password;
@ViewChild('reset_pin') reset_pin;
- tab = 1
+ tab = 2; // 1
reset_uid:string = '';
m_uid:string = '';
password_reset_id:number = 0;
@@ -22,6 +22,7 @@ export class ForgotPage implements OnInit {
constructor(
private router: Router,
private wrenchService: WrenchService,
+ private loadingCtrl: LoadingController,
public sessionDataProviderService:SessionDataProviderService,
public blogDataService:BlogDataService,
public alertController: AlertController
@@ -30,14 +31,23 @@ export class ForgotPage implements OnInit {
}
ngOnInit() {
+ //this.tab=2;
}
-
+ ionViewWillEnter(){
+ //debugger;
+ this.tab=2;
+ }
reqData: {
'action':11013, email: string, sessionid: string, channel:'MOBILE'
};
resetResult:any;
- onEnterEmail(){
+ async onEnterEmail(){
+ const loading = await this.loadingCtrl.create({
+ message: 'Please wait...',
+ duration: 6500,
+ });
+
this.reset_uid = '';
this.m_uid = '';
if (this.username == null || this.username == '' || this.validateEmail(this.username) == false) {
@@ -45,9 +55,11 @@ export class ForgotPage implements OnInit {
return;
}
+ loading.present();
this.reqData = { 'action':11013,email: this.username, sessionid: 'DUMMY-APP-SESSION', channel:'MOBILE' }
this.wrenchService.startPassReset(this.reqData).subscribe(
resetResult => {
+ loading.dismiss();
this.resetResult = resetResult;
console.log("INTERNAL RETURN->" + this.resetResult);
/*
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 7c9a35f..ddcded7 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 61ad437..6a29b7a 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -101,7 +101,7 @@ ion-content {
text-align: center;
margin-top: 16px;
font-size: 16px;
- color: #c2c2cb;
+ color: #be2e7e;
span {
color: var(--ion-color-primary);
diff --git a/src/app/pages/logout/logout.page.html b/src/app/pages/logout/logout.page.html
index e442f7f..00f147d 100644
--- a/src/app/pages/logout/logout.page.html
+++ b/src/app/pages/logout/logout.page.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/app/pages/register/register.page.scss b/src/app/pages/register/register.page.scss
index 5fa914b..f02eca2 100644
--- a/src/app/pages/register/register.page.scss
+++ b/src/app/pages/register/register.page.scss
@@ -5,10 +5,10 @@ ion-content {
// background-color: red;
}
.simp_lbl {
- margin-top: 10px;
+ margin-top: 5px;
font-size: 20px;
letter-spacing: 1.2px;
- margin-bottom: 20px;
+ margin-bottom: 10px;
font-family: 'semi-bold';
}
@@ -56,9 +56,10 @@ ion-content {
.or {
display: flex;
justify-content: center;
- margin-top: 25px;
- color: grey;
+ margin-top: 10px;
+ //color: grey;
font-size: 14px;
+ color: #be2e7e;
}
.button {
@@ -83,9 +84,9 @@ ion-content {
.last_lbl {
text-align: center;
- margin-top: 16px;
+ margin-top: 10px;
font-size: 16px;
- color: #c2c2cb;
+ color: #be2e7e;
span {
color: var(--ion-color-primary);
diff --git a/src/app/pages/slider/slider.page.html b/src/app/pages/slider/slider.page.html
index d1290ec..6c69541 100644
--- a/src/app/pages/slider/slider.page.html
+++ b/src/app/pages/slider/slider.page.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts
index 940be6f..56d179c 100644
--- a/src/app/store/session-data-provider.service.ts
+++ b/src/app/store/session-data-provider.service.ts
@@ -80,6 +80,7 @@ export class SessionDataProviderService {
tracking:number = 0;
session_image_server: string='';
family_uid:string='';
+ family_types:any=[];
session_contructed:boolean = false;
@@ -144,6 +145,8 @@ export class SessionDataProviderService {
this.tracking = loginResult.tracking;
this.session_image_server = loginResult.session_image_server;
this.refresh = loginResult.refresh;
+ this.family_types= loginResult.family_types;
+
//this.pushNotificationProvider.tagUser(this.session);
this.session_contructed = true;
diff --git a/src/global.scss b/src/global.scss
index 0aea416..3fee822 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -49,6 +49,10 @@
font-family: 'regular';
}
+.no-scroll .scroll-content{
+ overflow: hidden;
+}
+
ion-label {
display: block;
}
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
-
+
+ {{item.ty}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Invite a Family
+
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 61ad437..6a29b7a 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -101,7 +101,7 @@ ion-content {
text-align: center;
margin-top: 16px;
font-size: 16px;
- color: #c2c2cb;
+ color: #be2e7e;
span {
color: var(--ion-color-primary);
diff --git a/src/app/pages/logout/logout.page.html b/src/app/pages/logout/logout.page.html
index e442f7f..00f147d 100644
--- a/src/app/pages/logout/logout.page.html
+++ b/src/app/pages/logout/logout.page.html
@@ -1,4 +1,4 @@
-