onother merger made

angular.json

@@ -34,7 +34,10 @@
                 "glob": "**/*.svg",
                 "input": "node_modules/ionicons/dist/ionicons/svg",
                 "output": "./svg"
-              }
+              },
+              "src/manifest.webmanifest",
+              "src/combined-sw.js",
+              "src/firebase-messaging-sw.js"
             ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/pink-bluegrey.css",

package.json

@@ -28,7 +28,7 @@
     "@angular/cdk": "^11.2.13",
     "@angular/common": "^12.1.2",
     "@angular/core": "^12.1.2",
-    "@angular/fire": "^7.5.0",
+    "@angular/fire": "6.1.5",
     "@angular/forms": "~12.1.2",
     "@angular/localize": "^12.1.2",
     "@angular/material": "^11.2.13",
@@ -135,7 +135,7 @@
     "duration": "^0.2.2",
     "faker": "^5.5.3",
     "fifo-process-queue": "^1.2.0",
-    "firebase": "^9.8.4",
+    "firebase": "^7.0 || ^8.0",
     "g": "^2.0.1",
     "global": "^4.4.0",
     "hammerjs": "^2.0.8",

src/app/app.module.ts

@@ -76,6 +76,11 @@ import * as Sentry from '@sentry/capacitor';
 import { Integration } from '@sentry/types';
 import { BrowserTracing } from '@sentry/tracing';
 
+// import { ServiceWorkerModule } from '@angular/service-worker';
+// import { AngularFireModule } from '@angular/fire';
+// import { AngularFireMessagingModule } from '@angular/fire/messaging';
+// import { environment } from 'src/environments/environment';
+
 /* import { FCM } from '@ionic-native/fcm/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
 //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
@@ -108,7 +113,8 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
       provide: DateAdapter,
       useFactory: adapterFactory
     }),
-
+    //AngularFireModule.initializeApp(environment.firebase),
+    //AngularFireMessagingModule,
     IonicImageLoaderModule,
     IonicModule.forRoot({animated: false}),
     IonicStorageModule.forRoot({

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html

@@ -64,7 +64,7 @@
 <ion-footer>
   <ion-toolbar class="footer-toolbar">
     <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start">
-      <button class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
+      <button *ngIf="publication.ProcessId" class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
         <ion-label>Eliminar</ion-label>
       </button>
     </ion-buttons>

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts

@@ -33,10 +33,11 @@ export class PublicationDetailPage implements OnInit {
     ) {
 
       this.activatedRoute.paramMap.subscribe(params => {
-        
+        console.log(params["params"])
         if(params["params"]) {
           this.folderId = params["params"].folderId;
           this.publicationId = params["params"].publicationId;
+          this.isModal = params["params"].isModal;
           // 
         }
       });
@@ -92,10 +93,9 @@ export class PublicationDetailPage implements OnInit {
   }
 
   goBack() {
-    if(this.isModal) {
+    if(!window.location.href.includes('/home/publications/view-publications')) {
       this.close()
     } else {
-      // alert('go back')
       this.RouteService.goBack();
     }
 
@@ -107,7 +107,7 @@ export class PublicationDetailPage implements OnInit {
 
     try {
       await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
-      this.toastService.successMessage('Publicação eliminada')
+      this.toastService._successMessage('Publicação removida')
 
       if(window['app-view-publications-page-doRefresh']) {
         window['app-view-publications-page-doRefresh']()
@@ -115,7 +115,7 @@ export class PublicationDetailPage implements OnInit {
 
       this.goBack();
     } catch (error) {
-      this.toastService.badRequest('Publicaçao não eliminada')
+      this.toastService._badRequest('Publicaçao não removida')
     }  finally {
       loader.remove()
     }

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -272,6 +272,7 @@ export class ViewPublicationsPage implements OnInit {
       componentProps: {
         publicationId: publicationId,
         folderId: this.folderId,
+        isModal: true
       },
       cssClass: 'publication-detail modal modal-desktop',
       // backdropDismiss: false

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -362,10 +362,10 @@ export class EditEventToApprovePage implements OnInit {
       
       this.close()
 
-      this.toastService.successMessage('Evento editado');
+      this.toastService._successMessage('Evento editado');
 
     } catch(e) {
-      this.toastService.badRequest('Evento não editado');
+      this.toastService._badRequest('Evento não editado');
     }
   
     this.loadedAttachments.forEach((document:any)=>{

src/combined-sw.js

@@ -0,0 +1,2 @@
+importScripts('ngsw-worker.js');
+importScripts('firebase-messaging-sw.js');

src/manifest.webmanifest

@@ -0,0 +1,3 @@
+{
+    "gcm_sender_id": "103953800507"
+}

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "72bd8ff8c",
+  "shortSHA": "fa13f5280",
-  "SHA": "72bd8ff8cf78537c976def8a535e32e8cfa76d50",
+  "SHA": "fa13f528006c76a2545adc0cd721caf282fa519b",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Feb 6 09:45:44 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 6 10:10:32 2023 +0100'",
-  "lastCommitMessage": "pull made",
+  "lastCommitMessage": "git version",
-  "lastCommitNumber": "4725",
+  "lastCommitNumber": "4726",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   angular.json\n\tmodified:   package.json\n\tmodified:   src/app/app.module.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tnew file:   src/combined-sw.js\n\trenamed:    src/assets/firebase-messaging-sw.js -> src/firebase-messaging-sw.js\n\tnew file:   src/manifest.webmanifest",
   "changeAuthor": "eudes.inacio"
 }