Merge branch 'master' of code.webtrigon.com:kj/kxip-app into master

.gitignore

@@ -29,3 +29,8 @@ npm-debug.log*
 /platforms
 /plugins
 /www
+
+
+# Remove this if you change code in capacitor and want to include native
+/.gradle
+/android

capacitor.config.json

@@ -0,0 +1,23 @@
+{
+  "appId": "com.android.pbks",
+  "appName": "Punjab Kings",
+  "bundledWebRuntime": false,
+  "npmClient": "npm",
+  "webDir": "www",
+  "plugins": {
+    "SplashScreen": {
+      "launchShowDuration": 0
+    }
+  },
+  "cordova": {
+    "preferences": {
+      "ScrollEnabled": "false",
+      "BackupWebStorage": "none",
+      "SplashMaintainAspectRatio": "true",
+      "FadeSplashScreenDuration": "300",
+      "SplashShowOnlyFirstTime": "false",
+      "SplashScreen": "screen",
+      "SplashScreenDelay": "3000"
+    }
+  }
+}

ionic.config.json

@@ -1,7 +1,8 @@
 {
   "name": "kxip-app",
   "integrations": {
-    "cordova": {}
+    "cordova": {},
+    "capacitor": {}
   },
   "type": "angular"
 }

package-lock.json

@@ -15,13 +15,22 @@
         "@angular/platform-browser-dynamic": "~10.0.0",
         "@angular/router": "~10.0.0",
         "@angular/service-worker": "~10.0.0",
+        "@capacitor/android": "^2.4.7",
+        "@capacitor/core": "2.4.7",
+        "@ionic-native/battery-status": "^5.32.0",
         "@ionic-native/camera-preview": "^5.32.0",
         "@ionic-native/core": "^5.0.0",
         "@ionic-native/firebase-authentication": "^5.31.1",
         "@ionic-native/google-plus": "^5.31.1",
+        "@ionic-native/http": "^5.32.0",
         "@ionic-native/splash-screen": "^5.0.0",
         "@ionic-native/status-bar": "^5.0.0",
+        "@ionic-native/uptime": "^5.32.0",
         "@ionic/angular": "^5.0.0",
+        "cordova-plugin-advanced-http": "^3.1.0",
+        "cordova-plugin-battery-status": "^2.0.3",
+        "cordova-plugin-file": "^6.0.2",
+        "cordova-plugin-uptime": "^0.1.1",
         "cordova-res": "^0.15.2",
         "dom-to-image": "^2.6.0",
         "face-api.js": "^0.22.2",
@@ -43,6 +52,7 @@
         "@angular/compiler": "~10.0.0",
         "@angular/compiler-cli": "~10.0.0",
         "@angular/language-service": "~10.0.0",
+        "@capacitor/cli": "2.4.7",
         "@ionic/angular-toolkit": "^2.3.0",
         "@types/dom-mediacapture-record": "^1.0.7",
         "@types/jasmine": "~3.5.0",
