WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fix cards

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-02-09 07:32:56 -05:00
parent 02d853e9c1
commit e5b3b26948
7 changed files with 168 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/familycards/familiy-notask/familiy-notask.component.html
+15 -23
View File
@@ -1,31 +1,23 @@
<!--<ion-card (click)="cardAction()">-->
<!-- &lt;!&ndash; <img alt="Silhouette of mountains" src="https://ionicframework.com/docs/img/demos/card-media.png" />&ndash;&gt;-->
<!-- <ion-card-header>-->
<!-- <ion-card-title><span style="font-weight: bolder; color: #1880b0;">No Tasks</span></ion-card-title>-->
<!-- <ion-card-subtitle><hr class="kid-line" /></ion-card-subtitle>-->
<!-- </ion-card-header>-->
<!-- <ion-card-content class="f-item">-->
<!-- <ion-item lines="none" style="background-color: lightyellow; font-weight: bold;">-->
<!-- .-->
<!-- <ion-icon name="arrow-forward-circle-outline" slot="end"></ion-icon>-->
<!-- </ion-item>-->
<!-- </ion-card-content>-->
<!-- &lt;!&ndash; <ion-button fill="clear">Action 1</ion-button>&ndash;&gt;-->
<!--</ion-card>-->
<ion-grid class="task-rover" (click)="cardAction()">
<ion-row>
<ion-col></ion-col>
<ion-col></ion-col>
<ion-col style="padding-top: 150px;">
<ion-col style="padding-top: 150px">
<ion-button (click)="cardAction()">Assign Task</ion-button>
</ion-col>
</ion-row>
</ion-grid>
<!--<ion-card (click)="cardAction()">-->
<!-- <img alt="Assign Task" src="https://www.wrenchboard.com/assets/images/apps/family-assign-task.jpg" />-->
<!-- <div>-->
<!-- <div>Assign Task</div>-->
<!-- </div>-->
<!--</ion-card>-->
<ion-grid class="extra-grid">
<ion-row>
<ion-col class="ext-col">
<div class="ext-in">
AAAA
</div>
</ion-col>
<ion-col class="ext-col">
<div class="ext-in">
BBB
</div>
</ion-col>
</ion-row>
</ion-grid>
src/app/components/familycards/familiy-notask/familiy-notask.component.scss
+28 -10
View File
@@ -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%;
}
}
}
src/app/components/familycards/familiy-notask/familiy-notask.component.ts
+6 -8
View File
@@ -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"));
}
}
src/app/components/familycards/fastreward/fastreward.component.html
+39 -15
View File
@@ -1,16 +1,40 @@
<ion-card (click)="familyAcc()">
<img alt="Silhouette of mountains" src="https://www.wrenchboard.com/assets/images/apps/family-send-reward.jpg" />
<ion-card-header>
<ion-card-title>Send a Reward</ion-card-title>
<!-- <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
</ion-card-header>
<ion-card-content>
Rewards for chores, goals met, or simply allowance.
<div
style="font-weight: bold; background-color: #4e0650; color:white; text-align: right;">
<ion-icon name="arrow-forward-circle-outline" size="medium" slot="end"></ion-icon>
</div>
</ion-card-content>
</ion-card>
<img
alt="Send a Reward"
src="https://www.wrenchboard.com/assets/images/apps/family-send-reward.jpg"
/>
<ion-card-header>
<ion-card-title>Send Reward</ion-card-title>
</ion-card-header>
<ion-card-content>
Rewards for chores, goals met, or simply allowance.
<div
style="
font-weight: bold;
background-color: #4e0650;
color: white;
text-align: right;
"
>
<ion-icon
name="arrow-forward-circle-outline"
size="medium"
slot="end"
></ion-icon>
</div>
</ion-card-content>
</ion-card>
<ion-grid class="extra-grid">
<ion-row>
<ion-col class="ext-col">
<div class="ext-in">
<div class="ban-text">Add Kids</div>
</div>
</ion-col>
<ion-col class="ext-col">
<div class="ext-in">
<div class="ban-text">Wallet</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
src/app/components/familycards/fastreward/fastreward.component.scss
+26 -1
View File
@@ -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;
}
}
}
}
src/app/components/familycards/fastreward/fastreward.component.ts
+51 -43
View File
@@ -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) {}
}
src/app/pages/login/login.page.ts
+3 -1
View File
@@ -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");
}