Merge branch 'adarsh' into 'master'

src/app/app.component.ts

@@ -83,6 +83,7 @@ export class AppComponent {
   initializeApp() {
     this.platform.ready().then(() => {
       this.statusBar.styleDefault();
+      this.statusBar.hide();
       this.statusBar.overlaysWebView(false);
       this.statusBar.backgroundColorByHexString('#29285b');
     });
@@ -107,7 +108,8 @@ export class AppComponent {
       'landing',
       'login',
       'signup',
-      'address'
+      'address',
+      'forgot'
     ];
     const currentUrl = this.router.url.split('/');
     const index = restrictedUrl.findIndex(x => x === currentUrl[1]);

src/app/forgot/forgot.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
-        <img src="../assets/Group17_2.png">
+  <button class="nav_btn nav_back floatLeft" (click)="goBack()">
+    <img src="../assets/Group17_2.png" />
   </button>
-    <div class="nav_title floatLeft">
-        <h4>FORGOT PASSWORD</h4>
-    </div>
-    <div class="clear"></div>
+  <div class="nav_title floatLeft">
+    <h4>FORGOT PASSWORD</h4>
+  </div>
+  <div class="clear"></div>
 </div>
 <ion-content>
-    <div class="verification_div">
-        <div class="form_div">
-            <div class="row">
-                <input class="" type="text" placeholder="Type your phone number">
-            </div>
-            <div class="row">
-                <button class="login_btn">GET OTP</button>
-            </div>
-        </div>
+  <div class="verification_div">
+    <div class="form_div">
+      <div class="row">
+        <input
+          class=""
+          type="email"
+          placeholder="Type your email Id"
+          #emailId
+          required
+        />
+      </div>
+      <div class="row">
+        <button
+          class="login_btn"
+          (click)="authService.resetPassword(emailId.value)"
+        >
+          RESET PASSWORD
+        </button>
+      </div>
     </div>
-</ion-content>
+  </div>
\ No newline at end of file
+</ion-content>
+<div class="loader" *ngIf="authService.loader">
+  <div class="lds-ripple">
+    <div></div>
+    <div></div>
+  </div>
+</div>

src/app/forgot/forgot.page.ts

 import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Router, ActivatedRoute } from '@angular/router';
+import { AuthService } from './../../config/auth.service';
 
 @Component({
   selector: 'app-forgot',
   templateUrl: './forgot.page.html',
-  styleUrls: ['./forgot.page.scss'],
+  styleUrls: ['./forgot.page.scss']
 })
 export class ForgotPage implements OnInit {
-
   constructor(
     private router: Router,
     private route: ActivatedRoute,
-    private location: Location
-  ) { }
+    private location: Location,
+    public authService: AuthService
+  ) {}
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   goToPage(path, data = null) {
     this.router.navigateByUrl(path, { queryParams: data });
@@ -26,5 +26,4 @@ export class ForgotPage implements OnInit {
   goBack() {
     this.location.back();
   }
-
 }

src/app/login/login.page.html

@@ -66,7 +66,7 @@
       <!-- <button (click)="goToPage('addaddresss')">Address</button> -->
     </div>
   </div>
-  <div class="loader" *ngIf="authService.loader">
+  <div class="loader" *ngIf="loader">
     <div class="lds-ripple">
       <div></div>
       <div></div>

src/config/auth.service.ts

@@ -113,7 +113,6 @@ export class AuthService {
   }
 
   public async google(type: number) {
-    this.loader = true;
     this.type = type;
     // this.googlePlus.login({}).then(res => console.log(res)).catch(err => console.error(err));
     this.afAuth.auth
@@ -129,13 +128,13 @@ export class AuthService {
         }
       })
       .catch(err => {
+        console.log(err);
         this.loader = false;
+        console.log(this.loader);
       });
   }
 
   public async facebook(type: number) {
-    console.log('here fab');
-    this.loader = true;
     this.type = type;
     const This = this;
     setTimeout(() => {