@@ -2027,6 +2037,312 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "node_modules/@capacitor/android": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-2.4.7.tgz",
+      "integrity": "sha512-7jcmwheo94dJEOX1z4r3SlZrL+MvESav1xsUwC5ydLFZCpuvBKJ0szbDNWzCAglgpXmW9hC0WdwYBErgDrDPRg==",
+      "peerDependencies": {
+        "@capacitor/core": "~2.4.0"
+      }
+    },
+    "node_modules/@capacitor/cli": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-2.4.7.tgz",
+      "integrity": "sha512-RC5EO3oA2gWniZK0JWRlZa+7MFIoHYiAtt+W4Hqq74nyv1C0z/MvRY3pX2DX7kKy6Uc1Z/25D0uSXRk+erv3RQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.3.0",
+        "commander": "^4.1.1",
+        "compare-versions": "^3.1.0",
+        "fs-extra": "^4.0.3",
+        "inquirer": "6.3.1",
+        "open": "^6.1.0",
+        "ora": "^1.3.0",
+        "plist": "^3.0.1",
+        "semver": "^5.4.1",
+        "which": "^1.3.0",
+        "xml2js": "^0.4.19"
+      },
+      "bin": {
+        "cap": "bin/capacitor",
+        "capacitor": "bin/capacitor"
+      },
+      "engines": {
+        "node": ">=8.3.0"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/cli-spinners": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
+      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/inquirer": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+      "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.11",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "node_modules/@capacitor/cli/node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/ora": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
+      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.1.0",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^1.0.1",
+        "log-symbols": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/string-width/node_modules/ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/@capacitor/core": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.4.7.tgz",
+      "integrity": "sha512-ZPzXXQ4EPwR/ZhNDkmlxyzw4FvquIl/ROj8HMMM0MEd4xZfM8ulNGPIL6br9TWdlFLGBKq40eymPZjKaivGnig==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "node_modules/@capacitor/core/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@firebase/analytics": {
       "version": "0.6.8",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.8.tgz",
@@ -2384,6 +2700,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/@ionic-native/battery-status": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/battery-status/-/battery-status-5.32.0.tgz",
+      "integrity": "sha512-YV+COPTVIaw7qKibelRkqVZChfIXMRRh86luxPRAuVdkXrPjw/sHPcXE7XhCZ5vPzWMEB4JohqnL0/e2a4XruA==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
     "node_modules/@ionic-native/camera-preview": {
       "version": "5.32.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/camera-preview/-/camera-preview-5.32.0.tgz",
@@ -2431,6 +2759,18 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/http": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.32.0.tgz",
+      "integrity": "sha512-DDNhx+CmP9f0EgoQuiILrpNf3uqKH/pIcdWPtmvj+BV5up9NxBMdAP4KXO0ourh3XXAEi5j9H6knn5DPIUskmw==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
     "node_modules/@ionic-native/splash-screen": {
       "version": "5.32.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.32.0.tgz",
@@ -2455,6 +2795,18 @@
         "rxjs": "^5.5.0 || ^6.5.0"
       }
     },
+    "node_modules/@ionic-native/uptime": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/uptime/-/uptime-5.32.0.tgz",
+      "integrity": "sha512-zaKLdRjZZpE5V7PlYA952CpOLmYHoo2TafB7hNa00jtSpDWgHMo2lRjTvoLLmcCUrXKzBMhWRFX3Szc8SZI9sg==",
+      "dependencies": {
+        "@types/cordova": "latest"
+      },
+      "peerDependencies": {
+        "@ionic-native/core": "^5.1.0",
+        "rxjs": "^5.5.0 || ^6.5.0"
+      }
+    },
     "node_modules/@ionic/angular": {
       "version": "5.6.4",
       "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.4.tgz",
@@ -5427,6 +5779,12 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "node_modules/compare-versions": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+      "dev": true
+    },
     "node_modules/component-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -5909,6 +6267,17 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/cordova-plugin-advanced-http": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew==",
+      "engines": [
+        {
+          "name": "cordova",
+          "version": ">=4.0.0"
+        }
+      ]
+    },
     "node_modules/cordova-plugin-androidx": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-androidx/-/cordova-plugin-androidx-3.0.0.tgz",
@@ -5925,6 +6294,18 @@
         "recursive-readdir": "^2.2.2"
       }
     },
+    "node_modules/cordova-plugin-battery-status": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-battery-status/-/cordova-plugin-battery-status-2.0.3.tgz",
+      "integrity": "sha512-H1vSLWbDb/qivGPVV/sjAaDnF8VEoa1uOYdrTJpYrs9vRAe3S37y8Fa5LoBuKkspWiQ5P3D8q+iTnsPF0UAO7g==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
     "node_modules/cordova-plugin-camera-preview": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/cordova-plugin-camera-preview/-/cordova-plugin-camera-preview-0.12.1.tgz",
@@ -5944,6 +6325,21 @@
         }
       }
     },
+    "node_modules/cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA==",
+      "engines": {
+        "cordovaDependencies": {
+          "5.0.0": {
+            "cordova-android": ">=6.3.0"
+          },
+          "7.0.0": {
+            "cordova": ">100"
+          }
+        }
+      }
+    },
     "node_modules/cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
