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 85f9944..de2c222 100644
--- a/src/app/components/familycards/familiy-notask/familiy-notask.component.html
+++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.html
@@ -1,31 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Assign Task
-
-
-
-
-
-
-
-
+
\ 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 ab55dce..6f6fc3c 100644
--- a/src/app/components/familycards/familiy-notask/familiy-notask.component.scss
+++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.scss
@@ -2,33 +2,51 @@ ion-card {
margin: 20px 0px 0px 0px;
background-color: #186875;
color: white;
- ion-card-title{
+ ion-card-title {
color: white;
}
}
-.task-rover{
+.extra-grid{
+ margin: 10px 0px 10px 0px;
+ padding: 0px;
+ height: 150px;
+ .ext-col{
+ padding: 5px;
+ //background-color: #2dd36f;
+ height: 150px;
+ .ext-in{
+ background-color: antiquewhite;
+ height: 140px;
+ border-radius: 10px;
+ text-align: center;
+ font-size: 24px;
+ }
+ }
+}
+.task-rover {
background-image: url("https://www.wrenchboard.com/assets/images/apps/family-assign-task.jpg");
background-size: contain;
background-repeat: no-repeat;
//background-color: #186875;
min-height: 350px;
border-radius: 20px;
- color:white;
+ color: white;
}
-ion-card44{
- margin:20px 0px 0px 0px;
+ion-card44 {
+ margin: 20px 0px 0px 0px;
height: 150px;
padding: 0px;
--background: #f3f9fd;
- ion-card-header{
+ ion-card-header {
--margin-bottom: 0px;
margin-bottom: 0px;
}
- ion-card-content{
+ ion-card-content {
--margin-top: 0px;
--margin-bottom: 0px;
- f-item, ion-item{
+ f-item,
+ ion-item {
//--background-color: #3dc2ff;
font-size: 14px;
}
@@ -36,8 +54,8 @@ ion-card44{
// font-weight: bolder;
// background-image: linear-gradient(to top, #3dc2ff, #ffffff);
}
- .left-col{
+ .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 15a730d..912fb81 100644
--- a/src/app/components/familycards/familiy-notask/familiy-notask.component.ts
+++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.ts
@@ -1,19 +1,17 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
@Component({
- selector: 'app-familiy-notask',
- templateUrl: './familiy-notask.component.html',
- styleUrls: ['./familiy-notask.component.scss'],
+ selector: "app-familiy-notask",
+ templateUrl: "./familiy-notask.component.html",
+ styleUrls: ["./familiy-notask.component.scss"],
})
export class FamiliyNotaskComponent implements OnInit {
-
- constructor() { }
+ constructor() {}
ngOnInit() {}
- cardAction(){
+ cardAction() {
//alert('card-action');
dispatchEvent(new Event("app_familiy_notask_action"));
}
-
}
diff --git a/src/app/components/familycards/fastreward/fastreward.component.html b/src/app/components/familycards/fastreward/fastreward.component.html
index 3719402..702a2e4 100644
--- a/src/app/components/familycards/fastreward/fastreward.component.html
+++ b/src/app/components/familycards/fastreward/fastreward.component.html
@@ -1,16 +1,40 @@
- 
-
- Send a Reward
-
-
-
-
- Rewards for chores, goals met, or simply allowance.
-
-
-
-
-
-
\ No newline at end of file
+
+
+ Send Reward
+
+
+ Rewards for chores, goals met, or simply allowance.
+
+
+
+
+
+
\ 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 af78128..4f8bf9e 100644
--- a/src/app/components/familycards/fastreward/fastreward.component.scss
+++ b/src/app/components/familycards/fastreward/fastreward.component.scss
@@ -2,7 +2,32 @@ ion-card {
margin: 20px 0px 0px 0px;
background-color: #4e0650;
color: white;
- ion-card-title{
+ ion-card-title {
color: white;
}
+}
+.extra-grid{
+ margin: 10px 0px 10px 0px;
+ padding: 0px;
+ height: 150px;
+ .ext-col{
+ padding: 5px;
+
+ //background-color: #2dd36f;
+ height: 150px;
+ .ext-in{
+ background-color: antiquewhite;
+ height: 140px;
+ border-radius: 10px;
+ box-shadow: 2px 2px;
+ text-align: center;
+ .ban-text{
+ font-size: 24px;
+ font-weight: bolder;
+ color: #8b198e;
+ padding-top: 80px;
+ }
+
+ }
+ }
}
\ No newline at end of file
diff --git a/src/app/components/familycards/fastreward/fastreward.component.ts b/src/app/components/familycards/fastreward/fastreward.component.ts
index 38a5750..c95d43b 100644
--- a/src/app/components/familycards/fastreward/fastreward.component.ts
+++ b/src/app/components/familycards/fastreward/fastreward.component.ts
@@ -1,58 +1,66 @@
-import { Component, OnInit } from '@angular/core';
-import {NavController} from "@ionic/angular";
-import {Router} from "@angular/router";
-import {SessionDataProviderService} from "../../../store/session-data-provider.service";
-import {WrenchService} from "../../../services/wrench.service";
+import { Component, OnInit } from "@angular/core";
+import { NavController } from "@ionic/angular";
+import { Router } from "@angular/router";
+import { SessionDataProviderService } from "../../../store/session-data-provider.service";
+import { WrenchService } from "../../../services/wrench.service";
@Component({
- selector: 'app-fastreward',
- templateUrl: './fastreward.component.html',
- styleUrls: ['./fastreward.component.scss'],
+ selector: "app-fastreward",
+ templateUrl: "./fastreward.component.html",
+ styleUrls: ["./fastreward.component.scss"],
})
export class FastrewardComponent implements OnInit {
- total_family:number = 0;
- family_active:number = 0;
- session_image_server:string='';
- curr_session:string='';
- constructor(private navctr: NavController,
- private router: Router,
- public sessionDataProviderService: SessionDataProviderService,
- private wrenchService: WrenchService) { }
+ total_family: number = 0;
+ family_active: number = 0;
+ session_image_server: string = "";
+ curr_session: string = "";
+ constructor(
+ private navctr: NavController,
+ private router: Router,
+ public sessionDataProviderService: SessionDataProviderService,
+ private wrenchService: WrenchService
+ ) {}
ngOnInit() {
- this.getFamilyData();
+ this.getFamilyData();
+ }
+ familyAcc() {
+ dispatchEvent(new Event("app_fastreward_action"));
}
- familyAcc(){
- dispatchEvent(new Event("app_fastreward_action"));
- }
usrData: {
- action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
+ action: number;
+ member_id: number;
+ uid: string;
+ sessionid: string;
+ limit: 20;
+ page: 1;
+ offset: 0;
};
- familyTotalData:any;
+ familyTotalData: any;
familyData: [];
- getFamilyData(){
- this.usrData = {action:22010,
+ getFamilyData() {
+ this.usrData = {
+ action: 22010,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
- sessionid: this.sessionDataProviderService.session ,
- limit:20, page:1,offset: 0};
- this.curr_session = this.sessionDataProviderService.session;
-
- this.wrenchService.getFamilyList(this.usrData).subscribe(
- familyTotalData => {
- this.familyTotalData = familyTotalData;
- console.log("FAMILY RETURN->", this.familyTotalData);
- this.familyData = this.familyTotalData.result_list; //.slice(0,3);
- // debugger;
- this.session_image_server = this.familyTotalData.session_image_server;
- console.log("FAMILY RETURN DATA->", this.familyData);
- this.total_family = this.familyData?.length;
- }
- );
+ sessionid: this.sessionDataProviderService.session,
+ limit: 20,
+ page: 1,
+ offset: 0,
+ };
+ this.curr_session = this.sessionDataProviderService.session;
+ this.wrenchService
+ .getFamilyList(this.usrData)
+ .subscribe((familyTotalData) => {
+ this.familyTotalData = familyTotalData;
+ console.log("FAMILY RETURN->", this.familyTotalData);
+ this.familyData = this.familyTotalData.result_list; //.slice(0,3);
+ // debugger;
+ this.session_image_server = this.familyTotalData.session_image_server;
+ console.log("FAMILY RETURN DATA->", this.familyData);
+ this.total_family = this.familyData?.length;
+ });
}
- familyMemebr(item){
-
- }
-
+ familyMemebr(item) {}
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 7d914c9..99d17c3 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -127,8 +127,9 @@ getBlogData(){
async startLogin() {
const loading = await this.loadingCtrl.create({
message: 'Starting ... ',
- duration: 1500,
+ duration: 3500,
});
+ this.isDisabled=true;
if (this.username == null || this.username == '' || this.validateEmail(this.username) == false || this.password == null || this.password == '') {
this.showAlert('Invalid Login', 'Enter username(email) and password to login');
@@ -167,6 +168,7 @@ getBlogData(){
}
else{
this.showAlert("Error","Invalid username/password");
+ this.isDisabled=false;
}
// this.showAlert("Error","Invalid username/password");
}