some changes

src/app/changedetails/changedetails.page.html

@@ -15,12 +15,13 @@
       </div>
       <div class="row">
         <input
+          [(value)]="userData && userData.name"
           name="name"
           required
           class=""
           type="text"
-          [(ngModel)]="updateData.name"
-          placeholder="John Doe"
+          [(ngModel)]="userData && userData.name"
+          [(placeholder)]="userData && userData.name"
           #name="ngModel"
         />
         <div
@@ -33,12 +34,13 @@
       </div>
       <div class="row">
         <input
+          [(value)]="userData && userData.emailId"
           required
           class=""
           name="emailId"
           type="mail"
-          [(ngModel)]="updateData.emailId"
-          placeholder="[email protected]"
+          [(ngModel)]="userData && userData.emailId"
+          [(placeholder)]="userData && userData.emailId"
           pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}"
           #emailId="ngModel"
         />
@@ -57,14 +59,15 @@
 
       <div class="row">
         <input
+          [(value)]="userData && userData.phone"
           required
           class=""
           name="phone"
           type="number"
           pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}"
           maxlength="10"
-          [(ngModel)]="updateData.phone"
-          placeholder="+00 9851 5871 6985"
+          [(ngModel)]="userData && userData.phone"
+          [(placeholder)]="userData && userData.phone"
           #phone="ngModel"
         />
         <div
@@ -79,18 +82,42 @@
           </div>
         </div>
       </div>
-      <div class="row">
-        <h6>Change Password</h6>
-      </div>
-      <div class="row">
+      <div *ngIf="userData && userData.loginType == 0">
+        <div class="row">
+          <h6>Change Password</h6>
+        </div>
+        <!-- <div class="row">
         <input class="" type="password" placeholder="Current Password" />
+      </div> -->
+        <div class="row">
+          <input
+            class=""
+            [(ngModel)]="updatePassword.password"
+            name="password"
+            type="password"
+            placeholder="New Password"
+            minlength="6"
+            #password="ngModel"
+          />
+          <div *ngIf="password.errors && password.errors.minlength">
+            Password must be at least 6 characters
+          </div>
+        </div>
+        <div class="row">
+          <input
+            class=""
+            #confirmPassword="ngModel"
+            [(ngModel)]="updatePassword.confirmPassword"
+            name="confirmPassword"
+            type="password"
+            placeholder="Confirm Password"
+          />
+          <div *ngIf="">
+            Password should match
+          </div>
+        </div>
       </div>
-      <div class="row">
-        <input class="" type="password" placeholder="New Password" />
-      </div>
-      <div class="row">
-        <input class="" type="password" placeholder="Confirm Password" />
-      </div>
+
       <div class="row">
         <button class="login_btn" (click)="onFormSubmit(updateForm)">
           UPDATE

src/app/changedetails/changedetails.page.ts

-import { Component, OnInit } from "@angular/core";
-import { Location } from "@angular/common";
-import { Router, ActivatedRoute } from "@angular/router";
-import { UpdateUserDetails } from "../../config/services/user";
-import { UpdateService } from "../../config/update.service";
-import { ServiceService } from "../../config/service.service";
-import { NgForm } from "@angular/forms";
+import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { Router, ActivatedRoute } from '@angular/router';
+import { UpdateUserDetails, UpdatePassword } from '../../config/services/user';
+import { UpdateService } from '../../config/update.service';
+import { ServiceService } from '../../config/service.service';
+import { NgForm } from '@angular/forms';
 
 @Component({
-  selector: "app-changedetails",
-  templateUrl: "./changedetails.page.html",
-  styleUrls: ["./changedetails.page.scss"]
+  selector: 'app-changedetails',
+  templateUrl: './changedetails.page.html',
+  styleUrls: ['./changedetails.page.scss']
 })
 export class ChangedetailsPage implements OnInit {
   userData: any;
   updateData: UpdateUserDetails = {
-    emailId: "",
-    name: "",
-    phone: ""
+    emailId: '',
+    name: '',
+    phone: ''
+  };
+
+  updatePassword: UpdatePassword = {
+    password: '',
+    confirmPassword: ''
   };
   submitted = false;
 
@@ -27,8 +32,10 @@ export class ChangedetailsPage implements OnInit {
     public register: UpdateService,
     private service: ServiceService
   ) {
-    this.service.get("params").then(val => {
+    // Gets userdata
+    this.service.get('params').then(val => {
       this.userData = val;
+      console.log(val);
     });
   }
 
@@ -45,9 +52,21 @@ export class ChangedetailsPage implements OnInit {
 
   onFormSubmit(form: NgForm) {
     this.submitted = true;
+    console.log(form.value);
     if (form.valid) {
-      console.log("valid form values", form.value);
+      // Change Password
+      if (
+        form.value.password &&
+        form.value.password != form.value.confirmPassword
+      ) {
+        this.register.updatePassword(form.value.password);
+      } else {
+        alert('Password should match');
+      }
+
+      // Calls update user data fn
       this.register.updateData(form.value, this.userData.uid);
+      console.log('valid form values', form.value);
     }
   }
 }

src/config/services/user.ts

@@ -32,7 +32,10 @@ export interface UpdateUserDetails {
   phone: string;
 }
 // Model to Update Password
-export interface UpdateUserDetails {}
+export interface UpdatePassword {
+  password: string;
+  confirmPassword: string;
+}
 
 export interface Otp {
   uid: string;

src/config/update.service.ts

 import { Injectable } from "@angular/core";
-import { User, UpdateUserDetails, Address } from "./services/user";
+import {
+  User,
+  UpdateUserDetails,
+  Address,
+  updatePassword
+} from "./services/user";
 import { auth } from "firebase/app";
 import { Router, ActivatedRoute } from "@angular/router";
 import { AngularFireAuth } from "@angular/fire/auth";
@@ -69,4 +74,21 @@ export class UpdateService {
         console.log(error);
       });
   }
+
+  // Change Password
+  updatePassword(userData: updatePassword) {
+    // Gets current user
+    let user = this.afAuth.auth.currentUser;
+    let newPassword = userData.password;
+
+    // Update password
+    user
+      .updatePassword(newPassword)
+      .then(() => {
+        console.log("Password Changed");
+      })
+      .catch(err => {
+        console.log(err);
+      });
+  }
 }