@@ -6009,6 +6405,11 @@
         }
       }
     },
+    "node_modules/cordova-plugin-uptime": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-uptime/-/cordova-plugin-uptime-0.1.1.tgz",
+      "integrity": "sha512-xM6A5jUO0JYOFGBedpLcPRxItIMj/9QdmOC7qMRSdCDL2vFCFphq7A8KJzM4Fza7FdI+CJbatKTE+iKyYRSmmw=="
+    },
     "node_modules/cordova-res": {
       "version": "0.15.3",
       "resolved": "https://registry.npmjs.org/cordova-res/-/cordova-res-0.15.3.tgz",
@@ -22124,6 +22525,246 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@capacitor/android": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-2.4.7.tgz",
+      "integrity": "sha512-7jcmwheo94dJEOX1z4r3SlZrL+MvESav1xsUwC5ydLFZCpuvBKJ0szbDNWzCAglgpXmW9hC0WdwYBErgDrDPRg==",
+      "requires": {}
+    },
+    "@capacitor/cli": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-2.4.7.tgz",
+      "integrity": "sha512-RC5EO3oA2gWniZK0JWRlZa+7MFIoHYiAtt+W4Hqq74nyv1C0z/MvRY3pX2DX7kKy6Uc1Z/25D0uSXRk+erv3RQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.0",
+        "commander": "^4.1.1",
+        "compare-versions": "^3.1.0",
+        "fs-extra": "^4.0.3",
+        "inquirer": "6.3.1",
+        "open": "^6.1.0",
+        "ora": "^1.3.0",
+        "plist": "^3.0.1",
+        "semver": "^5.4.1",
+        "which": "^1.3.0",
+        "xml2js": "^0.4.19"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^2.0.0"
+          }
+        },
+        "cli-spinners": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
+          "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+          "dev": true
+        },
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "dev": true
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "inquirer": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+          "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^3.2.0",
+            "chalk": "^2.4.2",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.11",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.4.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^5.1.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+          "dev": true
+        },
+        "log-symbols": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+          "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.0.1"
+          }
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "open": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+          "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+          "dev": true,
+          "requires": {
+            "is-wsl": "^1.1.0"
+          }
+        },
+        "ora": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
+          "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.1.0",
+            "cli-cursor": "^2.1.0",
+            "cli-spinners": "^1.0.1",
+            "log-symbols": "^2.1.0"
+          }
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@capacitor/core": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.4.7.tgz",
+      "integrity": "sha512-ZPzXXQ4EPwR/ZhNDkmlxyzw4FvquIl/ROj8HMMM0MEd4xZfM8ulNGPIL6br9TWdlFLGBKq40eymPZjKaivGnig==",
+      "requires": {
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
     "@firebase/analytics": {
       "version": "0.6.8",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.8.tgz",
@@ -22416,6 +23057,14 @@
         "protobufjs": "^6.8.6"
       }
     },
+    "@ionic-native/battery-status": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/battery-status/-/battery-status-5.32.0.tgz",
+      "integrity": "sha512-YV+COPTVIaw7qKibelRkqVZChfIXMRRh86luxPRAuVdkXrPjw/sHPcXE7XhCZ5vPzWMEB4JohqnL0/e2a4XruA==",
+      "requires": {
+        "@types/cordova": "latest"
+      }
+    },
     "@ionic-native/camera-preview": {
       "version": "5.32.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/camera-preview/-/camera-preview-5.32.0.tgz",
@@ -22448,6 +23097,14 @@
         "@types/cordova": "latest"
       }
     },
+    "@ionic-native/http": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.32.0.tgz",
+      "integrity": "sha512-DDNhx+CmP9f0EgoQuiILrpNf3uqKH/pIcdWPtmvj+BV5up9NxBMdAP4KXO0ourh3XXAEi5j9H6knn5DPIUskmw==",
+      "requires": {
+        "@types/cordova": "latest"
+      }
+    },
     "@ionic-native/splash-screen": {
       "version": "5.32.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.32.0.tgz",
@@ -22464,6 +23121,14 @@
         "@types/cordova": "latest"
       }
     },
