peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
ivan gomes
2021-12-03 17:27:10 +01:00
parent 40e0aa0d39
commit dc84401716
13 changed files with 165 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
capacitor.config.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { CapacitorConfig } from '@capacitor/cli';
const config: CapacitorConfig = {
appId: 'com.capacitorjs.app.testapp',
appName: 'capacitor-testapp',
webDir: 'build',
webDir: 'www',
plugins: {
SplashScreen: {
launchAutoHide: false,
package-lock.json
Generated
+22 -9
View File
@@ -2030,6 +2030,14 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
"@byteowls/capacitor-filesharer": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@byteowls/capacitor-filesharer/-/capacitor-filesharer-3.0.0.tgz",
"integrity": "sha512-7/ZL7eyK/7aZx7A5q2PtKc8s9jWAlHXmPOpINkEeoQ09xZNuKUFR/lxruPDgSJE+4/4wM5M4uxUBYCndmwXOSA==",
"requires": {
"file-saver": "^2.0.5"
}
},
"@capacitor-community/camera-preview": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@capacitor-community/camera-preview/-/camera-preview-1.2.1.tgz",
@@ -2069,9 +2077,9 @@
"integrity": "sha512-NAIGWnyHBGQ/dgla/D4KDkAeQ2f3fzw+D+DIkGNH3f1ciX4bXC7lNbDVU67SMOuNt+CmcTJF64q3nVXcpv5JvQ=="
},
"@capacitor/cli": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-3.3.0.tgz",
"integrity": "sha512-BkxagJhHG11+0ivFwUOnAhhdwQ1WXoX0WEzqzzGVL9k63hStuIOvPUusp34+G4EcNU01BAJlBt+dgefSvDhOFw==",
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-3.3.2.tgz",
"integrity": "sha512-LmH3DzuwNL3k995CgAs20KXjQhDWrQCQgur3M8nqIKecZk0xCoSGghht+rEK8/Gqn0XqdBGdgUgop+nep17edg==",
"dev": true,
"requires": {
"@ionic/cli-framework-output": "^2.2.1",
@@ -2173,9 +2181,9 @@
}
},
"@capacitor/core": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.3.0.tgz",
"integrity": "sha512-bKkg/IGALz5OKJPGwtGXoqi4JUXWbuILnZ9J12Mv21fPMFBoszYOiMfm7FqdcCwqcyJWCdG3SQDxCz0Q3e2y8Q==",
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.3.2.tgz",
"integrity": "sha512-pyI3dQdQjA1L5iEw0jkeKCogx9t5d5kIFTB5M3CJRg9Uj5MIpU2J5CRj+74A7BflvZJo8IBd6IfMJaOArRumaw==",
"requires": {
"tslib": "^2.1.0"
}
@@ -10210,6 +10218,11 @@
"escape-string-regexp": "^1.0.5"
}
},
"file-saver": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -16194,9 +16207,9 @@
}
},
"bplist-parser": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz",
"integrity": "sha512-zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==",
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
"integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
"dev": true,
"requires": {
"big-integer": "1.6.x"
package.json
+3 -2
View File
@@ -31,12 +31,13 @@
"@angular/platform-browser": "~12.1.2",
"@angular/platform-browser-dynamic": "~12.1.2",
"@angular/router": "~12.1.2",
"@byteowls/capacitor-filesharer": "^3.0.0",
"@capacitor-community/camera-preview": "^1.2.1",
"@capacitor/android": "^3.3.2",
"@capacitor/app": "^1.0.5",
"@capacitor/browser": "1.0.6",
"@capacitor/camera": "^1.2.0",
"@capacitor/core": "^3.3.0",
"@capacitor/core": "^3.3.2",
"@capacitor/device": "^1.1.0",
"@capacitor/filesystem": "^1.0.6",
"@capacitor/haptics": "^1.1.2",
@@ -150,7 +151,7 @@
"@angular/compiler": "^12.1.2",
"@angular/compiler-cli": "^12.1.2",
"@angular/language-service": "^12.1.2",
"@capacitor/cli": "^3.3.0",
"@capacitor/cli": "^3.3.2",
"@ionic/angular-toolkit": "^4.0.0",
"@ionic/lab": "3.1.7",
"@types/jasmine": "~3.6.0",
src/app/modals/preview-camera/preview-camera.page.html
+23 -59
View File
@@ -1,70 +1,34 @@
<!-- <div class="Rectangle"> -->
<ion-content fullscreen>
<ion-header translucent>
<ion-toolbar>
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class= "btn-dismiss font-30 cursor-pointer" (click)="close()">
<ion-icon style="margin-bottom:-8px" slot="end" src="assets/images/icons-arrow-arrow-left.svg" class="iconsarrowarrow-left"></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1">
<div><b><ion-label class="digitalizacao_001pd">{{name}} </ion-label></b><br>
<ion-label class="place">{{_updatedAt | date}}</ion-label></div>
<ion-card class="cardconteudo" >
</div>
</div>
<!-- <ion-text > <span class="digitalizacao_001pd">{{username}} {{_updatedAt | date}}</span></ion-text> -->
</ion-toolbar>
</ion-header>
<ion-card-content class="Bitmap" >
<ion-card-content >
<ion-card-header >
<img src="{{image}}" style="margin-top: 50%;"/>
</ion-card-content>
<!-- <ion-footer class="Rectangle-Copy-5">
<ion-text color="dark" size="6">{{username}} <span>{{_updatedAt | date}}</span><div class="right" (click)="getIconGallery()"><ion-icon name="pencil-outline" ></ion-icon></div></ion-text>
</ion-footer> -->
</ion-content>
</ion-card-header>
<img src="{{image}}" />
</ion-card-content>
<!-- <image-cropper [imageBase64]="myimage"
[maintainAspectRatio]="true"
[aspectRatio]="4 / 3"
outputType = "base64"
format="png"
[resizeToWidth]="true"
(imageCropped)="imageCropped($event)"
></image-cropper> -->
<ion-footer color="light">
<ion-row>
<ion-col size="3" 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" ></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="deleteImage()" fill="clear" color="light">
<ion-icon src="assets/icon/chat/Ellipse 8.svg" ></ion-icon>
<!-- <ion-icon class="redla" name="flower-outline"></ion-icon> -->
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="redirPage()" fill="clear" color="light">
<ion-icon src="assets/icon/chat/Ellipselast.svg" ></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="getIconShare()" fill="clear" color="light">
<ion-icon src="assets/icon/chat/Ellipse 9.svg" ></ion-icon>
</ion-button>
</ion-col>
<!-- <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-row>
</ion-footer>
</ion-card>
src/app/modals/preview-camera/preview-camera.page.scss
+66 -15
View File
@@ -36,25 +36,76 @@ float: right;
}
circle-xmark-solid{
// position: relative;
width: 512px;
height: 515px;
position: absolute;
left: 0%;
right: 0%;
top: 0%;
bottom: 0%;
background: #FCD13A;
ion-icon {
width: 500px;
height: 500px;
}
.Rectangle {
width: 400px;
height: 666px;
margin: 0px;
padding: 0px;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.49);
background-color: var(--white);
}
/* Vector */
.digitalizacao_001pd {
width: 238px;
height: 29px;
margin: 3px 3px 3px 0;
font-family: Roboto;
font-size: 20px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: var(--black);
}
.iconsarrowarrow-left {
width: 36px;
height: 35px;
padding: 9px 14px 8px 13px;
object-fit: contain;
}
CSS
.Rectangle-Copy-5 {
width: 400px;
height: 60px;
margin: 43px 0 0;
background-color: #f9f9f9;
}
CSS
.Bitmap {
width: 358px;
height: 506px;
margin: 100px;
}
.inside{
background-color: var(--very-light-grey);
}
.place{
float : left;
font-size: 14px;
}
.footer{
background-color:transparent;
}
.distance{
margin-left: 100px;
}
src/app/modals/preview-camera/preview-camera.page.ts
+3 -5
View File
@@ -22,7 +22,7 @@ export class PreviewCameraPage implements OnInit {
@ViewChild(IonSlides) slides : IonSlides
image: any;
username: string
name: string
_updatedAt: string
@@ -40,7 +40,7 @@ export class PreviewCameraPage implements OnInit {
ngOnInit() {
this.image = this.navParams.get('image')
this.username = this.navParams.get('username')
this.name = this.navParams.get('username')
this._updatedAt = this.navParams.get('_updatedAt')
console.log(this.image)
// this.image = this.myimage
@@ -110,15 +110,13 @@ async getIconGallery(){
}
async getIconShare(){
await Share.share({
title: 'See cool stuff',
text: 'Really awesome thing you need to see right meow',
url: this.image,
url: "https://www.google.com/search?q=joao+louren%C3%A7o&rlz=1C1SQJL_pt-PTAO977AO977&sxsrf=AOaemvIEvXz_WiqNNapjaoE42Q8b71jtiA:1638355797910&source=lnms&tbm=isch&sa=X&sqi=2&ved=2ahUKEwjo9uX6tsL0AhXTlWoFHX1XAtcQ_AUoAXoECAMQAw&biw=1920&bih=937&dpr=1#imgrc=lH5UYZyhPKBhHM",
dialogTitle: 'Share with buddies',
});
src/app/pages/agenda/agenda.page.ts
+1 -1
View File
@@ -816,7 +816,7 @@ export class AgendaPage implements OnInit {
case "Oficial":
if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {})
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
} else {
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
src/app/pages/chat/group-messages/group-messages.page.ts
+1 -1
View File
@@ -633,7 +633,7 @@ touchStart(card) {
cssClass: 'transparent-modal',
componentProps: {
image: img.attachments[0].image_url,
username: img.u.username,
username: img.u.name,
_updatedAt: img._updatedAt
}
});
src/app/pages/chat/messages/messages.page.ts
+2 -2
View File
@@ -643,10 +643,10 @@ touchStart(card) {
async openPreview(msg) {
const modal = await this.modalController.create({
component: PreviewCameraPage,
cssClass: 'transparent-modal',
cssClass: 'modal modal-desktop',
componentProps: {
image: msg.attachments[0].image_url,
username: msg.u.username,
username: msg.u.name,
_updatedAt: msg._updatedAt,
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
-1
View File
@@ -126,7 +126,6 @@ export class PublicationDetailPage implements OnInit {
}
async editPost(publicationType:any) {
console.log(this.publication);
const modal = await this.modalController.create({
src/app/services/functions/file.service.ts
+36 -10
View File
@@ -10,11 +10,15 @@ import { SearchList } from 'src/app/models/search-document';
import { ProcessesService } from '../processes.service';
import { ToastService } from '../toast.service';
import { Camera, CameraResultType, CameraSource, Photo} from '@capacitor/camera';
import {
FileSharer} from '@byteowls/capacitor-filesharer';
import { Filesystem, Directory } from '@capacitor/filesystem';
import { Share } from '@capacitor/share';
import { HttpClient } from '@angular/common/http';
const IMAGE_DIR = 'stored-images';
interface LocalFile {
name: string;
path: string;
@@ -45,7 +49,8 @@ export class FileService {
private processesService: ProcessesService,
private toastService: ToastService,
private platform: Platform,
private loadingCtrl: LoadingController
private loadingCtrl: LoadingController,
private http: HttpClient
) { }
async takePicture() {
@@ -230,15 +235,11 @@ export class FileService {
if (image) {
await this.saveImage(image,roomId)
}
/* const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
this.photos.unshift({
filepath: "soon...",
webviewPath: capturedImage.webPath
}); */
//this.capturedImage = this.capturedImage;
await Share.share({
title: 'Check my image',
url: image.path
})
}
@@ -256,6 +257,13 @@ export class FileService {
if (capturedImage) {
await this.saveImage(capturedImage,roomId)
}
await Share.share({
title: 'Check my image',
url: capturedImage.path
})
/* const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
@@ -289,6 +297,24 @@ export class FileService {
//loader.remove();
});
*/ }
async shareLocalFile(){
this.http.get('./assets/any.svg', {responseType: 'blob'}).subscribe(res=>{
const reader = new FileReader()
reader.onloadend=()=>{
const result = reader.result as string
const base64Data = result.split(',')[1]
FileSharer.share({
filename:'any.pdf',
base64Data,
contentType: "application/pdf",
})
reader.readAsDataURL(res)
}
})
}
addPictureToChat(roomId) {
src/assets/any.pdf
BIN
View File
Binary file not shown.
src/global.scss
+2 -2
View File
@@ -1340,12 +1340,12 @@ ngx-mat-datetime-content{
.ldio-rpinwye8j0b div { box-sizing: content-box; }
.transparent-modal {
--background: #f1eaeae7;
--background:transparent;
--margin: 0;
--padding: 0;
ion-content {
--background:#f1f0ebe7;
--background:transparent;
}
}