diff --git a/src/app/app.module.ts b/src/app/app.module.ts index dafcf857e..01b6fe907 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -69,35 +69,35 @@ import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular. -/////123//// import * as SentrySibling from '@sentry/angular'; -/////123////import * as Sentry from '@sentry/capacitor'; + import * as SentrySibling from '@sentry/angular'; +import * as Sentry from '@sentry/capacitor'; // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular. // For automatic instrumentation (highly recommended) -/////123////import { Integration } from '@sentry/types'; -/////123////import { BrowserTracing } from '@sentry/tracing'; +import { Integration } from '@sentry/types'; +import { BrowserTracing } from '@sentry/tracing'; /* 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'; -/////123//// Sentry.init( -/////123//// { -/////123//// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176', + Sentry.init( + { + dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176', // To set your release and dist versions -/////123//// release: 'gabinetedigital@1.0.0', -/////123//// dist: '1', + release: 'gabinetedigital@1.0.0', + dist: '1', // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring. // We recommend adjusting this value in production. -/////123//// tracesSampleRate: 1.0, -/////123//// integrations: [ -/////123//// new BrowserTracing({ -/////123//// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'], -/////123//// }) as Integration, -/////123//// ] -/////123//// }, + tracesSampleRate: 1.0, + integrations: [ + new BrowserTracing({ + tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'], + }) as Integration, + ] + }, // Forward the init method to the sibling Framework. -/////123//// SentrySibling.init -/////123////); + SentrySibling.init +); @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -145,7 +145,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ { provide: ErrorHandler, // Attach the Sentry ErrorHandler - /////123////useValue: SentrySibling.createErrorHandler(), + useValue: SentrySibling.createErrorHandler(), }, StatusBar, //SplashScreen, diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 748cc3ee3..18f0967c8 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -51,8 +51,7 @@
- {{notificationdata.length}} novas notificações - 0 novas notificações + {{notificationStatus}} diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 31ecc7608..257b64fa3 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -32,6 +32,7 @@ export class ProfilePage implements OnInit { isProfileOpen = false hideImage = false logoutOut = false + notificationStatus = ''; constructor(private modalController: ModalController, private authService: AuthService, diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index c47615462..b1c0a8d4d 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -164,7 +164,7 @@ export class LoginPage implements OnInit { this.ChatSystemService.loadChat(); } - // this.getToken(); + this.getToken(); if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) { if(this.sessionStore.hasPin) { diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index fc8ec9fbf..b069c6961 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -51,15 +51,6 @@ export class NotificationsService { /* private eventTriger: Events, */ /* private fcm: FCM */) { - this.storageService.get("Notifications").then((value) => { - - }).catch((error)=>{ - console.error('storage getnotification',error) - }).catch(() => { - - this.storageService.store("Notifications", []) - }) - } registerCallback(type: IdObject, funx: Function, object: any = {}) { diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 2307cbf54..3612e026d 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -80,9 +80,13 @@ export class HeaderPage implements OnInit { /* var data = JSON.parse(value); */ this.notificationLength = value.length; + }).catch((error) => { + if(!error) { + this.notificationLength = 0; + } else { + console.error('header storage get notification', error) + } }) - - } hideSearch() { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ae1bbd901..65fe42205 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,6 +1,6 @@ import { versionData } from '../../version/git-version' export const environment = { - //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiURL: 'https://gd-api.oapr.gov.ao/api/', //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', @@ -8,8 +8,8 @@ export const environment = { // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', - //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + /* apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', + apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', */ production: true, domain: 'paulo.pinto@gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto@gabinetedigital.local diff --git a/src/main.ts b/src/main.ts index 0113ed61c..c65fee587 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,35 +8,35 @@ import { defineCustomElements } from '@ionic/pwa-elements/loader'; import "hammerjs"; // HAMMER TIME -/////123////import * as Sentry from '@sentry/capacitor'; +/* import * as Sentry from '@sentry/capacitor'; // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular. -/////123////import * as SentrySibling from '@sentry/angular'; +import * as SentrySibling from '@sentry/angular'; // For automatic instrumentation (highly recommended) -/////123//// import { Integration } from '@sentry/types'; -/////123//// import { BrowserTracing } from '@sentry/tracing'; + import { Integration } from '@sentry/types'; + import { BrowserTracing } from '@sentry/tracing'; */ if (environment.production) { enableProdMode(); } -/////123//// Sentry.init( -/////123//// { -/////123//// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176', +/* Sentry.init( + { + dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176', // To set your release and dist versions -/////123//// release: 'gabinetedigital@1.0.0', -/////123//// dist: '1', + release: 'gabinetedigital@1.0.0', + dist: '1', // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring. // We recommend adjusting this value in production. -/////123//// integrations: [ -/////123//// new BrowserTracing({ -/////123//// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'], -/////123//// }) as Integration, -/////123//// ] -/////123//// }, + integrations: [ + new BrowserTracing({ + tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'], + }) as Integration, + ] + }, // Forward the init method to the sibling Framework. -/////123//// SentrySibling.init -/////123////); + SentrySibling.init +); */ platformBrowserDynamic().bootstrapModule(AppModule) diff --git a/version/git-version.ts b/version/git-version.ts index ff0b15816..dd13a7a05 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0d485672d", - "SHA": "0d485672d85fe521eb51dcdeec7f77e70579246b", + "shortSHA": "572ab6db7", + "SHA": "572ab6db7b8cc05e5b32362f48dbad03cc948d52", "branch": "develop_bitOut-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 4 14:45:17 2023 +0100'", + "lastCommitTime": "'Thu Jan 5 12:11:50 2023 +0100'", "lastCommitMessage": "save", - "lastCommitNumber": "4612", + "lastCommitNumber": "4613", "change": "", - "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/index/index-routing.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tnew file: src/app/services/chat/viewed-message.service.spec.ts\n\tnew file: src/app/services/chat/viewed-message.service.ts\n\tmodified: src/app/services/storage.service.ts\n\tmodified: src/app/store/localstore.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch develop_bitOut-fix\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/main.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file