diff --git a/config.xml b/config.xml index 7b18d7926..97d2fb38d 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 8415ed43f..cef00976b 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -81,6 +81,19 @@ export class HomePage implements OnInit { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) }); + + // if (typeof Worker !== 'undefined') { + // // Create a new + // const worker = new Worker(new URL('./nice.worker.ts', import.meta.url)); + // worker.onmessage = ({ data }) => { + // console.log(`page got message: ${data}`); + // }; + // worker.postMessage('hello'); + // } else { + // // Web workers are not supported in this environment. + // // You should add a fallback so that your program still executes correctly. + // } + { //this.folderId = this.navParams.get('folderId'); } diff --git a/src/app/home/nice.worker.ts b/src/app/home/nice.worker.ts new file mode 100644 index 000000000..c2275749d --- /dev/null +++ b/src/app/home/nice.worker.ts @@ -0,0 +1,6 @@ +// / + +addEventListener('message', ({ data }) => { + const response = `worker response to ${data}`; + //postMessage(response); +}); diff --git a/src/app/pages/publications/gallery/image-modal/image-modal.page.html b/src/app/pages/publications/gallery/image-modal/image-modal.page.html index 0d42f744c..1cdedbfef 100644 --- a/src/app/pages/publications/gallery/image-modal/image-modal.page.html +++ b/src/app/pages/publications/gallery/image-modal/image-modal.page.html @@ -1,14 +1,21 @@ - - - - Fechar - - - - - - - - - + + + + + + Fechar + + + + + + + + + + + + + + diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index a361030ee..6c5b9afc8 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,82 +1,82 @@ - + {{publicationTitle}} - - - - - - - + + + - - - - - - - Fotografia Anexada - - - - - - - {{capturedImageTitle}} - size - - - - - - - - - - - - - {{publication.OriginalFileName}}.{{publication.FileExtension}} - 75 Kb - - - X - - - - - - - + + + + + + + + + - - Tirar Fotografia - - - + + Fotografia Anexada + + + + + + + {{capturedImageTitle}} + size + + + + - + + + + + + + {{publication.OriginalFileName}}.{{publication.FileExtension}} + 75 Kb + + + X + + + + + + + + + + + Tirar Fotografia + + + + + + + + + + + Anexar Fotografia + + + + + diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss index d306c560e..e75e9c30b 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -58,7 +58,6 @@ ion-toolbar{ } .title-content{ margin: 0px auto; - overflow: auto; padding: 0 !important; } .div-title{ diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index aec77b737..94e4885e0 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -95,9 +95,10 @@ export class NewPublicationPage implements OnInit { this.camera.getPicture(options).then((imageData) => { // imageData is either a base64 encoded string or a file URI - // If it's base64 (DATA_URL): - let base64Image = 'data:image/jpeg;base64,' + imageData; - this.capturedImage = imageData; + // If it's base64 (DATA_URL): m + //let base64Image = 'data:image/jpeg;base64,' + imageData; + + this.capturedImage = 'data:image/png;base64,'+imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; }, (err) => { /* console.log(err); */ @@ -116,6 +117,8 @@ export class NewPublicationPage implements OnInit { const imageData = await this.fileToBase64Service.convert(file) this.capturedImage = imageData; this.capturedImageTitle = file.name + + console.log(this.capturedImage) }; } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index fab3425e1..035353783 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -3,8 +3,6 @@ import { AnimationController, ModalController, NavParams } from '@ionic/angular' import { Publication } from 'src/app/models/publication'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ImageModalPage } from '../gallery/image-modal/image-modal.page'; import { NewPublicationPage } from '../new-publication/new-publication.page'; @@ -27,6 +25,9 @@ export class PublicationDetailPage implements OnInit { private animationController: AnimationController, private toastService: ToastService ) { + + alert('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') + this.publicationId = this.navParams.get('publicationId'); /* this.folderId = this.navParams.get('folderIdId'); */ this.publication = { diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index f5927d526..c6002ce1e 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + @@ -33,6 +33,7 @@ + diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss index 719348ea6..2f9854000 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss @@ -57,9 +57,8 @@ padding: 25px 0px 0 0px; overflow: auto; } - .title-content{ + .title-content { margin: 0px auto; - overflow: auto; } .back-icon{ width: auto; diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index f4bd2d690..25106c276 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -27,6 +27,7 @@ export class PublicationDetailPage implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, ) { + this.activatedRoute.paramMap.subscribe(params => { console.log(params); if(params["params"]) { diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 71f9efd2f..1c55832b5 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -29,7 +29,7 @@ - + { // // you can use this method to get file and perform respective operations // let files = Array.from(input.files); diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 3cf0268f5..b2469dba3 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -147,25 +147,26 @@ export class ViewPublicationsPage implements OnInit { async viewPublicationDetail(publicationId:string) { - console.log(publicationId); - if( window.innerWidth <= 1024) { - const modal = await this.modalController.create({ - component: PublicationDetailPage, - componentProps:{ - publicationId: publicationId, - }, - cssClass: 'publication-detail modal modal-desktop', - //backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then(()=>{ - this.doRefresh(event); - }); - } else { - // open publication details - this.openPublicationDetails.emit(publicationId); - } + // if( window.innerWidth <= 1024) { + // const modal = await this.modalController.create({ + // component: PublicationDetailPage, + // componentProps:{ + // publicationId: publicationId, + // }, + // cssClass: 'publication-detail modal modal-desktop', + // //backdropDismiss: false + // }); + // await modal.present(); + // modal.onDidDismiss().then(()=>{ + // this.doRefresh(event); + // }); + // } else { + // // open publication details + // this.openPublicationDetails.emit(publicationId); + // } + + this.openPublicationDetails.emit(publicationId); }
{{capturedImageTitle}}
size