diff --git a/.gitignore b/.gitignore index 247119202..0dbfed9eb 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ android/** !android/app/ android/app/** !android/app/src +!android/app/google-services.json android/app/src/** !android/app/src/build.gradle !android/app/src/main @@ -74,4 +75,6 @@ ___android/ _android/ _www/ www2020 -android copy/ \ No newline at end of file +android copy/ +report.* +src/plugin/src/ \ No newline at end of file diff --git a/android/app/google-services.json b/android/app/google-services.json new file mode 100644 index 000000000..0a455bcff --- /dev/null +++ b/android/app/google-services.json @@ -0,0 +1,40 @@ +{ + "project_info": { + "project_number": "800733765231", + "firebase_url": "https://gabinete-digital-2020.firebaseio.com", + "project_id": "gabinete-digital-2020", + "storage_bucket": "gabinete-digital-2020.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a", + "android_client_info": { + "package_name": "com.gpr.gabinetedigital" + } + }, + "oauth_client": [ + { + "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0a921fe6f..989436b41 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -39,4 +39,5 @@ + diff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png index e31573b4f..a105429d0 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-land-ldpi/splash.png b/android/app/src/main/res/drawable-land-ldpi/splash.png new file mode 100644 index 000000000..8c2997fd8 Binary files /dev/null and b/android/app/src/main/res/drawable-land-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png index f7a64923e..fd8d26789 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png index 807725501..c3f403ace 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png index 14c6c8fe3..d408970a1 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png index 244ca2506..92dfe6789 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png index 74faaa583..bcf2c145d 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-port-ldpi/splash.png b/android/app/src/main/res/drawable-port-ldpi/splash.png new file mode 100644 index 000000000..343fc73b6 Binary files /dev/null and b/android/app/src/main/res/drawable-port-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png index e944f4ad4..f1e215eb3 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png index 564a82ff9..6294ba453 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png index bfabe6871..172eaf57e 100644 Binary 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 diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png index 692907126..cccd3bdfe 100644 Binary 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 diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index c023e5059..15eaf4714 100644 Binary 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 diff --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 index 2127973b2..d4f266cb4 100644 Binary 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 diff --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 index b441f37d6..a7f8349ab 100644 Binary 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 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 72905b854..b33700dc4 100644 Binary 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 diff --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 index 8ed0605c2..fb3f61a63 100644 Binary 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 diff --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 index 9502e47a2..479ef13f4 100644 Binary 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 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 4d1e07710..69befbc66 100644 Binary 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 diff --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 index df0f15880..0fb92a171 100644 Binary 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 diff --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 index 853db043d..ec4b159b5 100644 Binary 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 diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 6cdf97c11..f8163688b 100644 Binary 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 diff --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 index 2960cbb61..2a97c3ef8 100644 Binary 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 diff --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 index 8e3093a86..8b0453118 100644 Binary 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 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 46de6e255..7842539af 100644 Binary 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 diff --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 index d2ea9abed..3359e927c 100644 Binary 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 diff --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 index a40d73e9c..018996568 100644 Binary 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 diff --git a/package-lock.json b/package-lock.json index b9b39055c..761c43cce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@awesome-cordova-plugins/file": "^5.41.0", "@awesome-cordova-plugins/file-opener": "^5.41.0", "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", - "@capacitor/android": "^4.6.1", + "@capacitor/android": "^4.6.2", "@capacitor/app": "^4.1.1", "@capacitor/browser": "^4.1.0", "@capacitor/camera": "^4.1.4", @@ -151,7 +151,6 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^15.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", @@ -3254,9 +3253,9 @@ "license": "MIT" }, "node_modules/@capacitor/android": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz", - "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz", + "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==", "peerDependencies": { "@capacitor/core": "^4.6.0" } @@ -6783,6 +6782,7 @@ "version": "2.10.0", "license": "MIT", "optional": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -10966,13 +10966,6 @@ "yarn": ">=1" } }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "license": "MIT", - "dependencies": { - "node-fetch": "2.6.7" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "license": "MIT", @@ -12024,8 +12017,10 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1011705", - "license": "BSD-3-Clause" + "version": "0.0.869402", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", + "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", + "peer": true }, "node_modules/di": { "version": "0.0.1", @@ -13262,6 +13257,7 @@ "node_modules/extract-zip": { "version": "2.0.1", "license": "BSD-2-Clause", + "peer": true, "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -13280,6 +13276,7 @@ "node_modules/extract-zip/node_modules/get-stream": { "version": "5.2.0", "license": "MIT", + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -26065,30 +26062,34 @@ } }, "node_modules/puppeteer": { - "version": "15.3.0", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz", + "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==", + "deprecated": "< 18.1.0 is no longer supported", "hasInstallScript": true, - "license": "Apache-2.0", + "peer": true, "dependencies": { - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.8.0" + "debug": "^4.1.0", + "devtools-protocol": "0.0.869402", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.1.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "engines": { - "node": ">=14.1.0" + "node": ">=10.18.1" } }, "node_modules/puppeteer/node_modules/debug": { "version": "4.3.4", "license": "MIT", + "peer": true, "dependencies": { "ms": "2.1.2" }, @@ -26101,25 +26102,6 @@ } } }, - "node_modules/puppeteer/node_modules/ws": { - "version": "8.8.0", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/q": { "version": "1.5.1", "license": "MIT", @@ -36454,6 +36436,7 @@ "node_modules/unbzip2-stream": { "version": "1.4.3", "license": "MIT", + "peer": true, "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -40534,9 +40517,9 @@ "version": "0.2.3" }, "@capacitor/android": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz", - "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz", + "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==", "requires": {} }, "@capacitor/app": { @@ -43074,6 +43057,7 @@ "@types/yauzl": { "version": "2.10.0", "optional": true, + "peer": true, "requires": { "@types/node": "*" } @@ -45776,12 +45760,6 @@ "cross-spawn": "^7.0.1" } }, - "cross-fetch": { - "version": "3.1.5", - "requires": { - "node-fetch": "2.6.7" - } - }, "cross-spawn": { "version": "7.0.3", "requires": { @@ -46431,7 +46409,10 @@ "version": "1.0.1" }, "devtools-protocol": { - "version": "0.0.1011705" + "version": "0.0.869402", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", + "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", + "peer": true }, "di": { "version": "0.0.1", @@ -47273,6 +47254,7 @@ }, "extract-zip": { "version": "2.0.1", + "peer": true, "requires": { "@types/yauzl": "^2.9.1", "debug": "^4.1.1", @@ -47282,6 +47264,7 @@ "dependencies": { "get-stream": { "version": "5.2.0", + "peer": true, "requires": { "pump": "^3.0.0" } @@ -55848,31 +55831,31 @@ } }, "puppeteer": { - "version": "15.3.0", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz", + "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==", + "peer": true, "requires": { - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.8.0" + "debug": "^4.1.0", + "devtools-protocol": "0.0.869402", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.1.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "dependencies": { "debug": { "version": "4.3.4", + "peer": true, "requires": { "ms": "2.1.2" } - }, - "ws": { - "version": "8.8.0", - "requires": {} } } }, @@ -63007,6 +62990,7 @@ }, "unbzip2-stream": { "version": "1.4.3", + "peer": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" diff --git a/package.json b/package.json index a9864af91..30e7a5920 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "dev:share": "lite-server --baseDir=share", "install:chromium": "node node_modules/puppeteer/install.js", "build:version": "node ./version/git-version.js", - "ionic-build": "ionic cap run android --prod" + "ionic-build": "ionic cap run android --prod", + "prepare": "husky install" }, "private": true, "dependencies": { @@ -39,7 +40,7 @@ "@awesome-cordova-plugins/file": "^5.41.0", "@awesome-cordova-plugins/file-opener": "^5.41.0", "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", - "@capacitor/android": "^4.6.1", + "@capacitor/android": "^4.6.2", "@capacitor/app": "^4.1.1", "@capacitor/browser": "^4.1.0", "@capacitor/camera": "^4.1.4", @@ -160,7 +161,6 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^15.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6c6e6ea80..ac8fb2155 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -236,7 +236,7 @@ -
+
diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b868f0e40..25ebeb265 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,16 +1,16 @@ import { versionData } from '../../version/git-version' export const environment = { // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - //apiURL: 'https://gd-api.oapr.gov.ao/api/', - apiURL: 'https://API.DONEIT.CO.AO/api/', + apiURL: 'https://gd-api.oapr.gov.ao/api/', + //apiURL: 'https://API.DONEIT.CO.AO/api/', //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', - apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', - apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + //apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + //apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', /* apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */ production: false, diff --git a/tsconfig.worker.json b/tsconfig.worker.json new file mode 100644 index 000000000..39ec19374 --- /dev/null +++ b/tsconfig.worker.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/worker", + "lib": [ + "es2018", + "webworker" + ], + "types": [] + }, + "include": [ + "src/**/*.worker.ts" + ] + } \ No newline at end of file diff --git a/version/git-static-version.ts b/version/git-static-version.ts new file mode 100644 index 000000000..e69de29bb diff --git a/version/git-version.ts b/version/git-version.ts index d53e8308e..de82c28d7 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "074861205", - "SHA": "07486120540f400bc2e84daba1368cd29f2d166c", + "shortSHA": "fbd50137f", + "SHA": "fbd50137f32a1154a8d04324ea6f8147e206b422", "branch": "feature_build_ios_v1_3", - "lastCommitAuthor": "'Lorito Tiago'", - "lastCommitTime": "'Mon Jan 16 15:06:27 2023 +0100'", - "lastCommitMessage": "Build and send new ios version", - "lastCommitNumber": "4628", + "lastCommitAuthor": "'Peter Maquiran'", + "lastCommitTime": "'Tue Jan 24 15:56:47 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "4629", "change": "", - "changeStatus": "On branch feature_build_ios_v1_3\nYour branch is behind 'origin/feature_build_ios_v1_3' by 1 commit, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: report.20230116.142547.31280.0.001.json\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/guards/login.guard.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/models/chatMethod.ts\n\tmodified: src/app/models/message.model.ts\n\tmodified: src/app/models/notifications.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tnew file: src/app/pages/gabinete-digital/list.worker.js\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/pages/login/login.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tmodified: src/app/services/attachments.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/chat-methods.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/chat/viewed-message.service.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/first-enter.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/organic-entity.service.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/services/search.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts\n\tmodified: src/app/store/localstore.service.ts\n\tnew file: src/assets/images/theme/blue/search.svg\n\tnew file: src/assets/images/theme/gov/search.svg\n\tnew file: src/assets/images/theme/tribunal/search.svg\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss\n\tmodified: src/index.html\n\tmodified: src/main.ts\n\tnew file: src/plugin/src/connection/dbSwtich.d.ts\n\tnew file: src/plugin/src/connection/dbSwtich.js\n\tnew file: src/plugin/src/connection/indexedDb/connector.d.ts\n\tnew file: src/plugin/src/connection/indexedDb/connector.js\n\tnew file: src/plugin/src/connection/indexedDb/dynamicChange.d.ts\n\tnew file: src/plugin/src/connection/indexedDb/dynamicChange.js\n\tnew file: src/plugin/src/connection/indexedDb/indexedb.d.ts\n\tnew file: src/plugin/src/connection/indexedDb/indexedb.js\n\tnew file: src/plugin/src/connection/intreface.d.ts\n\tnew file: src/plugin/src/connection/intreface.js\n\tnew file: src/plugin/src/connection/worker.d.ts\n\tnew file: src/plugin/src/connection/worker.js\n\tnew file: src/plugin/src/connection/worker.queue.d.ts\n\tnew file: src/plugin/src/connection/worker.queue.js\n\tnew file: src/plugin/src/index.d.ts\n\tnew file: src/plugin/src/index.js\n\tnew file: src/plugin/src/models/field/allFields.d.ts\n\tnew file: src/plugin/src/models/field/allFields.js\n\tnew file: src/plugin/src/models/field/field.d.ts\n\tnew file: src/plugin/src/models/field/field.js\n\tnew file: src/plugin/src/models/field/fields.d.ts\n\tnew file: src/plugin/src/models/field/fields.interface.d.ts\n\tnew file: src/plugin/src/models/field/fields.interface.js\n\tnew file: src/plugin/src/models/field/fields.js\n\tnew file: src/plugin/src/models/field/interface.d.ts\n\tnew file: src/plugin/src/models/field/interface.js\n\tnew file: src/plugin/src/models/mode-migrations.d.ts\n\tnew file: src/plugin/src/models/mode-migrations.js\n\tnew file: src/plugin/src/models/model-from.d.ts\n\tnew file: src/plugin/src/models/model-from.js\n\tnew file: src/plugin/src/models/model-manager.d.ts\n\tnew file: src/plugin/src/models/model-manager.js\n\tnew file: src/plugin/src/models/model.d.ts\n\tnew file: src/plugin/src/models/model.interface.d.ts\n\tnew file: src/plugin/src/models/model.interface.js\n\tnew file: src/plugin/src/models/model.js\n\tnew file: src/plugin/src/models/model.reader.d.ts\n\tnew file: src/plugin/src/models/model.reader.js\n\tnew file: src/plugin/src/models/register-model.d.ts\n\tnew file: src/plugin/src/models/register-model.js\n\tnew file: src/plugin/src/sql/Operators/Object-condition-operator.d.ts\n\tnew file: src/plugin/src/sql/Operators/Object-condition-operator.js\n\tnew file: src/plugin/src/sql/Operators/args-attributes.d.ts\n\tnew file: src/plugin/src/sql/Operators/args-attributes.js\n\tnew file: src/plugin/src/sql/Operators/object-operator.d.ts\n\tnew file: src/plugin/src/sql/Operators/object-operator.js\n\tnew file: src/plugin/src/sql/Operators/operators.d.ts\n\tnew file: src/plugin/src/sql/Operators/operators.js\n\tnew file: src/plugin/src/sql/Operators/query-bulder.d.ts\n\tnew file: src/plugin/src/sql/Operators/query-bulder.js\n\tnew file: src/plugin/src/sql/methods/filter.d.ts\n\tnew file: src/plugin/src/sql/methods/filter.js\n\tnew file: src/plugin/src/sql/methods/methods.d.ts\n\tnew file: src/plugin/src/sql/methods/methods.js\n\tnew file: src/plugin/src/sql/query/interface.d.ts\n\tnew file: src/plugin/src/sql/query/interface.js\n\tnew file: src/plugin/src/sql/sqlObject/sql.d.ts\n\tnew file: src/plugin/src/sql/sqlObject/sql.js\n\tnew file: src/plugin/src/sql/sqlObject/sqlObject.d.ts\n\tnew file: src/plugin/src/sql/sqlObject/sqlObject.js\n\tnew file: src/plugin/src/utils.d.ts\n\tnew file: src/plugin/src/utils.js", + "changeStatus": "On branch feature_build_ios_v1_3\nYour branch and 'origin/feature_build_ios_v1_3' have diverged,\nand have 1 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tnew file: android/app/google-services.json\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: android/app/src/main/res/drawable-land-hdpi/splash.png\n\tnew file: android/app/src/main/res/drawable-land-ldpi/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\tnew file: android/app/src/main/res/drawable-port-ldpi/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: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/environments/environment.ts\n\tnew file: tsconfig.worker.json\n\tnew file: version/git-static-version.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file