peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-11-23 16:24:50 +01:00
parent 1f81744274 19da4730e7
commit 4fe0b5062c
17 changed files with 151 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app-routing.module.ts
+4
View File
@@ -215,6 +215,10 @@ const routes = [
{
path: 'video-allowed',
loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule)
},
{
path: 'preview-photo',
loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule)
},
src/app/modals/preview-camera/preview-camera.page.html
+6 -6
View File
@@ -27,32 +27,32 @@
<ion-footer color="light">
<ion-row>
<ion-col size="3" class="ion-text-center">
<ion-col size="4" class="ion-text-center">
<ion-button (click)="close()" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon src="assets/icon/chat/circle-xmark-solid 1.svg" name="chatbox"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-col size="4" class="ion-text-center">
<ion-button (click)="zoom(false)" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="flower-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-col size="4" class="ion-text-center">
<ion-button (click)="getIconGallery()" fill="clear" color="light">
<ion-icon name="videocam"></ion-icon>
<ion-icon name="videocam" (click)="openChatVideo()"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<!-- <ion-col size="3" class="ion-text-center">
<ion-button (click)="zoom(true)" fill="clear" color="light">
<ion-icon class="redla" name="alert-circle"></ion-icon>
</ion-button>
</ion-col>
</ion-col> -->
</ion-row>
</ion-footer>
</ion-card>
src/app/modals/preview-camera/preview-camera.page.scss
+8 -2
View File
@@ -8,14 +8,20 @@ ion-slides {
.redla{
color: rgb(250, 248, 248);
background-color: rgb(255, 187, 0);
background-color: rgb(255, 238, 0);
border-radius: 120px;
width: 30px;
height: 30px;
}
.blacking{
background-color: rgb(168, 41, 41);
}
.cardconteudo {
background: rgba(255,255,255,0.5);
background: rgb(8, 8, 8);
display: flex;
flex-wrap: wrap;
}
.whiter{
src/app/modals/preview-camera/preview-camera.page.ts
+4
View File
@@ -80,6 +80,10 @@ async getIconGallery(){
openChat(){
}
openChatVideo(){
}
}
src/app/modals/preview-photo/preview-photo-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { PreviewPhotoPage } from './preview-photo.page';
const routes: Routes = [
{
path: '',
component: PreviewPhotoPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class PreviewPhotoPageRoutingModule {}
src/app/modals/preview-photo/preview-photo.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { PreviewPhotoPageRoutingModule } from './preview-photo-routing.module';
import { PreviewPhotoPage } from './preview-photo.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
PreviewPhotoPageRoutingModule
],
declarations: [PreviewPhotoPage]
})
export class PreviewPhotoPageModule {}
src/app/modals/preview-photo/preview-photo.page.html
+15
View File
@@ -0,0 +1,15 @@
<ion-header>
<ion-toolbar>
<ion-title>
<ion-icon></ion-icon>
</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<img src="{{image}}" />
<ion-footer>
<ion-icon></ion-icon>
<ion-icon></ion-icon>
</ion-footer>
</ion-content>
src/app/modals/preview-photo/preview-photo.page.scss
View File
src/app/modals/preview-photo/preview-photo.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { PreviewPhotoPage } from './preview-photo.page';
describe('PreviewPhotoPage', () => {
let component: PreviewPhotoPage;
let fixture: ComponentFixture<PreviewPhotoPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ PreviewPhotoPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(PreviewPhotoPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/modals/preview-photo/preview-photo.page.ts
+33
View File
@@ -0,0 +1,33 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
@Component({
selector: 'app-preview-photo',
templateUrl: './preview-photo.page.html',
styleUrls: ['./preview-photo.page.scss'],
})
export class PreviewPhotoPage implements OnInit {
constructor(private modalController: ModalController,
private navParams:NavParams) { }
ngOnInit() {
}
image: any;
exit( ){ this.modalController.dismiss()
}
save(img){
var canvas = document.createElement('canvas');
var ctx = canvas.getContext('2d');
canvas.width=300
canvas.height=234
ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234);
document.body.appendChild(canvas);
}
}
src/app/pages/chat/messages/messages.page.ts
+13 -1
View File
@@ -39,8 +39,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
/* @ViewChild('messageContainer') messageContainer: ElementRef; */
@ViewChild('rectangle') private rectangle: ElementRef;
canvas: any
ctx: any
loggedUser: any;
message = '';
messages:any;
userPresence='';
@@ -635,6 +636,7 @@ touchStart(card) {
card.el.style['z-index'] = 11;
}
async openPreview(msg) {
const modal = await this.modalController.create({
component: PreviewCameraPage,
@@ -658,6 +660,16 @@ touchStart(card) {
ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234);
document.body.appendChild(canvas);
}
getPicture(img){
var canvas = document.createElement('canvas');
var ctx = canvas.getContext('2d');
canvas.width=300
canvas.height=234
ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234);
document.body.appendChild(canvas);
}
}
src/app/pages/publications/new-publication/new-publication.page.ts
+5 -3
View File
@@ -108,6 +108,7 @@ export class NewPublicationPage implements OnInit {
allowEditing: false,
resultType: CameraResultType.Uri,
source: CameraSource.Camera // Camera, Photos or Prompt!
});
if (image) {
@@ -116,12 +117,13 @@ export class NewPublicationPage implements OnInit {
}
imageSize(image){
var canvas = document.createElement('canvas');
var ctx = canvas.getContext('2d');
canvas.width=300
canvas.height=234
ctx.drawImage(image, 0, 0, 300, 234);
canvas.width=100
canvas.height=34
ctx.drawImage(image, 0, 0, 100, 34);
document.body.appendChild(canvas);
}
src/app/pages/publications/publications.page.html
-1
View File
@@ -77,7 +77,6 @@
</ion-item-option>
</ion-item-options>
</ion-item-sliding>
<ion-item-sliding disabled="{{showSlidingOptions}}" class="width-100"
*ngFor="let evento of publicationsEventFolderList">
<ion-item lines="none"
src/app/pages/publications/publications.page.ts
-2
View File
@@ -461,7 +461,5 @@ export class PublicationsPage implements OnInit {
// newImage => console.log('new image path is: ' + newImage),
// error => console.error('Error cropping image', error)
// );
}
src/app/pages/publications/view-publications/view-publications.page.scss
+1 -1
View File
@@ -126,7 +126,7 @@
}
.post-img{
width: 100%;
//height: 400px;
height: 400px;
margin: 0 auto;
border-radius: 0px!important;
overflow: hidden;
src/app/services/functions/file.service.ts
+1 -2
View File
@@ -240,7 +240,6 @@ export class FileService {
//this.capturedImage = this.capturedImage;
}
@@ -250,7 +249,7 @@ export class FileService {
quality: 50,
// allowEditing: true,
resultType: CameraResultType.Uri,
source: CameraSource.Photos
source: CameraSource.Camera
});