+    "@ionic-native/uptime": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/uptime/-/uptime-5.32.0.tgz",
+      "integrity": "sha512-zaKLdRjZZpE5V7PlYA952CpOLmYHoo2TafB7hNa00jtSpDWgHMo2lRjTvoLLmcCUrXKzBMhWRFX3Szc8SZI9sg==",
+      "requires": {
+        "@types/cordova": "latest"
+      }
+    },
     "@ionic/angular": {
       "version": "5.6.4",
       "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.4.tgz",
@@ -24819,8 +25484,6 @@
       "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==",
       "dev": true,
       "requires": {
-        "@angular/compiler": "9.0.0",
-        "@angular/core": "9.0.0",
         "app-root-path": "^3.0.0",
         "aria-query": "^3.0.0",
         "axobject-query": "2.0.2",
@@ -24923,6 +25586,12 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "compare-versions": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+      "dev": true
+    },
     "component-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -25339,6 +26008,11 @@
         }
       }
     },
+    "cordova-plugin-advanced-http": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
+      "integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
+    },
     "cordova-plugin-androidx": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-androidx/-/cordova-plugin-androidx-3.0.0.tgz",
@@ -25355,6 +26029,11 @@
         "recursive-readdir": "^2.2.2"
       }
     },
+    "cordova-plugin-battery-status": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-battery-status/-/cordova-plugin-battery-status-2.0.3.tgz",
+      "integrity": "sha512-H1vSLWbDb/qivGPVV/sjAaDnF8VEoa1uOYdrTJpYrs9vRAe3S37y8Fa5LoBuKkspWiQ5P3D8q+iTnsPF0UAO7g=="
+    },
     "cordova-plugin-camera-preview": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/cordova-plugin-camera-preview/-/cordova-plugin-camera-preview-0.12.1.tgz",
@@ -25367,6 +26046,11 @@
       "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==",
       "dev": true
     },
+    "cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA=="
+    },
     "cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
@@ -25391,6 +26075,11 @@
       "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==",
       "dev": true
     },
+    "cordova-plugin-uptime": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-uptime/-/cordova-plugin-uptime-0.1.1.tgz",
+      "integrity": "sha512-xM6A5jUO0JYOFGBedpLcPRxItIMj/9QdmOC7qMRSdCDL2vFCFphq7A8KJzM4Fza7FdI+CJbatKTE+iKyYRSmmw=="
+    },
     "cordova-res": {
       "version": "0.15.3",
       "resolved": "https://registry.npmjs.org/cordova-res/-/cordova-res-0.15.3.tgz",

package.json

@@ -26,13 +26,22 @@
     "@angular/platform-browser-dynamic": "~10.0.0",
     "@angular/router": "~10.0.0",
     "@angular/service-worker": "~10.0.0",
+    "@capacitor/android": "^2.4.7",
+    "@capacitor/core": "2.4.7",
+    "@ionic-native/battery-status": "^5.32.0",
     "@ionic-native/camera-preview": "^5.32.0",
     "@ionic-native/core": "^5.0.0",
     "@ionic-native/firebase-authentication": "^5.31.1",
     "@ionic-native/google-plus": "^5.31.1",
+    "@ionic-native/http": "^5.32.0",
     "@ionic-native/splash-screen": "^5.0.0",
     "@ionic-native/status-bar": "^5.0.0",
+    "@ionic-native/uptime": "^5.32.0",
     "@ionic/angular": "^5.0.0",
+    "cordova-plugin-advanced-http": "^3.1.0",
+    "cordova-plugin-battery-status": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
+    "cordova-plugin-uptime": "^0.1.1",
     "cordova-res": "^0.15.2",
     "dom-to-image": "^2.6.0",
     "face-api.js": "^0.22.2",
@@ -54,6 +63,7 @@
     "@angular/compiler": "~10.0.0",
     "@angular/compiler-cli": "~10.0.0",
     "@angular/language-service": "~10.0.0",
+    "@capacitor/cli": "2.4.7",
     "@ionic/angular-toolkit": "^2.3.0",
     "@types/dom-mediacapture-record": "^1.0.7",
     "@types/jasmine": "~3.5.0",

src/app/app.module.ts

@@ -6,6 +6,9 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { CameraPreview } from '@ionic-native/camera-preview/ngx';
+import { Uptime } from '@ionic-native/uptime/ngx';
+import { HTTP } from '@ionic-native/http/ngx';
+
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -35,6 +38,8 @@ import { ToastService } from './services/toast.service';
     NewsService,
     MatchService,
     ToastService,
+    Uptime,
+    HTTP,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     { provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig },
   ],

