diff --git a/angular.json b/angular.json index 28356ab3f..ecd38fe24 100644 --- a/angular.json +++ b/angular.json @@ -84,8 +84,7 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "app:build", - "proxyConfig": "src/proxy.conf.json" + "browserTarget": "app:build" }, "configurations": { "production": { diff --git a/firebase-messaging-sw.js b/firebase-messaging-sw.js index e69de29bb..aa3917c40 100644 --- a/firebase-messaging-sw.js +++ b/firebase-messaging-sw.js @@ -0,0 +1,42 @@ + if ('serviceWorker' in navigator) { + navigator.serviceWorker.register('./firebase-messaging-sw.js') + .then(function(registration) { + console.log('Registration successful, scope is:', registration.scope); + }).catch(function(err) { + console.log('Service worker registration failed, error:', err); + }); + } +// Scripts for firebase and firebase messaging + + +/* importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js'); +importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js'); + +// Initialize the Firebase app in the service worker by passing the generated config +var firebaseConfig = { + apiKey: "AIzaSyAAdHmTFznCMerdT99nrewJgISRvtxPqoY", + authDomain: "gabinete-digital-2020.firebaseapp.com", + databaseURL: "https://gabinete-digital-2020.firebaseio.com", + projectId: "gabinete-digital-2020", + storageBucket: "gabinete-digital-2020.appspot.com", + messagingSenderId: "800733765231", + appId: "1:800733765231:web:28e7792ab150006513779a", + measurementId: "G-8QN4BLZ8XK" +}; + +firebase.initializeApp(firebaseConfig); + +// Retrieve firebase messaging +const messaging = firebase.messaging(); + +messaging.onBackgroundMessage(function(payload) { + console.log('Received background message ', payload); + + const notificationTitle = payload.notification.title; + const notificationOptions = { + body: payload.notification.body, + }; + + self.registration.showNotification(notificationTitle, + notificationOptions); +}); */ \ No newline at end of file diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index f5e2bc12c..ec39b347e 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { AnimationController, ModalController,Platform } from '@ionic/angular'; +import { AnimationController, ModalController, Platform } from '@ionic/angular'; import { SearchPage } from 'src/app/pages/search/search.page'; import { Router } from '@angular/router'; import { LoginUserRespose } from 'src/app/models/user.model'; @@ -28,7 +28,7 @@ export class HeaderPage implements OnInit { SessionStore = SessionStore production = environment.production - + constructor( private router: Router, private modalController: ModalController, @@ -50,39 +50,39 @@ export class HeaderPage implements OnInit { this.hideSearch(); this.notificationLengthData(); - /* if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - console.log('Notifications not supported') - this.UpdateNotificationCount(); - } else { - this.UpdateNotificationCount(); - } */ - - this.eventrigger.getObservable().subscribe((data)=>{ - if(data.notification == "delete" || "recive"){ - this.notificationLengthData(); - console.log('Deleted notification',data ) - } - - }) - + /* if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + console.log('Notifications not supported') + this.UpdateNotificationCount(); + } else { + this.UpdateNotificationCount(); + } */ } - - /* UpdateNotificationCount() { - this.notificationsService.registerCallback( - 'any', - () => { - setTimeout(()=>{ - this.notificationLengthData(); - }, 100) - } - ) - } */ - notificationLengthData() { + ionViewWillEnter() { + this.eventrigger.getObservable().subscribe((data) => { + if (data.notification == "delete" || "recive") { + this.notificationLengthData(); + console.log('Deleted notification', data) + } + }) + } + + /* UpdateNotificationCount() { + this.notificationsService.registerCallback( + 'any', + () => { + setTimeout(()=>{ + this.notificationLengthData(); + }, 100) + } + ) + } */ + + notificationLengthData() { this.storageservice.get("Notifications").then((value) => { console.log("Init get store", value) - /* var data = JSON.parse(value); */ + /* var data = JSON.parse(value); */ this.notificationLength = value.length; }) @@ -173,10 +173,10 @@ export class HeaderPage implements OnInit { }); await modal.present(); - modal.onDidDismiss().then(()=>{ + modal.onDidDismiss().then(() => { this.notificationLengthData() }) - + } async dynamicSearch() { diff --git a/src/firebase-messaging-sw.js b/src/firebase-messaging-sw.js new file mode 100644 index 000000000..aa3917c40 --- /dev/null +++ b/src/firebase-messaging-sw.js @@ -0,0 +1,42 @@ + if ('serviceWorker' in navigator) { + navigator.serviceWorker.register('./firebase-messaging-sw.js') + .then(function(registration) { + console.log('Registration successful, scope is:', registration.scope); + }).catch(function(err) { + console.log('Service worker registration failed, error:', err); + }); + } +// Scripts for firebase and firebase messaging + + +/* importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js'); +importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js'); + +// Initialize the Firebase app in the service worker by passing the generated config +var firebaseConfig = { + apiKey: "AIzaSyAAdHmTFznCMerdT99nrewJgISRvtxPqoY", + authDomain: "gabinete-digital-2020.firebaseapp.com", + databaseURL: "https://gabinete-digital-2020.firebaseio.com", + projectId: "gabinete-digital-2020", + storageBucket: "gabinete-digital-2020.appspot.com", + messagingSenderId: "800733765231", + appId: "1:800733765231:web:28e7792ab150006513779a", + measurementId: "G-8QN4BLZ8XK" +}; + +firebase.initializeApp(firebaseConfig); + +// Retrieve firebase messaging +const messaging = firebase.messaging(); + +messaging.onBackgroundMessage(function(payload) { + console.log('Received background message ', payload); + + const notificationTitle = payload.notification.title; + const notificationOptions = { + body: payload.notification.body, + }; + + self.registration.showNotification(notificationTitle, + notificationOptions); +}); */ \ No newline at end of file diff --git a/src/proxy.conf.json b/src/proxy.conf.json deleted file mode 100644 index e69de29bb..000000000