From 78a5d4c80bb86ae813517361d93e9932b69fcde1 Mon Sep 17 00:00:00 2001
From: kj1352 <nikhilkj24@gmail.com>
Date: Mon, 19 Apr 2021 09:34:25 +0530
Subject: [PATCH] Facebook login post welcome redirects user back to the old
 page

---
 .../facebook-login/facebook-login.component.html       |  2 +-
 src/app/home/home.page.ts                              |  1 -
 src/app/welcome/welcome.page.ts                        | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/components/facebook-login/facebook-login.component.html b/src/app/components/facebook-login/facebook-login.component.html
index 42a1db7..611efea 100644
--- a/src/app/components/facebook-login/facebook-login.component.html
+++ b/src/app/components/facebook-login/facebook-login.component.html
@@ -11,7 +11,7 @@
     <section class="social-login" [ngClass]="{'active' : showLogout && user }">
         <section class="login-box" *ngIf="user">
             <button (click)="logout()"> 
-                Logout & Exit from "{{ user.name }}"?                
+                Logout & Exit?
             </button>
             <button (click)="showLogout = false">
                 <ion-icon name="close-circle-outline"></ion-icon>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 2cdf65e..775020f 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -129,7 +129,6 @@ export class HomePage implements OnInit {
 
     ionViewDidEnter() {
         this.userService.getUserProfile().then((data: any) => {
-            alert(JSON.stringify(data));
             this.liked_articles = data.liked_articles;
             this.bookmarked_articles = data.bookmarked_articles;
         }, () => {
diff --git a/src/app/welcome/welcome.page.ts b/src/app/welcome/welcome.page.ts
index 47421a7..e3fd40b 100644
--- a/src/app/welcome/welcome.page.ts
+++ b/src/app/welcome/welcome.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Location } from '@angular/common';
 
 @Component({
     selector: 'app-welcome',
@@ -10,20 +10,20 @@ export class WelcomePage implements OnInit {
     user: any;
 
     constructor(
-        private router: Router
+        private location: Location
     ) { }
 
     ngOnInit() {
         if (localStorage.getItem('FBUser')) {
             this.user = JSON.parse(localStorage.getItem('FBUser'));
             
-            setTimeout(() => {
-                this.router.navigate(['/tabs/home']);
+            setTimeout(() => {                
+                this.location.back();
             }, 3000);
             
         } else {
             this.user = null;
-            this.router.navigate(['/tabs/home']);
+            this.location.back();
         }
     }