fix merge

This commit is contained in:
Peter Maquiran
2023-01-09 14:42:33 +01:00
parent d4557a22b1
commit 6fad1bd688
2 changed files with 26 additions and 26 deletions
+20 -20
View File
@@ -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.
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.
///123// import * as SentrySibling from '@sentry/angular';
///123//import * as Sentry from '@sentry/capacitor';
// The e xample is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.
// For automatic instrumentation (highly recommended)
import { Integration } from '@sentry/types';
import { BrowserTracing } from '@sentry/tracing';
///123//import { Integration } from '@sentry/types';
///123//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';
Sentry.init(
{
dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
///123// Sentry.init(
///123// {
///123// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',
// To set your release and dist versions
release: 'gabinetedigital@1.0.0',
dist: '1',
///123// release: 'gabinetedigital@1.0.0',
///123// dist: '1',
// Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
// We recommend adjusting this value in production.
tracesSampleRate: 1.0,
integrations: [
new BrowserTracing({
tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
}) as Integration,
]
},
///123// tracesSampleRate: 1.0,
///123// integrations: [
///123// new BrowserTracing({
///123// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],
///123// }) as Integration,
///123// ]
///123// },
// Forward the init method to the sibling Framework.
SentrySibling.init
);
///123// SentrySibling.init
///123//);
@NgModule({
declarations: [AppComponent],
entryComponents: [],
@@ -145,7 +145,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
{
provide: ErrorHandler,
// Attach the Sentry ErrorHandler
useValue: SentrySibling.createErrorHandler(),
///123// useValue: SentrySibling.createErrorHandler(),
},
StatusBar,
//SplashScreen,
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "135680a58",
"SHA": "135680a58fadae1b7208e79c23d452a9a74fe6d3",
"shortSHA": "d4557a22b",
"SHA": "d4557a22b167467a079db982f9d103ee0d1052bc",
"branch": "consoleCle2",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jan 9 14:24:32 2023 +0100'",
"lastCommitMessage": "status",
"lastCommitNumber": "4620",
"lastCommitTime": "'Mon Jan 9 14:25:49 2023 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4621",
"change": "",
"changeStatus": "On branch consoleCle2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package.json\n\tmodified: version/git-version.ts",
"changeStatus": "On branch consoleCle2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/app.module.ts",
"changeAuthor": "peter.maquiran"
}