diff --git a/package-lock.json b/package-lock.json index ec86b1c11..795c870b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2162,6 +2162,11 @@ "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-1.1.2.tgz", "integrity": "sha512-EUduhQzrHma4PlGfdSxVeGIwxR2+/xLRDbjQH5Q4cXqrlYssIX2UyQrL4wNpDaAOg1Z4VD8EzzVolC81LG6Q+A==" }, + "@capacitor/network": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@capacitor/network/-/network-1.0.6.tgz", + "integrity": "sha512-xkkmRLlFcg1dM0WfblxKwcKFjcfBQ04yWYX0ubD/n5QfQjLCCb8GbAHlorqIyt2j4PUvSAb0ERLyL89hpKlh2w==" + }, "@capacitor/push-notifications": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.7.tgz", diff --git a/package.json b/package.json index 8bc0fca72..d73c6741c 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "@capacitor/core": "^3.3.0", "@capacitor/haptics": "^1.1.2", "@capacitor/keyboard": "^1.1.2", + "@capacitor/network": "^1.0.6", "@capacitor/push-notifications": "^1.0.7", "@capacitor/status-bar": "^1.0.5", "@fortawesome/angular-fontawesome": "^0.9.0", diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index e5e0b8e04..14ced160f 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 45efa5ab5..3b3fc667d 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 19f73eee8..2762a5041 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index de5f6e383..4be2d7b06 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index b74f60b81..12c9f53c6 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 044dff1f7..f7fef445b 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 426aaade3..862b1494c 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index 0d1b968fb..9bbd8ea10 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 425bcc606..c9e3e9ac2 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 61fe6344c..0849e8817 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 6871e9482..7d6fc0737 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 258409947..aff1cd850 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index 9e18b01c7..7180ee893 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 60545a8f4..6ddb87e9a 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 341a70cc3..a464461b0 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 6a12495b9..e04e5598e 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 846ed2a51..ce228b013 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index 5487dd6c4..00f70995a 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png b/resources/icon.png index 386df1e6c..550d059c1 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/splash.png b/resources/splash.png index ef651e015..a1e7cd675 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 3ad71ddfd..c508018d4 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -6,7 +6,7 @@ import { AuthService } from 'src/app/services/auth.service'; import { LocalstoreService } from 'src/app/store/localstore.service'; import { EditProfilePage } from './edit-profile/edit-profile.page'; import { StorageService } from '../../services/storage.service'; -/* import { NotificationsService } from '../../services/notifications.service'; */ +import { NotificationsService } from '../../services/notifications.service'; import { SessionStore } from 'src/app/store/session.service'; import { EventTrigger } from '../../services/eventTrigger.service'; import { ThemeService } from 'src/app/services/theme.service' @@ -38,9 +38,8 @@ export class ProfilePage implements OnInit { private localstoreService: LocalstoreService, private storageservice: StorageService, private zone: NgZone, - /* private notificationservice: NotificationsService, */ + private notificationservice: NotificationsService, private platform: Platform, - /* private notificationsService: NotificationsService, */ private eventtrigger: EventTrigger, public ThemeService: ThemeService ) { @@ -189,7 +188,7 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); } - //this.notificationservice.tempClearArray(); + this.notificationservice.tempClearArray(); this.deleteNotification(index); this.eventtrigger.publishSomeData({ notification: "deleted" diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index 70b621dbb..5275b7718 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -68,7 +68,7 @@ --border-radius: 5px; --box-shadow: none; overflow: auto; - --icon-color:#0d89d1; + --icon-color: var(--font-awesome); } } @@ -120,14 +120,14 @@ } .members-checkbox ion-checkbox{ - --border-color: #0d89d1; - --background-checked:#0d89d1; + --border-color: var(--title-text-color); + --background-checked:var(--title-text-color); float: left; } .item-checkbox ion-checkbox{ - --border-color: #0d89d1; - --background-checked:#0d89d1; + --border-color: var(--title-text-color); + --background-checked:var(--title-text-color); float: left; } @@ -137,7 +137,7 @@ width: 330px; padding-left: 10px; font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); float: left; } .item-checkbox ion-icon, .members-checkbox ion-icon{ diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/pages/chat/new-group/contacts/contacts.page.scss index 54523dbf8..9f66c7eb7 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.scss +++ b/src/app/pages/chat/new-group/contacts/contacts.page.scss @@ -69,7 +69,7 @@ --border-radius: 5px; --box-shadow: none; overflow: auto; - --icon-color:#0d89d1; + --icon-color:var(--title-text-color); } } @@ -102,8 +102,8 @@ ion-content{ } .item-checkbox ion-checkbox{ - --border-color: #0d89d1; - --background-checked:#0d89d1; + --border-color: var(--title-text-color); + --background-checked:var(--title-text-color); float: left; } @@ -113,7 +113,7 @@ ion-content{ width: 330px; padding-left: 10px; font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); float: left; } .item-checkbox ion-icon{ diff --git a/src/app/services/network-connection.service.ts b/src/app/services/network-connection.service.ts index b9bfb446b..8586451d6 100644 --- a/src/app/services/network-connection.service.ts +++ b/src/app/services/network-connection.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs' import { Platform } from '@ionic/angular' +import { Network } from '@capacitor/network'; @Injectable({ providedIn: 'root' @@ -9,20 +10,19 @@ import { Platform } from '@ionic/angular' export class NetworkConnectionService { online: boolean = true; - constructor(){} - - checkOnline() { - window.addEventListener('online', (on) => { - this.online === true; - console.log('Became online'); + constructor(){ + Network.addListener('networkStatusChange', status => { + console.log('Network status changed', status); }); } + - checkOffline() { - window.addEventListener('offline', (off) => { - this.online === false; - console.log('Became offline') - }); - } + + logCurrentNetworkStatus = async () => { + const status = await Network.getStatus(); + + return status; + + }; } \ No newline at end of file diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 31bbbeb40..50dab7589 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -162,220 +162,59 @@ export class NotificationsService { ); } - - - /* - - async onReceviNotification() { - this.fcm.onNotification().subscribe(data => { - if (data.click_action) { - console.log("Received in background: ", data); - - this.notificatinsRoutes(data) - - } else { - console.log("Received in foreground: ", data); - - console.log(data.Service) - console.log(data.Object) - console.log(data.IdObject) - - this.DataArray.push(data) - console.log("On ReceiveNotification", this.DataArray) - this.storageService.store("Notifications", this.DataArray) - - - }; - }); - } */ - - - ///////////////////////////////////////////////////// - - /* getTokenByUserIdAndId(user, userID) { - const geturl = environment.apiURL + 'notifications/user/' + userID; - - return this.http.get(`${geturl}`); - } - */ - /* getAndpostToken(username) { - - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - //console.log('Notifications not supported') - } else { - - const geturl = environment.apiURL + 'notifications/token'; - if(window['WLAuthorizationManager']) { - if(window['WLAuthorizationManager'].obtainAccessToken) { - window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then( - (token) => { - console.log('Push Notification: Success ' + token); - - window['MFPPush'].initialize( - function (successResponse) { - console.log("Push notification Successfully Service intialized: " + successResponse); - }, - function (failureResponse) { - console.log("Push notification failure Service intialized: " + failureResponse); - } - ); - - window['MFPPush'].registerDevice(null, async (successResponse) => { - console.log("Successfully registered: " + JSON.stringify(successResponse)); - console.log('token: ', successResponse.deviceId) - await this.storageService.store(username, successResponse.deviceId).then((tokennoti) => { - console.log('token store',tokennoti) - }); - await this.storageService.get(username).then(value => { - console.log('STORAGE TOKEN', value) - this.storageService.get(AuthConnstants.USER).then(res => { - console.log('USERID', res); - const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; - const body = { - UserId: res.UserId, - TokenId: successResponse.deviceId, - Status: 1, - Service: 1 - }; - this.http.post(`${geturl}`, body, { headers }).subscribe(data => { - console.log('TOKEN USER MIDLE', data); - }) - }); - - }); - }, - function (failureResponse) { - console.log("Successfully failue: " + JSON.stringify(failureResponse)); - } - ); - }, (error) => { - console.log('Push notification recived: failure ' + error.responseText); - console.log(JSON.stringify(error)); - } - ); - } - } - - } - - } */ - tempClearArray() { this.DataArray = new Array; } - /* async onReceviNotification() { - - if(window['WLAuthorizationManager']) { - if(window['WLAuthorizationManager'].obtainAccessToken) { - window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then( - (token) => { - console.log('Push Notification: Success ' + token); - window['MFPPush'].initialize( - function (successResponse) { - console.log("Push notification Successfully intialized: " + successResponse); - window['MFPPush'].registerNotificationsCallback(notificationReceived); - }, - function (failureResponse) { - console.log("Push notification failure intialized: " + failureResponse); - } - ); - var notificationReceived = (message) => { - //this.jsonstore.createCollection('Notifications',message); - this.DataArray.push(message) - console.log("On ReceiveNotification", this.DataArray) - this.storageService.store("Notifications",this.DataArray) - - console.log(message); - this.eventtrigger.publishSomeData({ - notification: "recive" - }) - var data = JSON.parse(message.payload); - - //synchro.$send(data) - - console.log('data.Service', data.Service); // module - console.log('data.IdObject', data.IdObject); // Object id - console.log('data.Object', data.Object); // details - - if(message.actionName){ - this.notificatinsRoutes(data); - } else { - /* this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data); - //this.notificatinsRoutes(data); - console.log(data) - } - - this.callbacks.forEach( e=> { - if(e.type == data.Object || e.type == "any") { - e.funx() - } - }) - - } - }, (error) => { - console.log('Push notification recived: failure ' + error.responseText); - console.log(JSON.stringify(error)); - } - ); - } - } - - - } */ notificatinsRoutes = (notification) => { - if (notification.data.Service === "agenda") { - this.zone.run(() => this.router.navigate(['/home/agenda', notification.data.IdObject, 'agenda'])); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expediente") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.data.IdObject, 'gabinete-digital'])); - } - else if (notification.data.Service === "agenda" && notification.data.Object === "event-list") { - this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.data.IdObject, 'agenda'])); - } else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true })); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "parecer") { + console.log('Push action performed 2222: ' + JSON.stringify(notification.data)); - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital'])); + if (notification.notification.data.Service === "agenda" && notification.notification.data.IdObject.length > 10) { + console.log("Id Lenght", notification.notification.data.IdObject.length) + this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.IdObject, 'agenda'])); } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "deferimento") { + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expediente") { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.notification.data.IdObject, 'gabinete-digital'])); + } + else if (notification.notification.data.Service === "agenda" && notification.notification.data.Object === "event-list") { + //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda'])); + this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.IdObject, 'agenda'])); - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital'])); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos-pr") { + } else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.data.IdObject, 'gabinete-digital'])); + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true })); } - else if (notification.data.Service === "accoes" && notification.data.Object === "accao") { - this.zone.run(() => this.router.navigate(['/home/publications', notification.data.IdObject])); - } - else if (notification.data.Service === "accoes" && notification.data.Object === "publicacao") { - this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.data.FolderId, notification.data.IdObject])); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.data.IdObject, 'gabinete-digital'])); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas-assinar") { - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": notification.data.IdObject, - } - }; - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras)); - } - else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expedientes-pr") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.data.IdObject, 'gabinete-digital'])); - } - } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "parecer") { - platformVerify() { - - if (this.platform.is('cordova')) { - } else { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital'])); } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "deferimento") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital'])); + } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos-pr") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.notification.data.IdObject, 'gabinete-digital'])); + } + else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "accao") { + this.zone.run(() => this.router.navigate(['/home/publications', notification.notification.data.IdObject])); + } + else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "publicacao") { + this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.notification.data.FolderId, notification.data.IdObject])); + } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas") { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital'])); + } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas-assinar") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital'])); + } + else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital'])); + } + } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 5f12d2d70..abe6a5226 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -16,7 +16,7 @@ logo
-
{{this.notificationLength}}
+
{{notificationLength}}
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index e30aadbd8..9633211b2 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -27,6 +27,7 @@ export class HeaderPage implements OnInit { DataArray: Array = []; notificationLength: 0; SessionStore = SessionStore + check: boolean; production = environment.production @@ -49,31 +50,22 @@ export class HeaderPage implements OnInit { ngOnInit() { this.hideSearch(); - this.notificationLengthData(); - - this.eventrigger.getObservable().subscribe((data) => { + this.update() + /* this.notificationLengthData(); + this.eventrigger.getObservable().subscribe(async (data) => { if (data.notification === "delete" || "recive") { - setInterval(()=> - { - this.notificationLengthData(); - console.log('SETTIMEOUT') - }, 1000); - //clearInterval(timer) + await this.notificationLengthData(); console.log('Current badge: ', this.notificationLength) - console.log('Deleted notification', data) + console.log('Deleted notification', data.notification) } - }) - - /* if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - console.log('Notifications not supported') - this.UpdateNotificationCount(); - } else { - this.UpdateNotificationCount(); - } */ + }) */ } - update() { + update() { + setInterval(() => { + this.notificationLengthData(); + }, 5000) } @@ -94,9 +86,10 @@ export class HeaderPage implements OnInit { /* var data = JSON.parse(value); */ this.notificationLength = value.length; + console.log('Timer badge count 1', this.notificationLength) }) - console.log('Timer badge count', this.notificationLength) + console.log('Timer badge count2', this.notificationLength) } hideSearch() {