Merge branch 'adarsh' into 'master'

src/app/app.component.html

@@ -3,12 +3,12 @@
     <ion-menu>
       <ion-content>
         <div class="side_menu_wrapper">
-          <ion-menu-toggle>
+          <ion-menu-toggle *ngIf="userData">
             <div class="top_banner">
               <div class="top_image"></div>
               <div class="top_detail">
-                <h4>John Doe</h4>
-                <p>[email protected]</p>
+                <h4>{{userData.name}}</h4>
+                <p>{{userData.emailId}}</p>
               </div>
               <div class="clear"></div>
             </div>
@@ -95,7 +95,7 @@
         class="icon_sec m6_icon"
         [class.m6_icon_act]="sec_active6"
         (click)="setActive6()"
-      ></div>
+        menuClose></div>
     </li>
   </ul>
 </div>

src/app/app.component.ts

@@ -3,7 +3,11 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { Platform, Events } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
-import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
+import {
+  AngularFirestore,
+  AngularFirestoreDocument,
+  AngularFirestoreCollection
+} from '@angular/fire/firestore';
 import * as firebase from 'firebase';
 import { ModalController } from '@ionic/angular';
 import { DeliverypopPage } from './deliverypop/deliverypop.page';
@@ -13,8 +17,6 @@ import { SubjectService } from './../config/subject.service';
 import { CategoriesService } from './../config/category.service';
 import { SearchmodalPage } from './searchmodal/searchmodal.page';
 
