diff --git a/Mohem/config.xml b/Mohem/config.xml index 20f4924f..f23adff8 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -114,7 +114,6 @@ - diff --git a/Mohem/package.json b/Mohem/package.json index 3c30b679..94d82c02 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -37,7 +37,7 @@ "@ionic-native/file": "^5.18.0", "@ionic-native/file-path": "^5.18.0", "@ionic-native/fingerprint-aio": "^5.18.0", - "@ionic-native/firebase-x": "^5.21.5", + "@ionic-native/firebase-x": "^5.34.0", "@ionic-native/geolocation": "^5.10.0", "@ionic-native/globalization": "^5.18.0", "@ionic-native/health": "^5.4.0", @@ -82,7 +82,7 @@ "cordova-plugin-file": "^6.0.2", "cordova-plugin-filepath": "^1.5.6", "cordova-plugin-fingerprint-aio": "^3.0.0", - "cordova-plugin-firebasex": "^7.0.2", + "cordova-plugin-firebasex": "^13.0.0", "cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", "cordova-plugin-inappbrowser": "^3.1.0", @@ -172,9 +172,6 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-android-support-gradle-release": { - "ANDROID_SUPPORT_VERSION": "27.+" - }, "cordova.plugins.diagnostic": { "ANDROID_SUPPORT_VERSION": "28.+" }, @@ -197,20 +194,6 @@ "cordova-plugin-fingerprint-aio": { "FACEID_USAGE_DESCRIPTION": "User Authentication" }, - "cordova-plugin-firebasex": { - "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", - "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", - "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", - "ANDROID_ICON_ACCENT": "#FF00FFFF", - "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", - "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1", - "ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0", - "ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3", - "ANDROID_FIREBASE_PERF_VERSION": "19.0.1", - "ANDROID_FIREBASE_AUTH_VERSION": "19.1.0", - "ANDROID_CRASHLYTICS_VERSION": "2.10.1", - "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1" - }, "cordova-plugin-androidx": {}, "cordova-plugin-androidx-adapter": {}, "cordova-plugin-background-geolocation": { @@ -218,7 +201,33 @@ }, "phonegap-nfc": {}, "wifiwizard2": {}, - "cordova-plugin-x-socialsharing": {} + "cordova-plugin-x-socialsharing": {}, + "cordova-plugin-firebasex": { + "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", + "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", + "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", + "ANDROID_ICON_ACCENT": "#FF00FFFF", + "ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false", + "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", + "ANDROID_PLAY_SERVICES_AUTH_VERSION": "19.0.0", + "ANDROID_FIREBASE_ANALYTICS_VERSION": "19.0.0", + "ANDROID_FIREBASE_MESSAGING_VERSION": "22.0.0", + "ANDROID_FIREBASE_CONFIG_VERSION": "21.0.0", + "ANDROID_FIREBASE_PERF_VERSION": "20.0.1", + "ANDROID_FIREBASE_AUTH_VERSION": "21.0.1", + "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "20.0.0", + "ANDROID_FIREBASE_FIRESTORE_VERSION": "23.0.1", + "ANDROID_FIREBASE_FUNCTIONS_VERSION": "20.0.0", + "ANDROID_FIREBASE_IID_VERSION": "21.1.0", + "ANDROID_FIREBASE_INSTALLATIONS_VERSION": "17.0.0", + "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "18.0.1", + "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "18.0.1", + "ANDROID_GSON_VERSION": "2.8.7", + "ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.0" + }, + "cordova-android-support-gradle-release": { + "ANDROID_SUPPORT_VERSION": "27.+" + } }, "platforms": [ "android", diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index 40b87677..391e67ce 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -38,8 +38,8 @@ - - + +

{{item.title_EN}}

{{item.body_EN}}

diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.scss b/Mohem/src/app/backend-integrations/announcement/announcement.component.scss index 1aa39090..ab2f143d 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.scss +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.scss @@ -31,16 +31,19 @@ .class-item-close { } -.image-item { - // width: 30%; - // height: 70%; - // margin-top: 30px; - // border: 1px solid white; - // border-radius: 11px; - // margin-bottom: 25px; +.image-item-en { + padding-left: 5px; width: 100px; - height: 100px; - margin-top: 1px; + min-height: 100px; + border: 5px solid white; + border-radius: 11px; + border-left: 0px; + border-right: 0px; +} +.image-item-ar { + padding-right: 5px; + width: 100px; + min-height: 100px; border: 5px solid white; border-radius: 11px; border-left: 0px; @@ -74,7 +77,7 @@ .item-list-first-h { font: normal normal bold 23px/24px Poppins; - letter-spacing: -1.38px; + letter-spacing: -0.3px; color: #ffffff; white-space: break-spaces; } @@ -130,3 +133,6 @@ width: 200px; } +.item-native { + padding-left: 5px !important; +} \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 18a71a22..0ea34a0a 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -39,6 +39,7 @@ import { Router } from '@angular/router'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { NFC, Ndef } from "@ionic-native/nfc/ngx" import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component'; +import { FirebaseX } from '@ionic-native/firebase-x/ngx'; @Component({ selector: 'app-home', @@ -158,7 +159,8 @@ export class HomePage implements OnInit { private platform: Platform, public backgroundGeolocation: BackgroundGeolocation, public modalController: ModalController, - private nfc: NFC + private nfc: NFC, + public firebasex: FirebaseX ) { this.events.subscribe('img-change', displayImg => { this.userImage = this.sanitizer.bypassSecurityTrustUrl( @@ -188,6 +190,27 @@ export class HomePage implements OnInit { } } + testy() { + // var logMessage = 'testing'; + // var stackTrace = null; + // this.firebasex.logError(logMessage, stackTrace).then( result => { + // console.log('posted successfully;'); + // }); + var document = { + "a_string": "foo", + "a_list": [1, 2, 3], + "an_object": { + "an_integer": 1, + } + }; + var collection = "test"; + this.firebasex.addDocumentToFirestoreCollection(document, collection, function(documentId){ + console.log("Successfully added document with id="+documentId); + }, function(error){ + console.error("Error adding document: "+error); + }); + } + ionViewWillEnter() { this.common.startLoading(); this.common.sharedService.setSharedData(true, 'loadWorkList'); diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html index a74a5e39..cbe2e50f 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html @@ -57,7 +57,7 @@