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

family side

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-12-18 18:23:35 -05:00
parent 7c84fa594d
commit 2399513ab2
7 changed files with 136 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/suggestedlist/suggestedlist.component.html
+12 -14
View File
@@ -1,6 +1,5 @@
<div *ngIf = "suggested_count == 0; else elseFulltag">
<ion-grid class="fam1">
<ion-row>
<ion-col class="famleft"></ion-col>
@@ -20,21 +19,20 @@
</div>
<div class="lesson">
<div class="video" *ngFor="let item of familySuggestData" (click)="getSuggestedDetails(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/'+item.banner+''"></div>
<div class="video" *ngFor="let item of familySuggestData" (click)="getSuggestedDetails(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/'+item.banner+''"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
<ion-label *ngIf="item.remind !='' " class="remind_text"> Last Remind : {{ item.remind | date }}</ion-label>
</div>
</div>
<div class="right">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
</div>
</div>
<div class="right">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
</div>
</div>
</ng-template>
src/app/components/suggestedlist/suggestedlist.component.scss
+7 -3
View File
@@ -1,4 +1,3 @@
ion-content {
.back_image {
width: 100%;
@@ -10,8 +9,6 @@ ion-content {
}
}
.flex {
display: flex;
justify-content: space-between;
@@ -121,6 +118,7 @@ ion-content {
}
.lesson {
margin-top: 20px;
.bold {
@@ -357,6 +355,12 @@ ion-content {
}
}
.remind_text{
color: #2dd36f;
font-size: 10px;
}
.fam1{
margin:10px 0px 10px 0px;
background-color: aliceblue;
src/app/components/suggestedlist/suggestedlist.component.ts
+2 -2
View File
@@ -41,10 +41,10 @@ export class SuggestedlistComponent implements OnInit {
suggested_count:number = 0;
getFamilySuggestList(){
this.familySuggestData = this.familyDataService.familySuggestData;
this.suggested_count = this.familySuggestData?.length;
this.suggested_count = this.familySuggestData?.length;
setTimeout(()=>{
this.familySuggestData = this.familyDataService.familySuggestData; // just read no server reqyuest
this.suggested_count = this.familySuggestData?.length;
this.suggested_count = this.familySuggestData?.length;
}, 5000);
// this.usrData = {
src/app/pages/familylogin/familylogin.page.ts
+12 -5
View File
@@ -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 {NavController} from "@ionic/angular";
import {LoadingController, NavController} from "@ionic/angular";
import { AlertController } from '@ionic/angular';
//import { BarcodeScanner } from '@capacitor-community/barcode-scanner';
import { Preferences } from '@capacitor/preferences';
@@ -41,7 +41,8 @@ export class FamilyloginPage implements OnInit {
public bannersDataService:BannersDataService,
public userWalletService: UserWalletService,
public intervalRefreshService: IntervalRefreshService,
public familyDataService:FamilyDataService
public familyDataService:FamilyDataService,
private loadingCtrl: LoadingController,
) {
}
@@ -58,16 +59,22 @@ export class FamilyloginPage implements OnInit {
loginData: {
username: string, pin: string, sessionid: string, action: '11025',login_mode: '1105'
};
startLogin() {
async startLogin() {
const loading = await this.loadingCtrl.create({
message: 'Please wait ... ',
duration: 5500,
});
// this.username='Y7P0WW9B05';
// this.pin='1234';
if (this.username == null || this.username == '' || this.pin == null || this.pin == '') {
this.showAlert('Invalid Login', 'Enter username(email) and pin to login');
return;
}
};
loading.present();
this.loginData = { username: this.username, pin: this.pin, sessionid: 'DUMMY-APP-SESSION-STARTER', action: '11025',login_mode: '1105' }
this.wrenchService.loginUser(this.loginData).subscribe(
loginResult => {
loading.dismiss();
this.loginResult = loginResult;
console.log("INTERNAL RETURN->" + this.loginResult.internal_return);
if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
@@ -81,7 +88,7 @@ export class FamilyloginPage implements OnInit {
};
setName();
this.startUpCalls();
this.startUpCalls();
this.router.navigate(['tabs/tab1']);
}
else{
src/app/pages/home/home.page.html
+101 -123
View File
@@ -9,9 +9,10 @@
<ion-label class="bold_text">{{firstname}}</ion-label>
</div>
</div>
<!-- <div class="right">-->
<!-- <ion-icon name="notifications-outline" (click)="onNotification()"></ion-icon>-->
<!-- </div>-->
<div class="right">
<ion-icon name="notifications-outline" (click)="onNotification()"></ion-icon>
<!-- <ion-icon name="help-circle-outline" size="medium" (click)="onHelp()"></ion-icon>-->
</div>
</div>
</ion-toolbar>
</div>
@@ -27,139 +28,116 @@
</div>
</div>
<div class="right">
<!-- <ion-icon name="notifications-outline" (click)="onNotification()"></ion-icon>-->
<ion-icon name="notifications-outline" (click)="onNotification()"></ion-icon>
<ion-icon name="help-circle-outline" size="medium" (click)="onHelp()"></ion-icon>
</div>
</div>
</ion-toolbar>
</div>
</ion-header>
<ion-content class="ion-padding">
<div class="boxed_contents">
<!-- <div class="search_box" (click)="onSearch()">
<ion-icon slot="start" name="search"></ion-icon>
<ion-label>Search</ion-label>
</div> -->
<div class="boxed_contents">
<div *ngIf = "accountType == 'FAMILY'; else elseFulltag">
<!-- <div class="lesson">-->
<app-familypending></app-familypending>
<app-suggestedlist></app-suggestedlist>
<ion-grid class="fam1">
<ion-row class="pend-row" >
<ion-col class="famleft"
[style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/ai-playground.jpg)'"
[style.background-size]="contain"
></ion-col>
<ion-col class="mid_place">
<ion-label class="sug_text">Playground</ion-label>
<ion-button shape="round" (click)="goPlayground()" fill="outline">Get Started</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</div>
<ng-template #elseFulltag>
<ion-toolbar class="top-tool" *ngIf="walletDescription !='' || active_job_count != 0">
<ion-buttons slot="secondary" *ngIf="walletDescription !='' ">
<ion-button shape="round" fill="solid" color="primary" (click)="myWallet()">
<ion-icon slot="end" name="wallet"></ion-icon>
{{walletDescription}}
</ion-button>
</ion-buttons>
<ion-buttons slot="primary" *ngIf="active_job_count != 0">
<ion-button shape="round" fill="solid" color="primary" (click)="myJobs(1)">
My Jobs
<ion-icon slot="end" name="list"></ion-icon>
</ion-button>
</ion-buttons>
<!-- <ion-title>{{walletDescription}}</ion-title>-->
</ion-toolbar>
<app-latest-market></app-latest-market>
<app-fastreward></app-fastreward>
<ion-card class="map-sec" *ngIf="enableTracking > 0">
<app-tracking></app-tracking>
<ion-card-content>
<ion-list>
<ion-item lines="none">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<!-- <ion-icon aria-hidden="true" name="airplane" ></ion-icon>-->
<ion-label>Family Location</ion-label>
</ion-item>
</ion-list>
</ion-card-content>
</ion-card>
<div *ngIf = "homebannerCount <3;">
<div class="offer">
<div class="bg_image back_image" [style.backgroundImage]="'url('+offerBanner+')'"></div>
<div *ngIf = "accountType == 'FAMILY'; else elseFulltag">
<app-familypending></app-familypending>
<app-suggestedlist></app-suggestedlist>
<ion-grid class="fam1">
<ion-row class="pend-row" >
<ion-col class="famleft"
[style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/ai-playground.jpg)'"
[style.background-size]="contain"
></ion-col>
<ion-col class="mid_place">
<ion-label class="sug_text">Playground</ion-label>
<ion-button shape="round" (click)="goPlayground()" fill="outline">Get Started</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>
<div *ngFor="let item of bannerData; let i = index" class="bg_white {{item.short_style}} {{item.card_type}} " (click)="onDetails(item)">
<div class="list">
<div *ngIf="item.banner_location === 'URL' ">
<!-- code to render a large video block-->
<div class="bg_image back_image banner_image" [style.backgroundImage]="'url('+item.banner+')'"></div>
</div>
<div *ngIf="item.banner_location === 'LOCAL' ">
<div class="bg_image back_image banner_image" [style.backgroundImage]="'url(assets/images/'+item.banner+')'"></div>
</div>
<div class="detail">
<ion-label class="name">{{item.short_title}}</ion-label>
<ion-label class="bg_text ovf">{{item.short_description}}</ion-label>
<!-- <ion-label class="price">$48.00 </ion-label>-->
<!-- <div class="row">-->
<!-- &lt;!&ndash; <ion-icon name="star-half-outline" color="warning"></ion-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">4.9</ion-label>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">|</ion-label>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">8266 Students</ion-label>&ndash;&gt;-->
<!-- </div>-->
</div>
</div>
<!-- <ion-icon slot="end" name="bookmark-outline" class="save" color="primary"></ion-icon>-->
</div>
<div class="flex">
<ion-label class="bold_text">Recent Blog</ion-label>
<ion-label class="color_text" (click)="allBlog()">See all</ion-label>
</div>
<ion-grid>
<ion-row class="bg_white bg_alice" *ngFor="let item of blogData; let i = index" (click)="blogDetails(item)">
<ion-col>
<div class="detail">
<ion-label class="name">{{item.post_title}}</ion-label>
<ion-label class="extra_text"><span class="title">Published:</span>{{item.post_date | date}}</ion-label>
<ng-template #elseFulltag>
<ion-toolbar class="top-tool" *ngIf="walletDescription !='' || active_job_count != 0">
<ion-buttons slot="secondary" *ngIf="walletDescription !='' ">
<ion-button shape="round" fill="solid" color="primary" (click)="myWallet()">
<ion-icon slot="end" name="wallet"></ion-icon>
{{walletDescription}}
</ion-button>
</ion-buttons>
<ion-buttons slot="primary" *ngIf="active_job_count != 0">
<ion-button shape="round" fill="solid" color="primary" (click)="myJobs(1)">
My Jobs
<ion-icon slot="end" name="list"></ion-icon>
</ion-button>
</ion-buttons>
<!-- <ion-title>{{walletDescription}}</ion-title>-->
</ion-toolbar>
<app-latest-market></app-latest-market>
<app-fastreward></app-fastreward>
<ion-card class="map-sec" *ngIf="enableTracking > 0">
<app-tracking></app-tracking>
<ion-card-content>
<ion-list>
<ion-item lines="none">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<!-- <ion-icon aria-hidden="true" name="airplane" ></ion-icon>-->
<ion-label>Family Location</ion-label>
</ion-item>
</ion-list>
</ion-card-content>
</ion-card>
<div *ngIf = "homebannerCount <3;">
<div class="offer">
<div class="bg_image back_image" [style.backgroundImage]="'url('+offerBanner+')'"></div>
</div>
</ion-col>
<ion-col size="auto">
<div style="width: 95px; height: 95px; border-radius: 10px" class="bg_image back_image banner_image" [style.backgroundImage]="'url(https://blog.wrenchboard.com/wp-content/uploads/'+item.meta_value+')'">
</div>
<div *ngFor="let item of bannerData; let i = index" class="bg_white {{item.short_style}} {{item.card_type}} " (click)="onDetails(item)">
<div class="list">
<div *ngIf="item.banner_location === 'URL' ">
<!-- code to render a large video block-->
<div class="bg_image back_image banner_image" [style.backgroundImage]="'url('+item.banner+')'"></div>
</div>
<div *ngIf="item.banner_location === 'LOCAL' ">
<div class="bg_image back_image banner_image" [style.backgroundImage]="'url(assets/images/'+item.banner+')'"></div>
</div>
<div class="detail">
<ion-label class="name">{{item.short_title}}</ion-label>
<ion-label class="bg_text ovf">{{item.short_description}}</ion-label>
<!-- <ion-label class="price">$48.00 </ion-label>-->
<!-- <div class="row">-->
<!-- &lt;!&ndash; <ion-icon name="star-half-outline" color="warning"></ion-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">4.9</ion-label>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">|</ion-label>&ndash;&gt;-->
<!-- &lt;!&ndash; <ion-label class="small">8266 Students</ion-label>&ndash;&gt;-->
<!-- </div>-->
</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
<!-- <ion-icon slot="end" name="bookmark-outline" class="save" color="primary"></ion-icon>-->
</div>
<div class="flex">
<ion-label class="bold_text">Recent Blog</ion-label>
<ion-label class="color_text" (click)="allBlog()">See all</ion-label>
</div>
<ion-grid>
<ion-row class="bg_white bg_alice" *ngFor="let item of blogData; let i = index" (click)="blogDetails(item)">
<ion-col>
<div class="detail">
<ion-label class="name">{{item.post_title}}</ion-label>
<ion-label class="extra_text"><span class="title">Published:</span>{{item.post_date | date}}</ion-label>
</div>
</ion-col>
<ion-col size="auto">
<div style="width: 95px; height: 95px; border-radius: 10px" class="bg_image back_image banner_image" [style.backgroundImage]="'url(https://blog.wrenchboard.com/wp-content/uploads/'+item.meta_value+')'">
</div>
</ion-col>
</ion-row>
</ion-grid>
</ng-template>
</ng-template>
</div>
<div *ngIf="active_job_count != 0">
</div>
</div>
</ion-content>
src/app/pages/suggest/suggest.page.html
+1 -1
View File
@@ -90,7 +90,7 @@
[autoGrow]="true"
[ngModel]="description"
(ionChange)="inVerify()"
style="background-color: aliceblue; min-height: 100px; border-radius: 10px;"
style="background-color: aliceblue; min-height: 100px; border-radius: 10px; padding: 5px;"
>
</ion-textarea>
src/app/pages/suggestdetails/suggestdetails.page.html
+1 -1
View File
@@ -64,7 +64,7 @@
expand="block"
shape="round"
[disabled]="cancelDisabled"
size="small" (click)="cancelSuggest()">Cancel Request</ion-button>
size="small" (click)="cancelSuggest()">Delete</ion-button>
</ion-col>
<ion-col class="mtop">