-
-
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
@@ -30,6 +32,7 @@ export class AppComponent {
   state: boolean;
 
   menuw: number;
+  userData: any;
 
   constructor(
     private platform: Platform,
@@ -46,10 +49,19 @@ export class AppComponent {
   ) {
     this.state = true;
     this.initializeApp();
-    this.orderState();
     this.subjectService.getLoginData().subscribe(loginData => {
       this.state = loginData;
     });
+
+    this.service.get('userData').then(userData => {
+      if (userData) {
+        this.userData = JSON.parse(userData);
+        console.log(userData);
+        this.orderState();
+      } else {
+        console.log(userData);
+      }
+    });
   }
 
   initializeApp() {
@@ -70,7 +82,13 @@ export class AppComponent {
   }
 
   fetchCase() {
-    const restrictedUrl = ['productdetail', 'cart', 'nearby', 'verification'];
+    const restrictedUrl = [
+      'productdetail',
+      'cart',
+      'nearby',
+      'verification',
+      'orderplaced'
+    ];
     const currentUrl = this.router.url.split('/');
     const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
     // console.log(currentUrl[1], index, this.state);
@@ -137,8 +155,7 @@ export class AppComponent {
   }
 
   orderState() {
-    console.log('called');
-    const custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
+    const custId = this.userData.uid;
     firebase
       .firestore()
       .collection('orders')

src/app/app.module.ts

@@ -16,6 +16,7 @@ import { AngularFireModule } from '@angular/fire';
 import { AngularFirestore } from '@angular/fire/firestore';
 import { AngularFirestoreModule } from '@angular/fire/firestore';
 import { AngularFireAuthModule } from '@angular/fire/auth';
+import { AngularFireStorageModule } from '@angular/fire/storage';
 
 import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { NativeGeocoder } from '@ionic-native/native-geocoder/ngx';
@@ -41,6 +42,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
     DeliverypopPageModule,
     AngularFireAuthModule,
     AngularFirestoreModule,
+    AngularFireStorageModule,
     SearchmodalPageModule,
     FormsModule
   ],

src/app/myorder/myorder.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
-  </button>
+  <button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
   <div class="nav_title floatLeft">
     <h4>MY ORDERS</h4>
   </div>
@@ -12,32 +11,50 @@
       <li *ngFor="let order of myorder.orders; let i = index">
         <div class="order_info">
           <h5 class="floatLeft">{{order.orderCode}}</h5>
-                    <button class="order_track floatRight" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">Track Order</button>
+          <button
+            class="order_track floatRight"
+            *ngIf="order.orderStatus >= 3 && order.orderStatus < 7"
+            (click)="orderDetails(i)"
+          >
+            Track Order
+          </button>
           <div class="clear"></div>
         </div>
         <div *ngFor="let product of order.product" (click)="viewOrder(order)">
-                        <div class="order_image"><img [src]="product.image" onerror="" /></div>
+          <div class="order_image">
+            <img [src]="product.image" onerror="" />
+          </div>
           <div class="order_detail">
             <h5 class="floatLeft">{{product.prodName}}</h5>
             <div class="clear"></div>
-                            <h5>{{product.color}}, {{product.size}} <span>{{product.qty}}</span></h5>
+            <h5>
+              <span *ngIf="product.color !== 'No-Color'"
+                >{{product.color}},
+              </span>
+              <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span
+              >&nbsp;<span>{{product.qty}}</span>
+            </h5>
 
             <p>A$ {{product.price}}</p>
-                            
           </div>
           <div class="order_other">
-                            <h6 class="floatRight">{{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6>
-                            <span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7" (click)="acceptOrder(order)">{{getStatus(order.orderStatus)}}</span>
+            <h6 class="floatRight">
+              {{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}
+            </h6>
+            <span
+              class="floatRight"
+              *ngIf="order.orderStatus < 3 || order.orderStatus >= 7"
+              (click)="acceptOrder(order)"
+              >{{getStatus(order.orderStatus)}}</span
+            >
             <div class="clear"></div>
             <!-- <button class="track_btn" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">TRACK</button> -->
             <div class="clear"></div>
           </div>
           <div class="clear"></div>
-                        <hr>
+          <hr />
         </div>
 
-            
-                   
         <div class="order_info">
           <h5 class="floatRight">TOTAL PRICE : {{order.amount}}</h5>
 

src/app/orderplaced/orderplaced.page.html

@@ -3,21 +3,19 @@
     <div class="cart_head">
       <div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
-                    <img src="../assets/arrow_white.png">
+          <img src="../assets/arrow_white.png" />
         </button>
         <div class="nav_title floatLeft">
           <h4></h4>
         </div>
-                <button class="nav_btn floatRight">
-        </button>
+        <button class="nav_btn floatRight"></button>
         <div class="clear"></div>
       </div>
-            <img src="../assets/white_tick.png">
+      <img src="../assets/white_tick.png" />
       <h4>ORDER IS PLACED</h4>
       <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p>
     </div>
     <div class="order_status">
-
       <div class="clear"></div>
       <div class="status_div go_green">
         <h4>Order Placed</h4>
@@ -61,33 +59,48 @@
       <ul>
         <li (click)="goToPage('productlist')">
           <div class="nearby_image">
-                        <img src="../assets/[email protected]">
+            <img
+              [src]="data.product[0].image"
+              onerror="this.src='../assets/[email protected]'"
+            />
           </div>
           <div class="nearby_detail">
             <h5>
               <span class="floatLeft">{{data.shopperName}}</span>
-                            <span class="floatRight">0
-                     <img src="../assets/Path61_2.png">
+              <span class="floatRight"
+                >{{data.product[0].qty}}
+                <img src="../assets/Path61_2.png" />
               </span>
               <div class="clear"></div>
             </h5>
-                        <p>Men's & Women's Fashion</p>
+            <p class="prodName">{{data.product[0].prodName}}</p>
           </div>
           <div class="clear"></div>
         </li>
       </ul>
     </div>
     <div class="product_detail" *ngFor="let product of data.product">
-            <h6>{{product.color}}, {{product.size}}</h6>
+      <h6>
+        <span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span>
+        <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span>
+      </h6>
       <h5>Quantity : <span>{{product.qty}}</span></h5>
-            <h5>Amount : <strong>A$ {{product.price}}</strong><span class="afterpay">COD</span></h5>
-            <h5>Delivery time : <span>Delivery in 1 hour</span></h5>
-            <h4>DELIVERY</h4>
       <h5>
-                {{deliveryAddress}}
+        Amount : <strong>A$ {{product.price}}</strong
+        ><span class="afterpay">COD</span>
       </h5>
-            <button class="cancel_btn" (click)="goToPage('ordercancelled')">CANCEL THIS ORDER</button>
-            <hr>
+      <h5>Delivery time : <span>{{deliveryTime}}</span></h5>
+      <h4>DELIVERY</h4>
+      <h5 *ngIf="data.deliveryAddress">
+        {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
+        <br />
+        {{data.deliveryAddress.building}}, <br />
+        {{data.deliveryAddress.landmark}}
+      </h5>
+      <button class="cancel_btn" (click)="goToPage('ordercancelled')">
+        CANCEL THIS ORDER
+      </button>
+      <hr />
     </div>
 
     <!-- <div class="related_product_slider">

src/app/orderplaced/orderplaced.page.scss

@@ -4,7 +4,7 @@
     width: 100%;
     height: 240px;
     text-align: center;
-        background-image: url("../../assets/[email protected]");
+    background-image: url('../../assets/[email protected]');
     background-position: center bottom;
     background-repeat: no-repeat;
     background-size: cover;
@@ -13,7 +13,7 @@
       background-color: transparent;
       .nav_title {
         h4 {
-                    color: #FFF;
+          color: #fff;
         }
       }
     }
@@ -41,7 +41,7 @@
       border-radius: 5px;
       height: 40px;
       background-color: #29285b;
-            color: #FFF;
+      color: #fff;
       font-size: 18px;
       font-weight: lighter;
       padding-left: 20px;
@@ -164,7 +164,7 @@
       height: 45px;
       width: 100%;
       background-color: #29285b;
-            color: #FFF;
+      color: #fff;
       font-size: 18px;
       font-weight: lighter;
       padding-left: 20px;
@@ -220,7 +220,7 @@
             font-size: 27px;
             width: 30px;
             height: 30px;
-                        background-image: url("../../assets/Group32_2.png");
+            background-image: url('../../assets/Group32_2.png');
             background-position: center;
             background-repeat: no-repeat;
             background-size: 24px;
@@ -254,7 +254,7 @@
           span {
             text-decoration: line-through;
             margin-left: 10px;
-                        color: rgba(215, 213, 228, 1)
+            color: rgba(215, 213, 228, 1);
           }
           .offer {
             color: #fff;
@@ -269,3 +269,10 @@
     }
   }
 }
+
+.prodName {
+  white-space: nowrap;
+  width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

src/app/orderplaced/orderplaced.page.ts

@@ -6,29 +6,58 @@ import { ServiceService } from './../../config/service.service';
 @Component({
   selector: 'app-orderplaced',
   templateUrl: './orderplaced.page.html',
-  styleUrls: ['./orderplaced.page.scss'],
+  styleUrls: ['./orderplaced.page.scss']
 })
 export class OrderplacedPage implements OnInit {
-  data: any;
+  deliveryTime: any;
+  timeinterval: any;
   constructor(
     private router: Router,
     private route: ActivatedRoute,
     private location: Location,
     private service: ServiceService
   ) {
+    this.deliveryTime = '';
     this.service.get('order').then(val => {
       this.data = val;
+      this.timeinterval = setInterval(() => {
+        this.getDeliveryTime(this.data.bookDate.seconds);
+      }, 1000);
     });
-
-  }
-
-  ngOnInit() {
   }
+  data: any;
 
   relatedProd = {
     slidesPerView: 2
+  };
+
+  getDeliveryTime(timeStamp) {
+    console.log(timeStamp);
+    const endDate = new Date(timeStamp * 1000);
+    console.log(endDate);
+    endDate.setHours(endDate.getHours() + 1);
+    const t = this.getTimeRemaining(endDate, new Date());
+    const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;
+    const seconds = t.seconds < 10 ? '0' + t.seconds : t.seconds;
+    this.deliveryTime = minutes + ' : ' + seconds;
+    if (t.t <= 0) {
+      clearInterval(this.timeinterval);
+    }
+  }
+
+  getTimeRemaining(endtime, currDate) {
+    const t = Date.parse(endtime) - Date.parse(currDate);
+    const seconds = Math.floor((t / 1000) % 60);
+    const minutes = Math.floor((t / 1000 / 60) % 60);
+    return {
+      t,
+      minutes,
+      seconds
+    };
   }
 
+  ngOnInit() {}
+
   goToPage(path, data = null) {
     this.router.navigateByUrl(path, { queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
@@ -37,5 +66,4 @@ export class OrderplacedPage implements OnInit {
   goBack() {
     this.location.back();
   }
-
 }

src/app/profile/profile.page.html

@@ -8,13 +8,23 @@
   <div class="clear"></div>
 </div>
 <ion-content>
-  <div class="profile_wrapper">
+  <div class="profile_wrapper" *ngIf="loggedUser">
     <div class="profile_banner">
+      <!-- <div class="profile_circle">
+        <div class="edit"></div>
+      </div> -->
+
       <div class="profile_circle">
+        <img
+          [src]="loggedUser.profilePhoto"
+          onerror="this.src='./../../assets/profile_banner.png'"
+        />
         <div class="edit"></div>
+        <input type="file" accept="image/*" (change)="fileChange($event)" />
       </div>
-      <h5>{{user && user.name}}</h5>
-      <p>LOGOUT</p>
+
+      <h5>{{loggedUser.name}}</h5>
+      <p (click)="authService.SignOut()">LOGOUT</p>
     </div>
     <div class="account_wrapper">
       <div class="account_header">
@@ -30,13 +40,15 @@
         <ion-row>
           <ion-col class="textLeft p0">
             <p>
-              Name<span
-                >{{user && phoneVerified? "Verified": "Not Verified yet"}}</span
+              Phone
+              <span *ngIf="loggedUser.phoneVerified == true">Verified</span>
+              <span *ngIf="loggedUser.phoneVerified == false"
+                >Not Verified yet</span
               >
             </p>
           </ion-col>
           <ion-col class="textRight p0">
-            <h6>{{user && user.name}}</h6>
+            <h6>{{loggedUser.phone}}</h6>
           </ion-col>
         </ion-row>
       </div>
@@ -44,13 +56,16 @@
         <ion-row>
           <ion-col class="textLeft p0">
             <p>
-              Email<span
-                >{{user && emailVerified? "Verified": "Not Verified yet"}}</span
+              Email<span *ngIf="userData && userData.emailVerified == true"
+                >Verified</span
+              >
+              <span *ngIf="loggedUser.emailVerified == false"
+                >Not Verified yet</span
               >
             </p>
           </ion-col>
           <ion-col class="textRight p0">
-            <h6>{{user && user.emailId}}</h6>
+            <h6>{{loggedUser.emailId}}</h6>
           </ion-col>
         </ion-row>
       </div>
@@ -88,7 +103,7 @@
         <ion-col class="textLeft p0">
           <p>My Order</p>
         </ion-col>
-        <ion-col class="textRight p0">
+        <ion-col class="textRight p0" (click)="goToPage('myorder')">
           <h6>
             <ion-icon name="arrow-forward"></ion-icon>
           </h6>

src/app/profile/profile.page.scss

 .profile_wrapper {
   .profile_banner {
     width: 100%;
-        background-image: url("../../assets/profile_banner.png");
+    background-image: url('../../assets/profile_banner.png');
     background-position: center;
     background-repeat: no-repeat;
     background-size: cover;
@@ -21,6 +21,17 @@
         object-position: center;
         border-radius: 50%;
       }
+      input {
+        width: 80px;
+        height: 100%;
+        opacity: 0;
+        cursor: pointer;
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+      }
       .edit {
         width: 30px;
         height: 30px;
@@ -28,7 +39,7 @@
         object-fit: cover;
         object-position: center;
         background-color: #000;
-                background-image: url("../../assets/edit_icon.png");
+        background-image: url('../../assets/edit_icon.png');
         background-size: cover;
         cursor: pointer;
         position: absolute;
@@ -95,7 +106,7 @@
       padding-bottom: 20px;
     }
     hr {
-            border-bottom: 1px solid rgba(176, 174, 199, .5);
+      border-bottom: 1px solid rgba(176, 174, 199, 0.5);
       height: 0px;
       border-top: none;
       margin-top: 15px;

src/app/profile/profile.page.ts

-import { Component, OnInit } from "@angular/core";
-import { User } from "../../config/services/user";
-import { UserService } from "../../config/user.service";
-import { ServiceService } from "../../config/service.service";
-import { Router, ActivatedRoute } from "@angular/router";
+import { Component, OnInit } from '@angular/core';
+import { User } from '../../config/services/user';
+import { UserService } from '../../config/user.service';
+import { ServiceService } from '../../config/service.service';
+import { AuthService } from '../../config/auth.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { finalize, tap } from 'rxjs/operators';
+import {
+  AngularFireStorage,
+  AngularFireStorageReference,
+  AngularFireUploadTask
+} from '@angular/fire/storage';
+import {
+  AngularFirestore,
+  AngularFirestoreDocument,
+  AngularFirestoreCollection
+} from '@angular/fire/firestore';
 
 @Component({
-  selector: "app-profile",
-  templateUrl: "./profile.page.html",
-  styleUrls: ["./profile.page.scss"]
+  selector: 'app-profile',
+  templateUrl: './profile.page.html',
+  styleUrls: ['./profile.page.scss']
 })
 export class ProfilePage implements OnInit {
   user: User;
   userdata: any;
-  custId: String;
+  custId: string;
+  userData: any;
+  loggedUser: any;
+  ref: AngularFireStorageReference;
+  downloadURL;
 
   constructor(
     private router: Router,
+    private storage: AngularFireStorage,
     private useService: UserService,
-    private service: ServiceService
+    private service: ServiceService,
+    private authService: AuthService
   ) {
-    const params = this.useService.users;
-    const userdata = this.service.get("user").then(data => {
+    this.service.get('user').then(data => {
       if (data) {
-        data = JSON.parse(data);
-        this.service.set("params", data);
-
-        this.custId = data.uid;
+        this.userData = JSON.parse(data);
+        console.log(this.userData);
       }
     });
 
-    this.useService.getUserData("9cYSZwGvVpgkUHVcz8Dm6oqGX152");
-
-    // .then(res => {
-    //   console.log("asdasda", res);
-    //   this.userdata = res;
-    // });
+    this.service.get('userData').then(data => {
+      if (data) {
+        this.loggedUser = JSON.parse(data);
+      }
+    });
   }
 
   goToPage(path, data = null) {
@@ -43,11 +57,48 @@ export class ProfilePage implements OnInit {
   }
 
   ngOnInit() {
-    let This = this;
+    const This = this;
     setTimeout(() => {
       this.user = this.useService.users;
-      console.log("[users]", this.user);
-      this.service.set("params", this.user);
+      // console.log('[users]', this.user);
+      this.service.set('params', this.user);
     }, 500);
   }
+
+  async fileChange(event) {
+    const fileList: FileList = event.target.files;
+    if (fileList.length > 0) {
+      const reader = new FileReader();
+      let profilePic;
+      reader.onload = (events: any) => {
+        profilePic = events.target.result;
+        this.loggedUser.profilePhoto = events.target.result;
+      };
+
+      profilePic = event.target.result;
+
+      reader.readAsDataURL(event.target.files[0]);
+
+      const file = fileList[0];
+      const ext = file.name.split('.').pop();
+      if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
+        const path = file.name; // + Date.now();
+        const ref = this.storage.ref(path);
+        const task = this.storage
+          .upload(path, file)
+          .snapshotChanges()
+          .pipe(
+            finalize(() => {
+              ref.getDownloadURL().subscribe(url => {
+                this.authService.profilePic(url);
+              });
+            })
+          )
+          .subscribe();
+
+        // this.downloadURL = await ref.getDownloadURL().toPromise();
+        // console.log(this.downloadURL);
+      }
+    }
+  }
 }

src/config/auth.service.ts

@@ -3,7 +3,11 @@ import { User, Signup, Address } from './services/user';
 import { auth } from 'firebase/app';
 import { Router, ActivatedRoute } from '@angular/router';
 import { AngularFireAuth } from '@angular/fire/auth';
-import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
+import {
+  AngularFirestore,
+  AngularFirestoreDocument,
+  AngularFirestoreCollection
+} from '@angular/fire/firestore';
 import { ServiceService } from './../config/service.service';
 import { SubjectService } from './../config/subject.service';
 import { GooglePlus } from '@ionic-native/google-plus/ngx';
@@ -14,10 +18,6 @@ import { from } from 'rxjs';
   providedIn: 'root'
 })
 export class AuthService {
-  userData: any;
-  type: number;
-  userPostData: any;
-
   constructor(
     public afs: AngularFirestore,
     public afAuth: AngularFireAuth,
@@ -33,6 +33,7 @@ export class AuthService {
         this.userData = user;
         console.log(this.userData);
         this.service.set('user', JSON.stringify(this.userData));
+        this.SetUserData(user);
         if (this.type === 1) {
           this.router.navigateByUrl('home');
         } else {
@@ -47,12 +48,25 @@ export class AuthService {
     });
   }
 
+  get isLoggedIn(): boolean {
+    const user = JSON.parse(localStorage.getItem('user'));
+    return user !== null && user.emailVerified !== false ? true : false;
+  }
+  userData: any;
+  type: number;
+  userPostData: any;
+  loggedUser: any;
+
+  public asyc;
   public async SignIn(email: string, password: string) {
-    return this.afAuth.auth.signInWithEmailAndPassword(email, password).then((result) => {
+    return this.afAuth.auth
+      .signInWithEmailAndPassword(email, password)
+      .then(result => {
         console.log('success');
         document.body.scrollTop = document.documentElement.scrollTop = 0;
         this.SetUserData(result.user);
-    }).catch((error) => {
+      })
+      .catch(error => {
         window.alert(error.message);
       });
   }
@@ -61,49 +75,66 @@ export class AuthService {
     console.log(this.userData.uid, otp);
     // tslint:disable-next-line:radix
     // const otpnew = parseInt(otp);
-    const custRef: AngularFirestoreCollection<any> = this.afs.collection('customers', ref => ref.where('otp', '==', otp)
-    .where('uid', '==', this.userData.uid)
+    const custRef: AngularFirestoreCollection<any> = this.afs.collection(
+      'customers',
+      ref => ref.where('otp', '==', otp).where('uid', '==', this.userData.uid)
     );
-    custRef.valueChanges().pipe(take(1)).subscribe((value: User[]) => {
+    custRef
+      .valueChanges()
+      .pipe(take(1))
+      .subscribe((value: User[]) => {
         if (value.length > 0) {
-        this.afs.collection('customers').doc(this.userData.uid).update({otp: ''});
+          this.afs
+            .collection('customers')
+            .doc(this.userData.uid)
+            .update({ otp: '', phoneVerified: true });
           this.service.set('type', 1);
           this.router.navigateByUrl('nearby');
         } else {
           window.alert('Please input valid OTP');
         }
       });
-
   }
 
+  profilePic(pic) {
+    this.afs
+      .collection('customers')
+      .doc(this.userData.uid)
+      .update({ profilePhoto: pic });
+  }
 
   public async google(type: number) {
     this.type = type;
     // this.googlePlus.login({}).then(res => console.log(res)).catch(err => console.error(err));
-    this.afAuth.auth.signInWithPopup(new auth.GoogleAuthProvider()).then((result) => {
+    this.afAuth.auth
+      .signInWithPopup(new auth.GoogleAuthProvider())
+      .then(result => {
         console.log('success');
-      console.log(result);
+        console.log(result.additionalUserInfo.isNewUser);
+        if (
+          result.additionalUserInfo &&
+          result.additionalUserInfo.isNewUser === true
+        ) {
           this.socialSignUp(result);
+        }
       });
   }
 
   public async facebook(type: number) {
     this.type = type;
-    this.afAuth.auth.signInWithPopup(new auth.FacebookAuthProvider()).then((result) => {
+    this.afAuth.auth
+      .signInWithPopup(new auth.FacebookAuthProvider())
+      .then(result => {
         console.log('success');
         console.log(result);
       });
   }
 
-  get isLoggedIn(): boolean {
-    const user = JSON.parse(localStorage.getItem('user'));
-    return(user !== null && user.emailVerified !== false) ? true : false;
-  }
-
   SetUserData(user: any) {
-
-    const userRef: AngularFirestoreDocument<any> = this.afs.doc(`customers/${user.uid}`);
-    userRef.valueChanges().subscribe((value) => {
+    const userRef: AngularFirestoreDocument<any> = this.afs.doc(
+      `customers/${user.uid}`
+    );
+    userRef.valueChanges().subscribe(value => {
       const userData: User = {
         uid: value.uid,
         emailId: value.emailId,
@@ -117,7 +148,9 @@ export class AuthService {
         otp: value.otp,
         loginType: value.loginType
       };
-      console.log(userData);
+      this.loggedUser = userData;
+      this.service.set('userData', JSON.stringify(this.loggedUser));
+      console.log(this.loggedUser);
     });
   }
 
@@ -154,7 +187,11 @@ export class AuthService {
     };
     this.userPostData = postData;
     console.log(postData);
-    this.afs.collection('customers').doc(userData.uid).set(postData).then(() => {
+    this.afs
+      .collection('customers')
+      .doc(userData.uid)
+      .set(postData)
+      .then(() => {
         console.log('successs');
       });
   }
@@ -163,7 +200,9 @@ export class AuthService {
     this.type = 2;
     console.log(userData);
     const otp = Math.floor(1000 + Math.random() * 9000);
-    this.afAuth.auth.createUserWithEmailAndPassword(userData.emailId, userData.password).then((result) => {
+    this.afAuth.auth
+      .createUserWithEmailAndPassword(userData.emailId, userData.password)
+      .then(result => {
         console.log(result.user);
         this.afAuth.auth.currentUser.sendEmailVerification();
         const currencyData = {
@@ -187,10 +226,15 @@ export class AuthService {
         };
         this.userPostData = postData;
         console.log(postData);
-      this.afs.collection('customers').doc(custData.uid).set(postData).then(() => {
+        this.afs
+          .collection('customers')
+          .doc(custData.uid)
+          .set(postData)
+          .then(() => {
             console.log('successs');
           });
-    }).catch((error) => {
+      })
+      .catch(error => {
         window.alert(error.message);
       });
   }
@@ -199,9 +243,12 @@ export class AuthService {
     console.log(addressData);
     console.log(this.userData.uid);
 
-    this.afs.collection('address').add({
+    this.afs
+      .collection('address')
+      .add({
         uid: this.userData.uid
-    }).then((docRef) => {
+      })
+      .then(docRef => {
         console.log(docRef);
         const addrData = {
           uid: this.userData.uid,
@@ -220,7 +267,11 @@ export class AuthService {
         };
         const neworderId = docRef.id;
         console.log(addrData);
-      this.afs.collection('address').doc(neworderId).set(addrData).then(() => {
+        this.afs
+          .collection('address')
+          .doc(neworderId)
+          .set(addrData)
+          .then(() => {
             console.log('Address add Successfully');
             this.service.set('user', JSON.stringify(this.userData));
             this.router.navigateByUrl('home');
@@ -231,14 +282,9 @@ export class AuthService {
   }
 }
 
-
 /*displayName: "Adarsh Techware"
 email: "[email protected]"
 emailVerified: true
 : "https://lh4.googleusercontent.com/-h0rs2pE-Azw/AAAAAAAAAAI/AAAAAAAAAAA/ACHi3rcjNtapRhKoG09NKifQsv_lQPC_2A/photo.jpg"
 : "vT498Fz6X0Z6l5l5iNn5hxfwz692"
 providerData: [Gl]*/
-
-
-
-