From 415712cad36738f76118a7eb0cdfa9e9ab021d6f Mon Sep 17 00:00:00 2001
From: kj1352 <nikhilkj24@gmail.com>
Date: Mon, 19 Apr 2021 09:01:55 +0530
Subject: [PATCH] Fan cam not opening issue resolved

---
 src/app/ar-fan-cam/ar-fan-cam.page.ts               | 13 +++++--------
 .../facebook-login/facebook-login.component.ts      |  2 +-
 src/app/fan-zone/fan-zone.page.html                 |  2 +-
 src/app/home/home.page.ts                           | 11 ++++-------
 src/app/welcome/welcome.page.ts                     |  2 +-
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/app/ar-fan-cam/ar-fan-cam.page.ts b/src/app/ar-fan-cam/ar-fan-cam.page.ts
index 92f3bb5..aa4ff0c 100644
--- a/src/app/ar-fan-cam/ar-fan-cam.page.ts
+++ b/src/app/ar-fan-cam/ar-fan-cam.page.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { Location } from '@angular/common';
 import { IJeelizFaceFilter } from 'vendors/jeelizFaceFilter/typescript/JeelizFaceFilterInterfaces';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 
@@ -29,15 +29,15 @@ export class ArFanCamPage implements OnInit {
     glassesLensMeshLoaded: boolean = false;
 
     constructor(
-        private modalController: ModalController,
-        private socialSharing: SocialSharing
+        private socialSharing: SocialSharing,
+        private location: Location
     ) {
     }
 
     back() {
         JEELIZFACEFILTER.destroy();
         this.camLoaded = false;
-        this.modalController.dismiss();
+        this.location.back();
     }
 
     // AR Face detection and drawing
@@ -229,10 +229,7 @@ export class ArFanCamPage implements OnInit {
     }
 
     approveImage() {
-        
-        this.modalController.dismiss({
-            imageData: this.tempImg
-        });        
+
     }
 
 
diff --git a/src/app/components/facebook-login/facebook-login.component.ts b/src/app/components/facebook-login/facebook-login.component.ts
index 8a0efff..03bbe4e 100644
--- a/src/app/components/facebook-login/facebook-login.component.ts
+++ b/src/app/components/facebook-login/facebook-login.component.ts
@@ -64,7 +64,7 @@ export class FacebookLoginComponent implements OnInit {
      
         if (result.accessToken && result.accessToken.userId) {
             this.token = result.accessToken;
-            this.loadUserData();
+            this.loadUserData(true);
             
             localStorage.setItem('FBToken', this.token);
 
diff --git a/src/app/fan-zone/fan-zone.page.html b/src/app/fan-zone/fan-zone.page.html
index eb4ed08..d69763b 100644
--- a/src/app/fan-zone/fan-zone.page.html
+++ b/src/app/fan-zone/fan-zone.page.html
@@ -25,7 +25,7 @@
         </ul>
 
         <ul class="fan-feature-list">
-            <li (click)="presentCamModal()">
+            <li [routerLink]="['/ar-fan-cam']">
                 <div>
                     <ion-icon name="camera-outline"></ion-icon>
 
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 94c6157..2cdf65e 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -124,21 +124,18 @@ export class HomePage implements OnInit {
         }, (err) => {
             console.log(err);
             this.toastService.presentToastWithOptions("Failed to get Gallery data", "danger");
-        });
+        });        
+    }
 
+    ionViewDidEnter() {
         this.userService.getUserProfile().then((data: any) => {
+            alert(JSON.stringify(data));
             this.liked_articles = data.liked_articles;
             this.bookmarked_articles = data.bookmarked_articles;
         }, () => {
             this.liked_articles = [];
             this.bookmarked_articles = [];
         });
-    }    
-
-    ionViewDidEnter() {
-        if (localStorage.isPartyChatOn === 'yes') {
-            this.showChat = true;
-        }
     }
     
     getIndex(e: any) {
diff --git a/src/app/welcome/welcome.page.ts b/src/app/welcome/welcome.page.ts
index 2fc20ca..47421a7 100644
--- a/src/app/welcome/welcome.page.ts
+++ b/src/app/welcome/welcome.page.ts
@@ -19,7 +19,7 @@ export class WelcomePage implements OnInit {
             
             setTimeout(() => {
                 this.router.navigate(['/tabs/home']);
-            }, 4000);
+            }, 3000);
             
         } else {
             this.user = null;