diff --git a/Mohem/config.xml b/Mohem/config.xml
index 69b23c31..7bd54321 100644
--- a/Mohem/config.xml
+++ b/Mohem/config.xml
@@ -107,7 +107,7 @@
-
+
diff --git a/Mohem/package.json b/Mohem/package.json
index 4536dc0f..68c020db 100644
--- a/Mohem/package.json
+++ b/Mohem/package.json
@@ -24,7 +24,7 @@
"@ionic-native/android-permissions": "^5.18.0",
"@ionic-native/app-availability": "^5.18.0",
"@ionic-native/app-rate": "^5.18.0",
- "@ionic-native/background-geolocation": "^5.4.0",
+ "@ionic-native/background-geolocation": "^5.30.0",
"@ionic-native/badge": "^5.18.0",
"@ionic-native/barcode-scanner": "^5.18.0",
"@ionic-native/base64": "^5.18.0",
@@ -161,7 +161,9 @@
"cordova-plugin-badge": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-datepicker": {},
- "cordova-plugin-geolocation": {},
+ "cordova-plugin-geolocation": {
+ "GPS_REQUIRED": "true"
+ },
"phonegap-plugin-barcodescanner": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
@@ -193,20 +195,38 @@
"call-number": {},
"cordova-opentok-android-permissions": {},
"cordova-plugin-appavailability": {},
- "cordova-plugin-apprate": {},
+ "cordova-plugin-apprate": {
+ "PLAY_CORE_VERSION": "1.+"
+ },
"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"
+ "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true",
+ "ANDROID_ICON_ACCENT": "#FF00FFFF",
+ "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0",
+ "ANDROID_PLAY_SERVICES_AUTH_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_FIREBASE_INAPPMESSAGING_VERSION": "19.0.3",
+ "ANDROID_FIREBASE_FIRESTORE_VERSION": "21.4.0",
+ "ANDROID_CRASHLYTICS_VERSION": "2.10.1",
+ "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1",
+ "ANDROID_GSON_VERSION": "2.8.6"
+ },
+ "cordova-plugin-background-geolocation": {
+ "GOOGLE_PLAY_SERVICES_VERSION": "+"
}
},
"platforms": [
"browser",
- "android",
- "ios"
+ "ios",
+ "android"
]
}
}
\ No newline at end of file
diff --git a/Mohem/resources/android/icon/drawable-hdpi-icon.png b/Mohem/resources/android/icon/drawable-hdpi-icon.png
new file mode 100644
index 00000000..6076e663
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-hdpi-icon.png differ
diff --git a/Mohem/resources/android/icon/drawable-ldpi-icon.png b/Mohem/resources/android/icon/drawable-ldpi-icon.png
new file mode 100644
index 00000000..16ba0ed8
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-ldpi-icon.png differ
diff --git a/Mohem/resources/android/icon/drawable-mdpi-icon.png b/Mohem/resources/android/icon/drawable-mdpi-icon.png
new file mode 100644
index 00000000..37115276
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-mdpi-icon.png differ
diff --git a/Mohem/resources/android/icon/drawable-xhdpi-icon.png b/Mohem/resources/android/icon/drawable-xhdpi-icon.png
new file mode 100644
index 00000000..d29988bb
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-xhdpi-icon.png differ
diff --git a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png
new file mode 100644
index 00000000..833b2ff0
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png differ
diff --git a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png
new file mode 100644
index 00000000..4be5e41f
Binary files /dev/null and b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png
new file mode 100644
index 00000000..7220fb0e
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png
new file mode 100644
index 00000000..90763498
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png
new file mode 100644
index 00000000..4f7ad01f
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png
new file mode 100644
index 00000000..c4e8d06a
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png
new file mode 100644
index 00000000..7c179775
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png
new file mode 100644
index 00000000..9056d3d8
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png
new file mode 100644
index 00000000..d43c8c61
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png
new file mode 100644
index 00000000..7ea3bea7
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png
new file mode 100644
index 00000000..26eb160c
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png
new file mode 100644
index 00000000..16a8ab39
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png
new file mode 100644
index 00000000..e72e0594
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png differ
diff --git a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png
new file mode 100644
index 00000000..736ea361
Binary files /dev/null and b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png differ
diff --git a/Mohem/resources/android/xml/network_security_config.xml b/Mohem/resources/android/xml/network_security_config.xml
new file mode 100644
index 00000000..f9fecaf7
--- /dev/null
+++ b/Mohem/resources/android/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+
+
+
+ localhost
+
+
\ No newline at end of file
diff --git a/Mohem/resources/icon.png b/Mohem/resources/icon.png
index 7d670203..ff05a363 100644
Binary files a/Mohem/resources/icon.png and b/Mohem/resources/icon.png differ
diff --git a/Mohem/resources/icon.png.md5 b/Mohem/resources/icon.png.md5
deleted file mode 100644
index 9dd53643..00000000
--- a/Mohem/resources/icon.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-1f488bbf4678f14e62f8bb82d7e4b0be
\ No newline at end of file
diff --git a/Mohem/resources/ios/icon/icon-1024.png b/Mohem/resources/ios/icon/icon-1024.png
deleted file mode 100644
index 84658899..00000000
Binary files a/Mohem/resources/ios/icon/icon-1024.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-108@2x.png b/Mohem/resources/ios/icon/icon-108@2x.png
deleted file mode 100644
index fed360b7..00000000
Binary files a/Mohem/resources/ios/icon/icon-108@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-20.png b/Mohem/resources/ios/icon/icon-20.png
deleted file mode 100644
index ffade7d3..00000000
Binary files a/Mohem/resources/ios/icon/icon-20.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-20@2x.png b/Mohem/resources/ios/icon/icon-20@2x.png
deleted file mode 100644
index 4fa24c9d..00000000
Binary files a/Mohem/resources/ios/icon/icon-20@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-20@3x.png b/Mohem/resources/ios/icon/icon-20@3x.png
deleted file mode 100644
index 34258a58..00000000
Binary files a/Mohem/resources/ios/icon/icon-20@3x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-24@2x.png b/Mohem/resources/ios/icon/icon-24@2x.png
deleted file mode 100644
index 6a228415..00000000
Binary files a/Mohem/resources/ios/icon/icon-24@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-27.5@2x.png b/Mohem/resources/ios/icon/icon-27.5@2x.png
deleted file mode 100644
index b8eb9304..00000000
Binary files a/Mohem/resources/ios/icon/icon-27.5@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-29.png b/Mohem/resources/ios/icon/icon-29.png
deleted file mode 100644
index aa70cb33..00000000
Binary files a/Mohem/resources/ios/icon/icon-29.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-29@2x.png b/Mohem/resources/ios/icon/icon-29@2x.png
deleted file mode 100644
index 0bafc147..00000000
Binary files a/Mohem/resources/ios/icon/icon-29@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-29@3x.png b/Mohem/resources/ios/icon/icon-29@3x.png
deleted file mode 100644
index 122c5a68..00000000
Binary files a/Mohem/resources/ios/icon/icon-29@3x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-40.png b/Mohem/resources/ios/icon/icon-40.png
deleted file mode 100644
index 4fa24c9d..00000000
Binary files a/Mohem/resources/ios/icon/icon-40.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-40@2x.png b/Mohem/resources/ios/icon/icon-40@2x.png
deleted file mode 100644
index 37724c28..00000000
Binary files a/Mohem/resources/ios/icon/icon-40@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-40@3x.png b/Mohem/resources/ios/icon/icon-40@3x.png
deleted file mode 100644
index 42033ec9..00000000
Binary files a/Mohem/resources/ios/icon/icon-40@3x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-44@2x.png b/Mohem/resources/ios/icon/icon-44@2x.png
deleted file mode 100644
index 1a410848..00000000
Binary files a/Mohem/resources/ios/icon/icon-44@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-50.png b/Mohem/resources/ios/icon/icon-50.png
deleted file mode 100644
index 5af8a3c7..00000000
Binary files a/Mohem/resources/ios/icon/icon-50.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-50@2x.png b/Mohem/resources/ios/icon/icon-50@2x.png
deleted file mode 100644
index c63b2728..00000000
Binary files a/Mohem/resources/ios/icon/icon-50@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-60.png b/Mohem/resources/ios/icon/icon-60.png
deleted file mode 100644
index 34258a58..00000000
Binary files a/Mohem/resources/ios/icon/icon-60.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-60@2x.png b/Mohem/resources/ios/icon/icon-60@2x.png
deleted file mode 100644
index 42033ec9..00000000
Binary files a/Mohem/resources/ios/icon/icon-60@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-60@3x.png b/Mohem/resources/ios/icon/icon-60@3x.png
deleted file mode 100644
index 5021949c..00000000
Binary files a/Mohem/resources/ios/icon/icon-60@3x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-72.png b/Mohem/resources/ios/icon/icon-72.png
deleted file mode 100644
index 02121d02..00000000
Binary files a/Mohem/resources/ios/icon/icon-72.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-72@2x.png b/Mohem/resources/ios/icon/icon-72@2x.png
deleted file mode 100644
index f8fcf622..00000000
Binary files a/Mohem/resources/ios/icon/icon-72@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-76.png b/Mohem/resources/ios/icon/icon-76.png
deleted file mode 100644
index 1fdd2d07..00000000
Binary files a/Mohem/resources/ios/icon/icon-76.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-76@2x.png b/Mohem/resources/ios/icon/icon-76@2x.png
deleted file mode 100644
index ace219c9..00000000
Binary files a/Mohem/resources/ios/icon/icon-76@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-83.5@2x.png b/Mohem/resources/ios/icon/icon-83.5@2x.png
deleted file mode 100644
index 8f7feb8a..00000000
Binary files a/Mohem/resources/ios/icon/icon-83.5@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-86@2x.png b/Mohem/resources/ios/icon/icon-86@2x.png
deleted file mode 100644
index 6e37b917..00000000
Binary files a/Mohem/resources/ios/icon/icon-86@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-98@2x.png b/Mohem/resources/ios/icon/icon-98@2x.png
deleted file mode 100644
index 95bdb683..00000000
Binary files a/Mohem/resources/ios/icon/icon-98@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-small.png b/Mohem/resources/ios/icon/icon-small.png
deleted file mode 100644
index aa70cb33..00000000
Binary files a/Mohem/resources/ios/icon/icon-small.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-small@2x.png b/Mohem/resources/ios/icon/icon-small@2x.png
deleted file mode 100644
index 0bafc147..00000000
Binary files a/Mohem/resources/ios/icon/icon-small@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon-small@3x.png b/Mohem/resources/ios/icon/icon-small@3x.png
deleted file mode 100644
index 122c5a68..00000000
Binary files a/Mohem/resources/ios/icon/icon-small@3x.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon.png b/Mohem/resources/ios/icon/icon.png
deleted file mode 100644
index b18324dc..00000000
Binary files a/Mohem/resources/ios/icon/icon.png and /dev/null differ
diff --git a/Mohem/resources/ios/icon/icon@2x.png b/Mohem/resources/ios/icon/icon@2x.png
deleted file mode 100644
index 0235609a..00000000
Binary files a/Mohem/resources/ios/icon/icon@2x.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-1792h~iphone.png b/Mohem/resources/ios/splash/Default-1792h~iphone.png
deleted file mode 100644
index 383f1557..00000000
Binary files a/Mohem/resources/ios/splash/Default-1792h~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-2436h.png b/Mohem/resources/ios/splash/Default-2436h.png
deleted file mode 100644
index 03e77d2f..00000000
Binary files a/Mohem/resources/ios/splash/Default-2436h.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-2688h~iphone.png b/Mohem/resources/ios/splash/Default-2688h~iphone.png
deleted file mode 100644
index 89847c03..00000000
Binary files a/Mohem/resources/ios/splash/Default-2688h~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png b/Mohem/resources/ios/splash/Default-568h@2x~iphone.png
deleted file mode 100644
index 627d96a6..00000000
Binary files a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-667h.png b/Mohem/resources/ios/splash/Default-667h.png
deleted file mode 100644
index 641b4cf6..00000000
Binary files a/Mohem/resources/ios/splash/Default-667h.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-736h.png b/Mohem/resources/ios/splash/Default-736h.png
deleted file mode 100644
index 806d1419..00000000
Binary files a/Mohem/resources/ios/splash/Default-736h.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png b/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png
deleted file mode 100644
index 19a68596..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape-2436h.png b/Mohem/resources/ios/splash/Default-Landscape-2436h.png
deleted file mode 100644
index 86a30448..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape-2436h.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png b/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png
deleted file mode 100644
index 83cffc2a..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape-736h.png b/Mohem/resources/ios/splash/Default-Landscape-736h.png
deleted file mode 100644
index ffcd9682..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape-736h.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png b/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png
deleted file mode 100644
index a0df2f6e..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png b/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png
deleted file mode 100644
index 38aeccb3..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Landscape~ipad.png b/Mohem/resources/ios/splash/Default-Landscape~ipad.png
deleted file mode 100644
index a60b3a59..00000000
Binary files a/Mohem/resources/ios/splash/Default-Landscape~ipad.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png b/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png
deleted file mode 100644
index ea31eee9..00000000
Binary files a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png b/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png
deleted file mode 100644
index f2c9dc9e..00000000
Binary files a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default-Portrait~ipad.png b/Mohem/resources/ios/splash/Default-Portrait~ipad.png
deleted file mode 100644
index 1c0252e1..00000000
Binary files a/Mohem/resources/ios/splash/Default-Portrait~ipad.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default@2x~iphone.png b/Mohem/resources/ios/splash/Default@2x~iphone.png
deleted file mode 100644
index 0110a5c0..00000000
Binary files a/Mohem/resources/ios/splash/Default@2x~iphone.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png b/Mohem/resources/ios/splash/Default@2x~universal~anyany.png
deleted file mode 100644
index df5ca27d..00000000
Binary files a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png and /dev/null differ
diff --git a/Mohem/resources/ios/splash/Default~iphone.png b/Mohem/resources/ios/splash/Default~iphone.png
deleted file mode 100644
index 5114be78..00000000
Binary files a/Mohem/resources/ios/splash/Default~iphone.png and /dev/null differ
diff --git a/Mohem/resources/splash.png b/Mohem/resources/splash.png
index 121950ff..48a0340f 100755
Binary files a/Mohem/resources/splash.png and b/Mohem/resources/splash.png differ
diff --git a/Mohem/resources/splash.png.md5 b/Mohem/resources/splash.png.md5
deleted file mode 100644
index b9777f40..00000000
--- a/Mohem/resources/splash.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-b8fbf9d45bfbdf47560d99960bc65188
\ No newline at end of file
diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
index 7a1fc2ce..7b3eaa1f 100644
--- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
+++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
@@ -257,7 +257,7 @@ ion-card-content.confirm-details{
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.confirmEitOkButton{
@@ -266,7 +266,7 @@ ion-card-content.confirm-details{
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
- --background: #22c6b3;
+ --background: #65C399;
width: 80% !important;
color: white!important;
border-radius: 16px !important;
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss
index 1f026374..6f6728ed 100644
--- a/Mohem/src/app/absence/home/home.component.scss
+++ b/Mohem/src/app/absence/home/home.component.scss
@@ -57,7 +57,7 @@
.header-div {
- background-color: #22C6B3;
+ background-color: #65C399;
text-transform: capitalize;
height: 160px;
/* position: relative; */
@@ -66,7 +66,7 @@
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
@@ -242,7 +242,7 @@ margin-top: -13px;
.contentEit:before {
position: absolute;
content: "";
- // background: #22c6b3;
+ // background: #65C399;
height: 140px;
width: 100%;
left: 0;
diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss
index 5803e3f2..1253a5da 100644
--- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss
+++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss
@@ -32,7 +32,7 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
- --background:: #22c6b3;
+ --background:: #65C399;
width: 100% !important;
color: white!important;
border-radius: 16px !important;
diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
index 477ee720..945d7e68 100644
--- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
+++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
@@ -5,7 +5,7 @@
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.confirmEitOkButton{
@@ -14,7 +14,7 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
- --background: #22c6b3;
+ --background: #65C399;
width: 80% !important;
color: white!important;
border-radius: 16px !important;
diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
index d98a85be..c8b999eb 100644
--- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
+++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
@@ -1,3 +1,3 @@
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
\ No newline at end of file
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss
index 1579bf40..b768bcbc 100644
--- a/Mohem/src/app/app.component.scss
+++ b/Mohem/src/app/app.component.scss
@@ -75,7 +75,7 @@ header
.logout{
- background-color:#22C6B3;
+ background-color:#65C399;
border: none;
color:white;
// padding: 20px;
@@ -94,7 +94,7 @@ padding: 6px 24px;
}
.logout-ar{
- background-color: #22C6B3;
+ background-color: #65C399;
border: none;
color: white;
text-align: center;
diff --git a/Mohem/src/app/attendance-tracking/home/home.component.ts b/Mohem/src/app/attendance-tracking/home/home.component.ts
index cf572606..74d39020 100644
--- a/Mohem/src/app/attendance-tracking/home/home.component.ts
+++ b/Mohem/src/app/attendance-tracking/home/home.component.ts
@@ -130,15 +130,11 @@ export class HomeComponent implements OnInit {
openDialog() {
- this.cs.confirmAlertDialogAttendance(
- () => {
- this.attendScanService.getDeviceLocation();
+ this.cs.confirmAlertDialogAttendance(() => {
+ this.attendScanService.getDeviceLocation();
}, this.ts.trPK('general', 'ok'),
() => {}, this.ts.trPK('general', 'cancel'),
this.ts.trPK('vacation-rule', 'confirmation'),
- this.ts.trPK('attendance-tracking', 'confirm-alert3')
- + '
' + '
' + this.ts.trPK('attendance-tracking', 'confirm-alert1')
- + this.ts.trPK('attendance-tracking', 'confirm-alert2')
- );
+ this.ts.trPK('attendance-tracking', 'confirm-alert1') + this.ts.trPK('attendance-tracking', 'confirm-alert2'));
}
}
diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html
index d1812a7d..9e3d4134 100644
--- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html
+++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html
@@ -44,7 +44,7 @@
left: 79%;
bottom: 35px;
color: black;
- background-color: #22c6b3;
+ background-color: #65C399;
width: 20%; height: 6px;">
>>>>>>' + isVirtual);
alert('You are using virtual device');
return false;
}
-
this.permissions.requestLocationAutherization().then(granted => {
this.location = granted as boolean;
if (this.location) {
- this.geolocation
- .getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true })
- .then(resp => {
- this.lat = resp.coords.latitude;
- this.longt = resp.coords.longitude;
- this.attendance();
- })
- .catch(error => {
- console.log('Error getting location', error);
- });
-
+ this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+ if (this.platform.is('android')) {
+ if (resp && (resp.latitude && resp.longitude)) {
+ console.log(resp);
+ if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
+ this.common.presentAlert(this.ts.trPK('home', 'fake-location'));
+ } else {
+ this.lat = resp.latitude;
+ this.longt = resp.longitude;
+ this.attendance();
+ }
+ }
+ } else {
+ if (resp && (resp.latitude && resp.longitude)) {
+ this.lat = resp.latitude;
+ this.longt = resp.longitude;
+ this.attendance();
+ } else {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ }
+ }
+ }, (error) => {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ });
} else {
return false;
}
});
-
}
public attendance() {
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
index 67a8ab9d..d6c4a4be 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
@@ -8,14 +8,14 @@
.navbar{
font-size: 10px !important;
- --background: #22C6B3 !important;
+ --background: #65C399 !important;
color: aliceblue !important;
}
.menu {
margin-top: 0px !important;
font-size: 35px !important;
- background: #22C6B3;
+ background: #65C399;
color: aliceblue;
margin-left: 0px !important;
@@ -25,7 +25,7 @@
margin-left:100px !important;
margin-top: 0px !important;
font-size: 23px !important;
- background: #22C6B3 !important;
+ background: #65C399 !important;
color: aliceblue !important;
}
@@ -92,7 +92,7 @@
background:var(--primary);
background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
- background: #22C6B3;
+ background: #65C399;
// background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
color:var(--light);
text-transform: capitalize;
diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
index da5d7c33..9210cb05 100644
--- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
+++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
@@ -10,8 +10,8 @@
.btnImge{
// button{
border-color:transparent !important;
- --background: #22C6B3 !important;
- background: #22C6B3 !important;
+ --background: #65C399 !important;
+ background: #65C399 !important;
height: 57px !important;
width: 60px !important;
@@ -21,7 +21,7 @@
}
//test
.changeIcon{
- background: #22C6B3 !important;
+ background: #65C399 !important;
border-radius: 50% !important;
width: 73px;
height: 55px;
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
index dabb931c..8f5ef95d 100644
--- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
+++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
@@ -22,5 +22,5 @@
line-height: 46px;
}
.header-toolbar-new {
- --background: #22c6b3;
+ --background: #65C399;
}
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss
index d6361074..43d3f25b 100644
--- a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss
+++ b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss
@@ -4,6 +4,6 @@
ion-menu-button {
font-size: 0.8cm;
color: white;
- background: #22c6b3;
+ background: #65C399;
margin: 0 auto;
}
\ No newline at end of file
diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss
index b0af3af9..68ee7cd8 100644
--- a/Mohem/src/app/home/home.page.scss
+++ b/Mohem/src/app/home/home.page.scss
@@ -4,7 +4,7 @@ ion-row {
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.profile-image-container{
position: relative;
@@ -50,7 +50,7 @@ ion-label{
.contentBg:before {
position: absolute;
content: "";
- background: #22c6b3;
+ background: #65C399;
height: 100px;
width: 100%;
left: 0;
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index a2b6cdfd..e07982fe 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -36,7 +36,7 @@ import { TimeCardService } from '../time-card/service/time-card.service';
import { WorklistMainService } from '../notification/service/work-list.main.service';
import { isThisISOWeek } from 'date-fns';
import { Router } from '@angular/router';
-
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
@Component({
selector: 'app-home',
templateUrl: './home.page.html',
@@ -151,6 +151,7 @@ export class HomePage implements OnInit {
public workListService: WorklistMainService,
public router: Router,
private platform: Platform,
+ public backgroundGeolocation: BackgroundGeolocation
) {
this.events.subscribe('img-change', displayImg => {
this.userImage = this.sanitizer.bypassSecurityTrustUrl(
@@ -165,11 +166,6 @@ export class HomePage implements OnInit {
this.common.openHome();
}
});
- // this.getUserDetails();
- // this.getCount();
- // this.events.subscribe('getNotCount', badge => {
- // this.notBadge = badge;
- // });
this.direction = TranslatorService.getCurrentLanguageName();
this.myTeamTitle = this.ts.trPK('myTeam', 'myTeam-header');
this.vacationRuleTitle = this.ts.trPK('vacation-rule', 'vacationRule');
@@ -189,14 +185,6 @@ export class HomePage implements OnInit {
this.getUserDetails();
}
- // ionViewDidEnter() {
- // // tslint:disable-next-line: only-arrow-functions
- // document.addEventListener('backbutton', function(e) {
- // e.preventDefault();
- // e.stopPropagation();
- // }, false);
- // }
-
initTimer() {
this.runTimer = false;
this.hasStarted = false;
@@ -256,26 +244,36 @@ export class HomePage implements OnInit {
this.permissions.requestLocationAutherization().then(granted => {
this.location = granted as boolean;
if (this.location) {
- this.geolocation
- .getCurrentPosition({
- maximumAge: 3000,
- timeout: 10000,
- enableHighAccuracy: true
- })
- .then(resp => {
- this.lat = resp.coords.latitude;
- this.longt = resp.coords.longitude;
- this.attendance();
- })
- .catch(error => {
+ this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+ if (this.platform.is('android')) {
+ if (resp && (resp.latitude && resp.longitude)) {
+ console.log(resp);
+ if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
+ this.common.presentAlert(this.ts.trPK('home', 'fake-location'));
+ } else {
+ this.lat = resp.latitude;
+ this.longt = resp.longitude;
+ this.attendance();
+ }
+ }
+ } else {
+ if (resp && (resp.latitude && resp.longitude)) {
+ this.lat = resp.latitude;
+ this.longt = resp.longitude;
+ this.attendance();
+ } else {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ }
+ }
+ }, (error) => {
this.common.presentAlert(this.ts.trPK('home', 'position-error'));
- });
+ });
} else {
return false;
}
});
}
-
+
setServicesPrivilage() {
for (const servicePrivilage of AuthenticationService.servicePrivilage) {
if (servicePrivilage.Previlege === false) {
diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss
index f60e443a..df918ed7 100644
--- a/Mohem/src/app/my-team/details/details.component.scss
+++ b/Mohem/src/app/my-team/details/details.component.scss
@@ -20,7 +20,7 @@ ion-title{
.contentBg:before {
position: absolute;
content: "";
- background: #22c6b3;
+ background: #65C399;
height: 140px;
width: 100%;
left: 0;
@@ -89,7 +89,7 @@ ion-title{
border-radius: $actionBtnSize;
margin: 0 auto;
display: block;
- background-color: #22c6b3;
+ background-color: #65C399;
line-height: $actionBtnSize;
margin-bottom: 3px;
img{
@@ -130,7 +130,7 @@ ion-title{
.active-Segment {
font-size: 0.3cm !important;
- background: #22c6b3 !important;
+ background: #65C399 !important;
text-transform: none;
--color-checked: none;
border-radius: 100px;
@@ -162,7 +162,7 @@ ion-title{
}
.search-dropdown{
- background: #22c6b3;
+ background: #65C399;
ion-select {
.select-text{
margin-left: -10px;
@@ -223,7 +223,7 @@ ion-title{
.activeArrow{
height: 20px;
width: 20px;
- color: #22c6b3;
+ color: #65C399;
}
.disabledArrow{
height: 20px;
@@ -234,7 +234,7 @@ ion-title{
.activeArrow-ar{
height: 20px;
width: 20px;
- color: #22c6b3;
+ color: #65C399;
margin-right: 275px;
}
.disabledArrow-ar{
@@ -389,7 +389,7 @@ ion-title{
}
.green-label-container{
- border-top: 5px solid #22c6b3;
+ border-top: 5px solid #65C399;
padding: 1px 0px;
margin: 15px 0px
}
diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts
index 89434b9b..91805532 100644
--- a/Mohem/src/app/my-team/details/details.component.ts
+++ b/Mohem/src/app/my-team/details/details.component.ts
@@ -281,7 +281,7 @@ export class DetailsComponent implements OnInit {
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'#094875',
- '#22c6b3'
+ '#65C399'
],
borderWidth: 2
}]
diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss
index e9b398a2..735f5987 100644
--- a/Mohem/src/app/my-team/home/home.component.scss
+++ b/Mohem/src/app/my-team/home/home.component.scss
@@ -18,7 +18,7 @@ ion-title{
.contentBg:before {
position: absolute;
content: "";
- background: #22c6b3;
+ background: #65C399;
height: 140px;
width: 100%;
left: 0;
@@ -89,7 +89,7 @@ ion-content {
}
}
.search-dropdown{
- background: #22c6b3;
+ background: #65C399;
ion-select {
.select-text{
margin-left: -10px;
diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts
index 262d9ead..1dab5abb 100644
--- a/Mohem/src/app/my-team/home/home.component.ts
+++ b/Mohem/src/app/my-team/home/home.component.ts
@@ -39,7 +39,7 @@ export class HomeComponent implements OnInit {
{
data: [100],
backgroundColor: [
- '#22c6b3'
+ '#65C399'
],
borderWidth: 5
}]
diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss
index 36116457..88200d03 100644
--- a/Mohem/src/app/notification/home/home.component.scss
+++ b/Mohem/src/app/notification/home/home.component.scss
@@ -246,7 +246,7 @@ height: 100%;
.contentBg:before {
position: absolute;
content: "";
-background: #22c6b3;
+background: #65C399;
height: 140px;
width: 100%;
left: 0;
@@ -448,7 +448,7 @@ border-radius: 15px;
.text-span-active{
font-size: 12px;
color: #888;
-background-color:#22c6b3;
+background-color:#65C399;
width: 93%;
height: 30px;
border: 1px solid;
diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
index d98a85be..c8b999eb 100644
--- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
+++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
@@ -1,3 +1,3 @@
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
index 06d775fa..a03ddca2 100644
--- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
+++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
@@ -1,5 +1,5 @@
-
+
{{ 'vacation-rule, search-employee' | translate}}
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss
index 4357dffe..0abf02aa 100644
--- a/Mohem/src/app/payslip/home/home.component.scss
+++ b/Mohem/src/app/payslip/home/home.component.scss
@@ -70,14 +70,14 @@
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.colorBG{
--background: #f0efef;
}
.header-div {
- background-color: #22C6B3;
+ background-color: #65C399;
text-transform: capitalize;
height: 119px;
position: relative;
@@ -368,7 +368,7 @@
left: 83%;
bottom: 117px;
color: black;
- background-color: #22c6b3;
+ background-color: #65C399;
width: 16%;
height: 6px;
}
@@ -377,13 +377,13 @@
// left: 77%;
// bottom: 117px;
// color: black;
- // background-color: #22c6b3;
+ // background-color: #65C399;
// width: 20%; height: 6px;
position: relative;
left: 4%;
bottom: 117px;
color: black;
- background-color: #22c6b3;
+ background-color: #65C399;
width: 15%;
height: 6px;
}
diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts
index 9943440a..51f8016c 100644
--- a/Mohem/src/app/payslip/home/home.component.ts
+++ b/Mohem/src/app/payslip/home/home.component.ts
@@ -239,7 +239,7 @@ slidePrev(object, slideView) {
datasets: [
{ data: [this.earingTotal,this.deductionTotal],
backgroundColor: [
- '#22c6b3',
+ '#65C399',
'#094875', ],
borderWidth: 2
}
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
index 294575dc..432f0612 100644
--- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
+++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
@@ -9,14 +9,14 @@
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.colorBG{
--background: #f0efef;
}
.header-div{
text-transform: capitalize;
- background: #22C6B3;
+ background: #65C399;
display: block;
position: relative;
height: 113px;
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss
index c508d39d..ab1cf255 100644
--- a/Mohem/src/app/profile/home/home.component.scss
+++ b/Mohem/src/app/profile/home/home.component.scss
@@ -7,7 +7,7 @@ ion-col.colBold, ion-col.colBold > label{
}
.header-div{
text-transform: capitalize;
- background: #22C6B3;
+ background: #65C399;
display: block;
position: relative;
height: 160px;
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
index 202c73a9..1c96ac08 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
@@ -6,7 +6,7 @@
}
.header-div{
text-transform: capitalize;
- background: #22C6B3;
+ background: #65C399;
display: block;
position: relative;
height: 160px;
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
index 6b14fc93..2b08b130 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
@@ -46,7 +46,7 @@ export class PerformanceEvaluationComponent implements OnInit {
colorScheme = {
- domain: ['#22C6B3', '#094875', '#3CB9D5', '#1FA269', '#0D155E']
+ domain: ['#65C399', '#094875', '#3CB9D5', '#1FA269', '#0D155E']
};
ngOnInit() {
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss
index 0de83e93..1f9d686b 100644
--- a/Mohem/src/app/profile/profile-image/profile-image.component.scss
+++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss
@@ -9,7 +9,7 @@
// border-radius: 50% !important;
// }
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
.imgCircle{
@@ -50,5 +50,5 @@ width: 234px;
}
.header-toolbar-new{
- --background: #22c6b3;
+ --background: #65C399;
}
\ No newline at end of file
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
index f52bd47c..ba490355 100644
--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
@@ -185,7 +185,7 @@
// .header-div {
-// background-color: #22C6B3;
+// background-color: #65C399;
// text-transform: capitalize;
// height: 180px;
// position: relative;
@@ -214,7 +214,7 @@
// .navbar{
// font-size: 10px !important;
-// --background: #22C6B3 !important;
+// --background: #65C399 !important;
// color: aliceblue !important;
// // margin-top: 10px !important;
@@ -224,7 +224,7 @@
// // margin-left:330px !important;
// margin-top: 0px !important;
// font-size: 35px !important;
-// background: #22C6B3;
+// background: #65C399;
// color: aliceblue;
// margin-left: 0px !important;
@@ -235,7 +235,7 @@
// margin-left:100px !important;
// margin-top: 0px !important;
// font-size: 23px !important;
-// background: #22C6B3 !important;
+// background: #65C399 !important;
// color: aliceblue !important;
// }
@@ -374,7 +374,7 @@
// background:var(--primary);
// background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
// background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
-// background: #22C6B3;
+// background: #65C399;
// // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
// color:var(--light);
// text-transform: capitalize;
@@ -508,7 +508,7 @@ ion-title{
.contentBg:before {
position: absolute;
content: "";
-background: #22c6b3;
+background: #65C399;
height: 140px;
width: 100%;
left: 0;
@@ -577,7 +577,7 @@ $actionBtnSize : 36px;
border-radius: $actionBtnSize;
margin: 0 auto;
display: block;
- background-color: #22c6b3;
+ background-color: #65C399;
line-height: $actionBtnSize;
margin-bottom: 3px;
img{
@@ -617,7 +617,7 @@ $actionBtnSize : 36px;
.active-Segment {
font-size: 0.3cm !important;
- background: #22c6b3 !important;
+ background: #65C399 !important;
text-transform: none;
--color-checked: none;
border-radius: 100px;
@@ -649,7 +649,7 @@ $actionBtnSize : 36px;
}
.search-dropdown{
- background: #22c6b3;
+ background: #65C399;
ion-select {
.select-text{
margin-left: -10px;
@@ -864,7 +864,7 @@ $actionBtnSize : 36px;
}
.green-label-container{
- border-top: 5px solid #22c6b3;
+ border-top: 5px solid #65C399;
padding: 1px 0px;
margin: 15px 0px
}
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
index 2395bafd..ca5aabc3 100644
--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
@@ -185,7 +185,7 @@ export class TimeCardDetailsComponent implements OnInit {
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'#094875',
- '#22c6b3'
+ '#65C399'
],
borderWidth: 2
}]
diff --git a/Mohem/src/assets/icon/moving.gif b/Mohem/src/assets/icon/moving.gif
index 95e0fadc..ffefdb00 100644
Binary files a/Mohem/src/assets/icon/moving.gif and b/Mohem/src/assets/icon/moving.gif differ
diff --git a/Mohem/src/assets/imgs/CSLogo.png b/Mohem/src/assets/imgs/CSLogo.png
index 5b690525..d0724eb4 100644
Binary files a/Mohem/src/assets/imgs/CSLogo.png and b/Mohem/src/assets/imgs/CSLogo.png differ
diff --git a/Mohem/src/assets/imgs/moving.gif b/Mohem/src/assets/imgs/moving.gif
index 95e0fadc..ffefdb00 100644
Binary files a/Mohem/src/assets/imgs/moving.gif and b/Mohem/src/assets/imgs/moving.gif differ
diff --git a/Mohem/src/imgs/moving.gif b/Mohem/src/imgs/moving.gif
index 95e0fadc..ffefdb00 100644
Binary files a/Mohem/src/imgs/moving.gif and b/Mohem/src/imgs/moving.gif differ
diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss
index 7ccd3aed..b2cddf6a 100644
--- a/Mohem/src/theme/styles.scss
+++ b/Mohem/src/theme/styles.scss
@@ -1322,7 +1322,7 @@ border:0px
--background: #094773 !important;
}
.header-toolbar-new {
- --background: #22c6b3;
+ --background: #65C399;
}
@@ -1340,7 +1340,7 @@ border:0px
// margin-left:0;
// }
// .search-dropdown{
-// background: #22c6b3;
+// background: #65C399;
// ion-select {
// .select-text{
// margin-left: -10px;
@@ -1413,7 +1413,7 @@ border:0px
&.present {
color:#fff !important;
&:before {
- background-color: #22c6b3 !important;
+ background-color: #65C399 !important;
}
}
diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss
index 72f055c1..0297d1fd 100644
--- a/Mohem/src/theme/variables.scss
+++ b/Mohem/src/theme/variables.scss
@@ -69,7 +69,7 @@
--red:#BE1E2D;
--blue:#223262;
--cyanblue:#1b75bc;
- --newgreen:#22c6b3;
+ --newgreen:#65C399;
--darkblue:#094875;
--lightblue:#3cb9d5;
--newred:#cb3232;