src/app/ar-fan-cam/ar-fan-cam.page.html

@@ -2,12 +2,10 @@
     
     <button class="back-button" (click)="back()"> <ion-icon name="close-outline"></ion-icon> </button>
 
-    <div class="container" #containerElement>
+    <div class="container">
         <canvas id="source-canvas" #sourceCanvasElement width="{{ width }}" height="{{ height }}"></canvas>
     </div>
 
-    <div *ngIf="!glassesFramesMeshLoaded || !glassesLensMeshLoaded">Loading</div>
-
     <section class="temp-image" [ngClass]="{'active' : !!tempImg }">
         <img *ngIf="tempImg" src="{{ tempImg }}">
     </section>

src/app/ar-fan-cam/ar-fan-cam.page.ts

@@ -1,5 +1,4 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { Location } from '@angular/common';
 import { ModalController } from '@ionic/angular';
 import { IJeelizFaceFilter } from 'vendors/jeelizFaceFilter/typescript/JeelizFaceFilterInterfaces';
 
@@ -27,7 +26,6 @@ export class ArFanCamPage implements OnInit {
     glassesLensMeshLoaded = false;
 
     constructor(
-        private location: Location,
         private modalController: ModalController
     ) {
     }
@@ -38,8 +36,6 @@ export class ArFanCamPage implements OnInit {
 
     // AR Face detection and drawing
 
-
-
     detect_callback(faceIndex, isDetected) {
         if (isDetected) {
             console.log('INFO in detect_callback(): DETECTED');

src/app/home-details/home-details.page.ts

@@ -42,12 +42,7 @@ export class HomeDetailsPage implements OnInit {
 
         if (type === 'news') {
             this.newsService.getArticleDetails(alias_title).then((data: any) => {
-
-                if (data && data.content && data.content.data) {
-                    this.newsDetails = data.content.data;
-                } else {
-                    this.toastService.presentToastWithOptions("No News available");
-                }
+                this.newsDetails = JSON.parse(data.data)['content'].data;
 
             }, (err) => {
                 console.log(err);
@@ -58,11 +53,7 @@ export class HomeDetailsPage implements OnInit {
         if (type === 'videos') {
             this.newsService.getVideoDetails(alias_title).then((data: any) => {
 
-                if (data && data.content && data.content.data) {
-                    this.newsDetails = data.content.data;
-                } else {
-                    this.toastService.presentToastWithOptions("No Video available");
-                }
+                this.newsDetails = JSON.parse(data.data)['content'].data;
 
             }, (err) => {
                 console.log(err);
@@ -73,11 +64,7 @@ export class HomeDetailsPage implements OnInit {
         if (type === 'gallery') {
             this.newsService.getGalleryDetails(alias_title).then((data: any) => {
 
-                if (data && data.content && data.content.data) {
-                    this.newsDetails = data.content.data;
-                } else {
-                    this.toastService.presentToastWithOptions("No Photos available");
-                }
+                this.newsDetails = JSON.parse(data.data)['content'].data;
 
             }, (err) => {
                 console.log(err);

src/app/home/home.page.ts

@@ -4,6 +4,8 @@ import { Router } from '@angular/router';
 import { NewsService, IMAGE_BASE_URL } from '../services/news.service';
 import { ToastService } from '../services/toast.service';
 import { DomSanitizer } from '@angular/platform-browser';
+import { Uptime } from '@ionic-native/uptime/ngx';
+
 
 @Component({
     selector: 'app-home',
@@ -32,12 +34,14 @@ export class HomePage implements OnInit {
     showChat: boolean = false;
 
     image_url = IMAGE_BASE_URL;
+    myuptime: string;
 
     constructor(
         private router: Router,
         private newsService: NewsService,
         private toastService: ToastService,
         private dom: DomSanitizer,
+        private uptime: Uptime
     ) { }
 
     transformYourHtml(htmlTextWithStyle) {
@@ -45,36 +49,27 @@ export class HomePage implements OnInit {
     }
 
     ngOnInit() {
-        this.newsService.getArticles().then((data: any) => {
-            if (data && data.content && data.content.items) {
-                this.newsData = data.content.items;
-            } else {
-                this.toastService.presentToastWithOptions("No News available");
-            }
 
+        this.uptime.getUptime(true)
+        .then(uptime => this.myuptime = uptime)
+        .catch(error => console.log(error));
+
+        this.newsService.getArticles().then((data: any) => {
+            // alert(JSON.stringify());
+            this.newsData = JSON.parse(data.data)['content'].items;
         }, (err) => {
             console.log(err);
             this.toastService.presentToastWithOptions("Failed to get News data", "danger");
         });
 
         this.newsService.getVideos().then((data: any) => {
-            if (data && data.content && data.content.items) {
-                this.videoData = data.content.items;
-            } else {
-                this.toastService.presentToastWithOptions("No Videos available");
-            }
-
+            this.videoData = JSON.parse(data.data)['content'].items;
         }, (err) => {
             this.toastService.presentToastWithOptions("Failed to get Videos data", "danger");
         });
 
         this.newsService.getGalleries().then((data: any) => {
-            if (data && data.content && data.content.items) {
-                this.galleryData = data.content.items;
-            } else {
-                this.toastService.presentToastWithOptions("No Albums available");
-            }
-
+            this.galleryData = JSON.parse(data.data)['content'].items;
         }, (err) => {
             console.log(err);
             this.toastService.presentToastWithOptions("Failed to get Gallery data", "danger");

src/app/services/news.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HTTP } from '@ionic-native/http/ngx';
 
 export const IMAGE_BASE_URL: string = 'https://www.punjabkingsipl.in/static-assets/waf-images/';
 
@@ -8,30 +8,30 @@ export const IMAGE_BASE_URL: string = 'https://www.punjabkingsipl.in/static-asse
 })
 export class NewsService {
     constructor(
-        private http: HttpClient
+        private http: HTTP
     ) { }
 
     getArticles() {
-        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=4&otherent=1,8021&pgnum=1&inum=10&pgsize=10').toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=4&otherent=1,8021&pgnum=1&inum=10&pgsize=10', {}, {});
     }
 
     getArticleDetails(title_alias_from_listing_api: string) {
-        return this.http.get('https://www.punjabkingsipl.in/api/article/' + title_alias_from_listing_api + '?is_app=1').toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/article/' + title_alias_from_listing_api + '?is_app=1', {}, {});
     }
 
     getVideos() {
-        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=3,4&otherent=&pgnum=1&inum=10&pgsize=10').toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=3,4&otherent=&pgnum=1&inum=10&pgsize=10', {}, {});
     }
 
     getVideoDetails(title_alias_from_listing_api: string) {
-        return this.http.get('https://www.punjabkingsipl.in/api/video/' + title_alias_from_listing_api).toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/video/' + title_alias_from_listing_api, {}, {});
     }
 
     getGalleries() {
-        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=2,4&otherent=&pgnum=1&inum=10&pgsize=10').toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/listing?entities=2,4&otherent=&pgnum=1&inum=10&pgsize=10', {}, {});
     }
 
     getGalleryDetails(title_alias_from_listing_api: string) {
-        return this.http.get('https://www.punjabkingsipl.in/api/photo/' + title_alias_from_listing_api).toPromise();
+        return this.http.get('https://www.punjabkingsipl.in/api/photo/' + title_alias_from_listing_api, {}, {});
     }
 }