diff --git a/Mohem/config.xml b/Mohem/config.xml index 4b7d39f4..9676bc4d 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,8 +1,8 @@ - - MOHEMM + + Al Habib MOHEMM an app created by cloud Solutions - HMG + HMG diff --git a/Mohem/google-services.json b/Mohem/google-services.json index 46d93642..4dfaa0d3 100644 --- a/Mohem/google-services.json +++ b/Mohem/google-services.json @@ -1,42 +1,35 @@ { "project_info": { - "project_number": "679409052782", - "firebase_url": "https://mohemm-dce93.firebaseio.com", - "project_id": "mohemm-dce93", - "storage_bucket": "mohemm-dce93.appspot.com" + "project_number": "448880075189", + "firebase_url": "https://al-habib-mohemm.firebaseio.com", + "project_id": "al-habib-mohemm", + "storage_bucket": "al-habib-mohemm.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:679409052782:android:dba155ac0859d7fea78a7f", + "mobilesdk_app_id": "1:448880075189:android:5bb4821d515a826d88b9fc", "android_client_info": { - "package_name": "hmg.cloudSolutions.mohem" + "package_name": "com.cloudsolutions.alhabibmohemm" } }, "oauth_client": [ { - "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com", + "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyDgWjuSBIKGghWxYg_KGBRIZTi-O_UA8mU" + "current_key": "AIzaSyC8nrli7eyuRNow8nF-QHvDMOxqUkj6fEw" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com", + "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com", "client_type": 3 - }, - { - "client_id": "679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "com.cloudsolutions.mohemm" - } } ] } diff --git a/Mohem/package.json b/Mohem/package.json index 49311c3b..72b337b4 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -195,7 +195,20 @@ "cordova-plugin-fingerprint-aio": { "FACEID_USAGE_DESCRIPTION": "User Authentication" }, - "cordova-plugin-firebasex": {} + "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" + } }, "platforms": [ "browser", diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index caa016df..f1e3f960 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -29,7 +29,7 @@ export class AppComponent implements OnInit, AfterViewInit { user_image: any = '../assets/imgs/profile.png'; menuSide = 'left'; notBadge: number; - companyUrl = '../assets/imgs/CS.png'; + companyUrl = '../assets/imgs/HMG.png'; companyDesc = 'Powered By Cloud Solutions'; direction = 'ltr'; User_Job_name: string; @@ -122,7 +122,7 @@ export class AppComponent implements OnInit, AfterViewInit { if (user) { this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL - : '../assets/imgs/CS.png'; + : '../assets/imgs/HMG.png'; this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 9c2bcca4..9f9bd8d9 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -126,7 +126,7 @@ export class AuthenticationService { public setPublicFields(request: Request): Request { request.VersionID = 2.0;//2.0,1.4 - request.Channel = 31; + request.Channel = 33; request.LanguageID = TranslatorService.getCurrentLanguageCode(); //request.IPAdress = '10.10.10.10'; //request.SessionID = "any thing"; // ??? required for not authorized login funny @@ -203,7 +203,7 @@ export class AuthenticationService { public login(request: LoginRequest, onError: any, errorLabel: string): Observable { this.setPublicFields(request); - request.P_APP_VERSION="CS"; + request.P_APP_VERSION="HMG"; return this.con.post(AuthenticationService.login, request, onError, errorLabel); } @@ -458,7 +458,7 @@ export class AuthenticationService { public checkUserAuthentication(request: CheckUserAuthenticationRequest, onError: any, errorLabel: string) : Observable { this.setPublicFields(request); - request.P_APP_VERSION="CS"; + request.P_APP_VERSION="HMG"; return this.con.post(AuthenticationService.userChecking, request, onError, errorLabel); } diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.html b/Mohem/src/app/hmg-common/ui/sms/sms.page.html index dce4f537..b8455104 100644 --- a/Mohem/src/app/hmg-common/ui/sms/sms.page.html +++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.html @@ -8,7 +8,7 @@ - +