diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index 47d4094..d359be5 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -1,4 +1,4 @@ -import { NavController } from '@ionic/angular'; +import {LoadingController, NavController} from '@ionic/angular'; import {Component, OnInit, ViewChild} from '@angular/core'; import { SessionDataProviderService } from 'src/app/store/session-data-provider.service'; import { WrenchService } from 'src/app/services/wrench.service'; @@ -20,6 +20,7 @@ export class EditProfilePage implements OnInit { constructor( private navctr: NavController, public sessionDataProviderService:SessionDataProviderService, + private loadingCtrl: LoadingController, private wrenchService: WrenchService, ) { // this.firstname = this.sessionDataProviderService.firstname; @@ -104,6 +105,19 @@ export class EditProfilePage implements OnInit { } + uploadData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + msg_type:'FILE', + file_name: string, + file_size: number, + file_type: string, + file_data: string + }; + + uploadResult:any; async startCamera(){ const image = await Camera.getPhoto({ quality: 90, @@ -113,9 +127,35 @@ export class EditProfilePage implements OnInit { }); if (image) { + const loading = await this.loadingCtrl.create({ + message: 'Uploading Profile', + duration: 5000, + }); // this.saveImage(image) - console.log(image); - } + //debugger; + //image.base64String + this.uploadData={ + action:11300, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + msg_type:'FILE', + file_name: `family-banner.${image.format}`, + file_size: image.base64String.toString().length, + file_type: `image/${image.format}`, + file_data: image.base64String + }; + //console.log(image); + loading.present(); + this.wrenchService.uploadFile(this.uploadData).subscribe( + uploadResult => { + this.uploadResult = uploadResult; + console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); + } + ); + console.log( this.uploadData); + } } + } diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html index dfc1e48..ea16755 100644 --- a/src/app/pages/familysettings/familysettings.page.html +++ b/src/app/pages/familysettings/familysettings.page.html @@ -39,9 +39,8 @@ Family - - Change - + + Change Banner diff --git a/src/app/pages/familysettings/familysettings.page.ts b/src/app/pages/familysettings/familysettings.page.ts index 1e40ce7..623a38a 100644 --- a/src/app/pages/familysettings/familysettings.page.ts +++ b/src/app/pages/familysettings/familysettings.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; @@ -16,7 +16,8 @@ export class FamilysettingsPage implements OnInit { private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService + private wrenchService: WrenchService, + private loadingCtrl: LoadingController ) { @@ -30,6 +31,19 @@ export class FamilysettingsPage implements OnInit { this.curr_session = this.sessionDataProviderService.session; this.session_image_server = this.sessionDataProviderService.session_image_server; } + uploadData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + msg_type:'FILE', + file_name: string, + file_size: number, + file_type: string, + file_data: string + }; + + uploadResult:any; async startCamera(){ const image = await Camera.getPhoto({ quality: 90, @@ -39,11 +53,37 @@ export class FamilysettingsPage implements OnInit { }); if (image) { - // this.saveImage(image) - console.log(image); - } + const loading = await this.loadingCtrl.create({ + message: 'Uploading Banner', + duration: 5000, + }); + // this.saveImage(image) + //debugger; + //image.base64String + this.uploadData={ + action:11304, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + msg_type:'FILE', + file_name: `family-banner.${image.format}`, + file_size: image.base64String.toString().length, + file_type: `image/${image.format}`, + file_data: image.base64String + }; + //console.log(image); + loading.present(); + this.wrenchService.uploadFile(this.uploadData).subscribe( + uploadResult => { + this.uploadResult = uploadResult; + console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); + } + ); + console.log( this.uploadData); + } } + onBack() { this.navctr.back(); } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index eb16975..1a60375 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -282,6 +282,9 @@ export class WrenchService { return this.getPostData("/familymanage", postData); } + uploadFile(uploadData){ + return this.getPostData("/uploads", uploadData); + } /*