mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
12 lines
18 KiB
TypeScript
12 lines
18 KiB
TypeScript
export let versionData = {
|
|
"shortSHA": "0aa0448ae",
|
|
"SHA": "0aa0448ae797b3600ffd643c32db7af181ae3fec",
|
|
"branch": "consoleCle",
|
|
"lastCommitAuthor": "'Eudes Inácio'",
|
|
"lastCommitTime": "'Tue Dec 27 15:37:35 2022 +0100'",
|
|
"lastCommitMessage": "merge with Peter branch",
|
|
"lastCommitNumber": "4578",
|
|
"change": "diff --cc src/environments/environment.prod.ts\nindex 5fdf15904,e37f55ce1..000000000\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\ndiff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png\nindex e31573b4f..a105429d0 100644\nBinary files a/android/app/src/main/res/drawable-land-hdpi/splash.png and b/android/app/src/main/res/drawable-land-hdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png\nindex f7a64923e..fd8d26789 100644\nBinary files a/android/app/src/main/res/drawable-land-mdpi/splash.png and b/android/app/src/main/res/drawable-land-mdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png\nindex 807725501..c3f403ace 100644\nBinary files a/android/app/src/main/res/drawable-land-xhdpi/splash.png and b/android/app/src/main/res/drawable-land-xhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png\nindex 14c6c8fe3..d408970a1 100644\nBinary files a/android/app/src/main/res/drawable-land-xxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png\nindex 244ca2506..92dfe6789 100644\nBinary files a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png\nindex 74faaa583..bcf2c145d 100644\nBinary files a/android/app/src/main/res/drawable-port-hdpi/splash.png and b/android/app/src/main/res/drawable-port-hdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png\nindex e944f4ad4..f1e215eb3 100644\nBinary files a/android/app/src/main/res/drawable-port-mdpi/splash.png and b/android/app/src/main/res/drawable-port-mdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png\nindex 564a82ff9..6294ba453 100644\nBinary files a/android/app/src/main/res/drawable-port-xhdpi/splash.png and b/android/app/src/main/res/drawable-port-xhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png\nindex bfabe6871..172eaf57e 100644\nBinary files a/android/app/src/main/res/drawable-port-xxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png\nindex 692907126..cccd3bdfe 100644\nBinary files a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ\ndiff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png\nindex c023e5059..15eaf4714 100644\nBinary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ\ndiff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\nindex 2127973b2..d4f266cb4 100644\nBinary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ\ndiff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\nindex b441f37d6..a7f8349ab 100644\nBinary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ\ndiff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png\nindex 72905b854..b33700dc4 100644\nBinary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ\ndiff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\nindex 8ed0605c2..fb3f61a63 100644\nBinary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ\ndiff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\nindex 9502e47a2..479ef13f4 100644\nBinary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ\ndiff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png\nindex 4d1e07710..69befbc66 100644\nBinary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ\ndiff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\nindex df0f15880..0fb92a171 100644\nBinary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ\ndiff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\nindex 853db043d..ec4b159b5 100644\nBinary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\nindex 6cdf97c11..f8163688b 100644\nBinary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\nindex 2960cbb61..2a97c3ef8 100644\nBinary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\nindex 8e3093a86..8b0453118 100644\nBinary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\nindex 46de6e255..7842539af 100644\nBinary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\nindex d2ea9abed..3359e927c 100644\nBinary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ\ndiff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\nindex a40d73e9c..018996568 100644\nBinary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ\ndiff --git a/src/app/app.module.ts b/src/app/app.module.ts\nindex 93c994918..c3571de3b 100644\n--- a/src/app/app.module.ts\n+++ b/src/app/app.module.ts\n@@ -69,35 +69,35 @@ import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';\n \n \n // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.\n-/////import * as SentrySibling from '@sentry/angular';\n-/////import * as Sentry from '@sentry/capacitor';\n+import * as SentrySibling from '@sentry/angular';\n+import * as Sentry from '@sentry/capacitor';\n // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.\n // For automatic instrumentation (highly recommended)\n-/////import { Integration } from '@sentry/types';\n-/////import { BrowserTracing } from '@sentry/tracing';\n+import { Integration } from '@sentry/types';\n+import { BrowserTracing } from '@sentry/tracing';\n \n /* import { FCM } from '@ionic-native/fcm/ngx';\n import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */\n //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';\n \n-///// Sentry.init(\n-///// {\n-///// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',\n-///// // To set your release and dist versions\n-///// release: 'gabinetedigital@1.0.0',\n-///// dist: '1',\n-///// // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.\n-///// // We recommend adjusting this value in production.\n-///// tracesSampleRate: 1.0,\n-///// integrations: [\n-///// new BrowserTracing({\n-///// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],\n-///// }) as Integration,\n-///// ]\n-///// },\n-///// // Forward the init method to the sibling Framework.\n-///// SentrySibling.init\n-/////);\n+ Sentry.init(\n+ {\n+ dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',\n+ // To set your release and dist versions\n+ release: 'gabinetedigital@1.0.0',\n+ dist: '1',\n+ // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.\n+ // We recommend adjusting this value in production.\n+ tracesSampleRate: 1.0,\n+ integrations: [\n+ new BrowserTracing({\n+ tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],\n+ }) as Integration,\n+ ]\n+ },\n+ // Forward the init method to the sibling Framework.\n+ SentrySibling.init\n+);\n @NgModule({\n declarations: [AppComponent],\n entryComponents: [],\n@@ -145,7 +145,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */\n {\n provide: ErrorHandler,\n // Attach the Sentry ErrorHandler\n- /////useValue: SentrySibling.createErrorHandler(),\n+ useValue: SentrySibling.createErrorHandler(),\n },\n StatusBar,\n //SplashScreen,\ndiff --git a/src/main.ts b/src/main.ts\nindex bb9e4aca1..62e890eda 100644\n--- a/src/main.ts\n+++ b/src/main.ts\n@@ -8,35 +8,35 @@ import { defineCustomElements } from '@ionic/pwa-elements/loader';\n \n import \"hammerjs\"; // HAMMER TIME\n \n-/////import * as Sentry from '@sentry/capacitor';\n+import * as Sentry from '@sentry/capacitor';\n // The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.\n-/////import * as SentrySibling from '@sentry/angular';\n+import * as SentrySibling from '@sentry/angular';\n // For automatic instrumentation (highly recommended)\n-///// import { Integration } from '@sentry/types';\n-///// import { BrowserTracing } from '@sentry/tracing';\n+ import { Integration } from '@sentry/types';\n+ import { BrowserTracing } from '@sentry/tracing';\n \n if (environment.production) {\n enableProdMode();\n }\n \n-///// Sentry.init(\n-///// {\n-///// dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',\n-///// // To set your release and dist versions\n-///// release: 'gabinetedigital@1.0.0',\n-///// dist: '1',\n-///// // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.\n- ///// // We recommend adjusting this value in production.\n-///// tracesSampleRate: 1.0,\n-///// integrations: [\n-///// new BrowserTracing({\n-///// tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],\n-///// }) as Integration,\n-///// ]\n-///// },\n+ Sentry.init(\n+ {\n+ dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176',\n+ // To set your release and dist versions\n+ release: 'gabinetedigital@1.0.0',\n+ dist: '1',\n+ // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.\n+ // We recommend adjusting this value in production.\n+ tracesSampleRate: 1.0,\n+ integrations: [\n+ new BrowserTracing({\n+ tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'],\n+ }) as Integration,\n+ ]\n+ },\n // Forward the init method to the sibling Framework.\n-///// SentrySibling.init\n-/////);\n+ SentrySibling.init\n+);\n \n platformBrowserDynamic().bootstrapModule(AppModule)\n .catch(err => console.log(err));",
|
|
"changeStatus": "On branch consoleCle\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tdeleted: android/.gitignore\n\tdeleted: android/.idea/compiler.xml\n\tdeleted: android/.idea/jarRepositories.xml\n\tdeleted: android/.idea/misc.xml\n\tdeleted: android/app/.gitignore\n\tdeleted: android/app/build.gradle\n\tdeleted: android/app/capacitor.build.gradle\n\tdeleted: android/app/proguard-rules.pro\n\tdeleted: android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tdeleted: android/app/src/main/assets/capacitor.config.json\n\tdeleted: android/app/src/main/assets/capacitor.plugins.json\n\tdeleted: android/app/src/main/res/layout/activity_main.xml\n\tdeleted: android/app/src/main/res/values/ic_launcher_background.xml\n\tdeleted: android/app/src/main/res/values/strings.xml\n\tdeleted: android/app/src/main/res/values/styles.xml\n\tdeleted: android/app/src/main/res/xml/config.xml\n\tdeleted: android/app/src/main/res/xml/file_paths.xml\n\tdeleted: android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java\n\tdeleted: android/build.gradle\n\tdeleted: android/capacitor.settings.gradle\n\tdeleted: android/gradle.properties\n\tdeleted: android/gradle/wrapper/gradle-wrapper.jar\n\tdeleted: android/gradle/wrapper/gradle-wrapper.properties\n\tdeleted: android/gradlew\n\tdeleted: android/gradlew.bat\n\tdeleted: android/settings.gradle\n\tdeleted: android/variables.gradle\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: src/environments/environment.prod.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: android/app/src/main/res/drawable-land-hdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-hdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\n\tmodified: src/app/app.module.ts\n\tmodified: src/main.ts\n\nUntracked files:\n (use \"git add <file>...\" to include in what will be committed)\n\tandroid/app/src/main/res/drawable-land-ldpi/\n\tandroid/app/src/main/res/drawable-port-ldpi/\n\tandroid_/",
|
|
"changeAuthor": "equilibrium\\eudes.inacio"
|
|
} |