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

Fix images

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-11-06 19:33:53 -05:00
parent c59fee5b49
commit e4473eb956
27 changed files with 137 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
REMEMBER.txt
+2
View File
@@ -20,6 +20,8 @@ ionic generate page jobactive
ionic generate component taskactivities
ionic generate component suggestedlist
ionic generate component fastreward
ionic generate component familypending
ionic generate page logout
src/app/components/fastreward/fastreward.component.html
+19
View File
@@ -0,0 +1,19 @@
<ion-card>
<ion-card-header>
Send Reward
</ion-card-header>
<ion-card-content>
<ion-grid style="height: 100%; padding: 0px">
<ion-row style="padding: 0px; margin: 0px">
<ion-col class="left-col" size="4">
1
</ion-col>
<ion-col>
2
</ion-col>
</ion-row>
</ion-grid>
</ion-card-content>
</ion-card>
src/app/components/fastreward/fastreward.component.scss
+10
View File
@@ -0,0 +1,10 @@
ion-card{
margin:20px 0px 0px 0px;
height: 250px;
padding: 0px;
--background: red;
.left-col{
background-color: yellow;
height: 100%;
}
}
src/app/components/fastreward/fastreward.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { FastrewardComponent } from './fastreward.component';
describe('FastrewardComponent', () => {
let component: FastrewardComponent;
let fixture: ComponentFixture<FastrewardComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ FastrewardComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(FastrewardComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/components/fastreward/fastreward.component.ts
+14
View File
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-fastreward',
templateUrl: './fastreward.component.html',
styleUrls: ['./fastreward.component.scss'],
})
export class FastrewardComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
src/app/components/waitinterest/waitinterest.component.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="video" *ngFor="let item of interestJobsData" (click)="jobInterest(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
src/app/components/waitinterest/waitinterest.component.scss
+3 -2
View File
@@ -35,9 +35,10 @@
}
.men_image {
height: 40px;
width: 40px;
height: 50px;
width: 50px;
border-radius: 100%;
min-width: 50px;
}
.text {
src/app/components/waitinterest/waitinterest.component.ts
+6 -1
View File
@@ -9,7 +9,10 @@ import {WrenchService} from "../../services/wrench.service";
})
export class WaitinterestComponent implements OnInit {
//@Input('interestJobsData') interestJobsData:any;
constructor( public sessionDataProviderService: SessionDataProviderService,
session_image_server:string='';
curr_session:string='';
constructor( public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService) { }
ngOnInit() {
@@ -24,6 +27,7 @@ export class WaitinterestComponent implements OnInit {
total_jobs: number = 0;
getInterestList() {
this.curr_session = this.sessionDataProviderService.session;
this.usrData = {
action: 13005,
member_id: this.sessionDataProviderService.member_id,
@@ -37,6 +41,7 @@ export class WaitinterestComponent implements OnInit {
this.interestTotalData = interestTotalData;
console.log("interestTotalData RETURN->", this.interestTotalData);
this.interestJobsData = this.interestTotalData.result_list;
this.session_image_server = this.interestTotalData.session_image_server;
this.total_jobs = this.interestJobsData.length;
console.log("jobManagerJobsData RETURN DATA->", this.interestJobsData);
}
src/app/pages/edit-profile/edit-profile.page.html
+1 -1
View File
@@ -13,7 +13,7 @@
<ion-content class="ion-padding">
<div class="boxed_contents">
<div class="profile">
<div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/profile.jpg)'">
<div class="bg_image back_image" [style.backgroundImage]="'url('+profilePicture+')'">
<!-- <div class="icon">-->
<!-- <ion-icon name="pencil"></ion-icon>-->
<!-- </div>-->
src/app/pages/edit-profile/edit-profile.page.ts
+2
View File
@@ -31,12 +31,14 @@ export class EditProfilePage implements OnInit {
lastname:string='';
email:string='';
online_name:string='';
profilePicture:string='';
ngOnInit() {
this.firstname = this.sessionDataProviderService.firstname;
this.lastname = this.sessionDataProviderService.lastname;
this.email = this.sessionDataProviderService.email;
this.online_name = this.sessionDataProviderService.online_name;
this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
}
onBack() {
src/app/pages/home/home.module.ts
+2 -2
View File
@@ -10,7 +10,7 @@ import { HomePage } from './home.page';
import { SuggestedlistComponent } from "../../components/suggestedlist/suggestedlist.component";
import {FamilypendingComponent} from "../../components/familypending/familypending.component";
import { TrackingComponent } from "../../components/tracking/tracking.component";
import { FastrewardComponent } from "../../components/fastreward/fastreward.component";
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
// @NgModule({
@@ -24,7 +24,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
IonicModule,
HomePageRoutingModule
],
declarations: [HomePage,SuggestedlistComponent,FamilypendingComponent,TrackingComponent],
declarations: [HomePage,SuggestedlistComponent,FamilypendingComponent,TrackingComponent,FastrewardComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class HomePageModule { }
src/app/pages/home/home.page.html
+4
View File
@@ -119,6 +119,10 @@
<!-- <ion-title>{{walletDescription}}</ion-title>-->
</ion-toolbar>
<app-fastreward>
</app-fastreward>
<ion-card class="map-sec" *ngIf="enableTracking > 0">
<app-tracking></app-tracking>
<ion-card-content>
src/app/pages/home/home.page.ts
+1 -1
View File
@@ -59,7 +59,7 @@ export class HomePage implements OnInit {
}
//debugger;
this.profilePicture = this.sessionDataProviderService.profilePicture();
this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
this.walletPresentation();
src/app/pages/joblist/joblist.page.html
+1 -1
View File
@@ -51,7 +51,7 @@
<div class="video" *ngFor="let item of jobManagerJobsData">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
src/app/pages/joblist/joblist.page.scss
+4 -2
View File
@@ -95,6 +95,7 @@ ion-content {
height: 50px;
width: 50px;
border-radius: 100%;
min-width: 80px;
}
.bold {
@@ -155,9 +156,10 @@ ion-content {
}
.men_image {
height: 40px;
width: 40px;
height: 50px;
width: 50px;
border-radius: 100%;
min-width: 50px;
}
.text {
src/app/pages/joblist/joblist.page.ts
+8 -2
View File
@@ -12,13 +12,17 @@ import {NavController} from "@ionic/angular";
export class JoblistPage implements OnInit {
tabs = 'about';
session_image_server:string='';
curr_session:string="";
constructor(
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) { }
) {
}
ngOnInit() {
this.getJobManagerList();
@@ -43,6 +47,7 @@ export class JoblistPage implements OnInit {
total_jobs:number=0;
getJobManagerList(){
this.curr_session = this.sessionDataProviderService.session;
this.usrData = {action:13005,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
@@ -55,6 +60,7 @@ export class JoblistPage implements OnInit {
console.log("jobManagerJobsTotalData RETURN->", this.jobManagerJobsTotalData);
this.jobManagerJobsData = this.jobManagerJobsTotalData.result_list;
// debugger;
this.session_image_server = this.jobManagerJobsTotalData.session_image_server;
this.total_jobs=this.jobManagerJobsData.length;
console.log("jobManagerJobsData RETURN DATA->", this.jobManagerJobsData);
}
src/app/pages/jobmanager/jobmanager.page.html
+3 -3
View File
@@ -72,7 +72,7 @@
<div class="video" *ngFor="let item of jobManagerActiveData" (click)="jobActive(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/default.jpg)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
@@ -94,7 +94,7 @@
<div class="video" *ngFor="let item of jobManagerReviewData" (click)="jobReview(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/default.jpg)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
@@ -114,7 +114,7 @@
<div class="video" *ngFor="let item of jobManagerPastDueData" (click)="jobPastDue(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/default.jpg)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.description}}</ion-label>
src/app/pages/jobmanager/jobmanager.page.scss
+3 -2
View File
@@ -163,9 +163,10 @@ ion-content {
}
.men_image {
height: 40px;
width: 40px;
height: 50px;
width: 50px;
border-radius: 100%;
min-width: 50px;
}
.text {
src/app/pages/jobmanager/jobmanager.page.ts
+4 -1
View File
@@ -14,7 +14,8 @@ export class JobmanagerPage implements OnInit {
menuData:any;
tabs = 'active';
session_image_server:string='';
curr_session:string='';
constructor(
private navctr: NavController,
private router: Router,
@@ -34,6 +35,7 @@ menuData:any;
}
ngOnInit() {
this.curr_session = this.sessionDataProviderService.session;
this.getManagerJobsData("ACTIVE");
this.getManagerJobsData("PASTDUE");
this.getManagerJobsData("REVIEW");
@@ -89,6 +91,7 @@ menuData:any;
jobManagerTotalData => {
this.jobManagerActiveTotalData = jobManagerTotalData;
console.log("getManagerJobsData RETURN->", this.jobManagerActiveTotalData);
this.session_image_server = this.jobManagerActiveTotalData.session_image_server;
// debugger;
switch (job_mode){
case "ACTIVE":
src/app/pages/my-course/my-course.page.html
+1 -1
View File
@@ -30,7 +30,7 @@
</div>
<div class="video" *ngFor="let item of jobsData;" (click)="viewMarketItem( item )">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/task-list.svg)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<div class="bold_text" [innerHTML]="item.title"></div>
src/app/pages/my-course/my-course.page.ts
+7
View File
@@ -10,6 +10,8 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv
export class MyCoursePage implements OnInit {
tabs: any = 'on';
session_image_server:string='';
curr_session:string='';
constructor(
private router: Router,
@@ -30,6 +32,7 @@ export class MyCoursePage implements OnInit {
}
usrData: {
action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:1
};
@@ -37,12 +40,16 @@ export class MyCoursePage implements OnInit {
jobsTotalData:any;
jobsData: [];
getJobsData(){
this.curr_session = this.sessionDataProviderService.session;
this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , limit:20, page:1}
this.wrenchService.getJobsData(this.usrData).subscribe(
jobsTotalData => {
this.jobsTotalData = jobsTotalData;
console.log("PAH HX RETURN->", this.jobsTotalData);
this.jobsData = this.jobsTotalData.result_list;
this.session_image_server = this.jobsTotalData.session_image_server;
// debugger;
console.log("JOBS RETURN DATA->", this.jobsData);
// this.blogDataService.setBlogData(this.blogResult.blog_data);
src/app/pages/pendingoffers/pendingoffers.page.html
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="lesson">
<div class="video" *ngFor="let item of jobManagerOffersData">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>
<div class="text">
<ion-label class="bold_text">{{item.title}}</ion-label>
src/app/pages/pendingoffers/pendingoffers.page.scss
+3 -2
View File
@@ -155,9 +155,10 @@ ion-content {
}
.men_image {
height: 40px;
width: 40px;
height: 50px;
width: 50px;
border-radius: 100%;
min-width: 50px;
}
.text {
src/app/pages/pendingoffers/pendingoffers.page.ts
+5 -1
View File
@@ -12,7 +12,8 @@ import {WrenchService} from "../../services/wrench.service";
export class PendingoffersPage implements OnInit {
tabs = 'about';
session_image_server:string='';
curr_session:string="";
constructor(
private navctr: NavController,
private router: Router,
@@ -36,6 +37,7 @@ export class PendingoffersPage implements OnInit {
jobManagerOffersTotalData:any;
jobManagerOffersData: [];
getPendingOffersData(){
this.curr_session = this.sessionDataProviderService.session;
this.usrData = {action:11309,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
@@ -47,6 +49,8 @@ export class PendingoffersPage implements OnInit {
this.jobManagerOffersTotalData = jobManagerOffersTotalData;
console.log("jobManagerOffersTotalData RETURN->", this.jobManagerOffersTotalData);
this.jobManagerOffersData = this.jobManagerOffersTotalData.result_list;
this.session_image_server = this.jobManagerOffersTotalData.session_image_server;
// debugger;
console.log("jobManagerOffersData RETURN DATA->", this.jobManagerOffersTotalData);
}
src/app/pages/profile/profile.page.html
+1 -1
View File
@@ -97,7 +97,7 @@
</div>
<ng-template #elseFulltag>
<div class="profile">
<div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/profile.jpg)'">
<div class="bg_image back_image" [style.backgroundImage]="'url('+profilePicture+')'">
<div class="icon">
<ion-icon name="pencil" (click)="onProfile()"></ion-icon>
</div>
src/app/pages/profile/profile.page.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export class ProfilePage implements OnInit {
this.firstname = this.sessionDataProviderService.firstname;
this.lastname = this.sessionDataProviderService.lastname;
this.email = this.sessionDataProviderService.username;
this.profilePicture = this.sessionDataProviderService.profilePicture();
this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
}
onFamily() {
src/app/store/session-data-provider.service.ts
+6 -1
View File
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { environment } from 'src/environments/environment';
@Injectable({
providedIn: 'root'
@@ -185,7 +186,7 @@ export class SessionDataProviderService {
this.isPedningJob = 0;
this.isOfferJob = 0;
}
profilePicture(){
profilePicture(sessionID, memberUID){
var defualtProfilePicture = "https://www.wrenchboard.com/assets/images/profile.jpg";
var profile_p = '';
if (this.profile_pic_url !=''){
@@ -195,6 +196,10 @@ export class SessionDataProviderService {
else{
profile_p = defualtProfilePicture;
}
profile_p = `${environment.baseUrl}/getmedia/${sessionID}/profile/${memberUID}`;
console.log("profile_p->", profile_p);
//https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/0B6246CE2B89EC948618711E6E6D2DD532797C7F750C69A237FE3F650ECA6B14/profile/3119b744-42ad-4834-bb83-b737588754ca
//https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/81EAF85BBD946518E8CAE81C2CEBCCB8134985203325343F5703E874BED476E2/profile/3119b744-42ad-4834-bb83-b737588754ca
return profile_p;
}
}