mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
merge
This commit is contained in:
+19
-19
@@ -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,
|
||||
|
||||
@@ -51,8 +51,7 @@
|
||||
</ion-buttons>
|
||||
</div>
|
||||
<div class="line"></div>
|
||||
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationdata.length}} novas notificações</ion-label>
|
||||
<ion-label (click)="asyncNotification()" *ngIf="!notificationdata">0 novas notificações</ion-label>
|
||||
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
|
||||
</div>
|
||||
</ion-header>
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ export class ProfilePage implements OnInit {
|
||||
isProfileOpen = false
|
||||
hideImage = false
|
||||
logoutOut = false
|
||||
notificationStatus = '';
|
||||
|
||||
constructor(private modalController: ModalController,
|
||||
private authService: AuthService,
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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 = {}) {
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user