From 0e0bb457abd7c1f4e684dc3a3a917cb61e5b70b3 Mon Sep 17 00:00:00 2001
From: venbainfotech <bitbucket@venbainfotech.com>
Date: Sat, 12 Feb 2022 18:03:06 +0530
Subject: [PATCH] opt and mail issue fix

---
 src/pages/login/login.ts       |  7 ++--
 src/pages/otp/otp.html         |  2 +-
 src/pages/otp/otp.scss         | 32 +++++-----------
 src/pages/otp/otp.ts           |  3 +-
 src/pages/password/password.ts |  4 +-
 src/theme/filter-modal.scss    | 69 ++++++++++++++++++++++++++++++++++
 6 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
index 765f0f5..77a467f 100755
--- a/src/pages/login/login.ts
+++ b/src/pages/login/login.ts
@@ -212,12 +212,13 @@ forgotopen() {
 //   // })
 // }
 forgotpassword(){
-  this.aws.generateotp(this.email).subscribe(res => {
+  const mailid = this.email.split(/\s/).join('');
+  this.aws.generateotp(mailid).subscribe(res => {
     if(res.status == 200) {
         const modalOption:ModalOptions={
-          cssClass:'filterModal'
+          cssClass:'optModal'
         }
-        const modalCtrl=this.modalCtrl.create(OtpPage,{'drop_down_datas':this.email})
+        const modalCtrl=this.modalCtrl.create(OtpPage,{'drop_down_datas':this.email},modalOption)
         modalCtrl.present();
         modalCtrl.onDidDismiss((data)=>{
           console.log(data) 
diff --git a/src/pages/otp/otp.html b/src/pages/otp/otp.html
index 495e90c..1e5b462 100644
--- a/src/pages/otp/otp.html
+++ b/src/pages/otp/otp.html
@@ -33,6 +33,6 @@
     <!-- <button style="background-color: #e2412f;" mat-raised-button mat-icon-button (click)="updatepassword(otp.value)" class="mr-1 mt-1 hover-icon">
       <ion-icon name="save"></ion-icon>
     </button> -->
-    <button class="btn-no-pad" medium ion-button round color="optblue" (click)="updatepassword(otp.value)"><ion-icon style="color:gray;font-size: 24px;" name="md-arrow-dropright-circle"></ion-icon> </button>
+    <button class="btn-no-pad" medium ion-button round color="optblue" (click)="updatepassword(otp.value)" style="color: #fff;">Verify</button>
 </div>
 </ion-footer>
diff --git a/src/pages/otp/otp.scss b/src/pages/otp/otp.scss
index dfb04bf..594e2d3 100644
--- a/src/pages/otp/otp.scss
+++ b/src/pages/otp/otp.scss
@@ -1,25 +1,13 @@
 page-otp {
-    mat-form-field {
-        margin: 0 2%;
-      }
-    .paragraph_change {
-      color:  #fff !important;
-      background-color: #e00201 !important;
-      // padding: 10px !important;
-    }
-     .cdk-global-overlay-wrapper{
-            justify-content: center !important;
-    }
-     mat-dialog-actions{
-        border-top: 2px solid #e00201;
-     }
-    
-    .mat-form-field-appearance-legacy .mat-hint{
-      color:rgba(0, 0, 0, 0.8) !important;
-    }
-    .my-modal {
-        height: 50%!important;
-        width: 50%!important;
-    }
+  .toolbar-background-md {
+    border-color: #b2b2b2;
+    background: red !important;
+    
+}
+.toolbar-title-md{
+  color: #fff !important;
+}
+
+
     
 }
diff --git a/src/pages/otp/otp.ts b/src/pages/otp/otp.ts
index 3376882..4618dcb 100644
--- a/src/pages/otp/otp.ts
+++ b/src/pages/otp/otp.ts
@@ -29,7 +29,8 @@ export class OtpPage {
   {
  console.log('data');
  console.log(this.drop_down_datas,otp);
- this.aws.resetpassword(this.drop_down_datas,otp).subscribe(data => {
+ const mail = this.drop_down_datas.split(/\s/).join('');
+ this.aws.resetpassword(mail,otp).subscribe(data => {
     console.log('data');
     console.log(data)
     if (data.status == 200) {
diff --git a/src/pages/password/password.ts b/src/pages/password/password.ts
index aa40d39..fa1a606 100755
--- a/src/pages/password/password.ts
+++ b/src/pages/password/password.ts
@@ -38,8 +38,10 @@ export class PasswordPage {
   }
   setNewPassword(newpass)
   {
+    const mailid = this.Username.split(/\s/).join('');
+    const Password = this.Password.split(/\s/).join('');
     if(newpass !='' && newpass !=null && newpass !== undefined){
-    let auth = { 'Username': this.Username, 'Password': this.Password, 'newpassword': newpass };
+    let auth = { 'Username': mailid, 'Password': Password, 'newpassword': newpass };
       console.log(auth);
       this.aws.dologin(auth).subscribe(res => {
         console.log(res);
diff --git a/src/theme/filter-modal.scss b/src/theme/filter-modal.scss
index 32e3e68..1186a5c 100755
--- a/src/theme/filter-modal.scss
+++ b/src/theme/filter-modal.scss
@@ -63,6 +63,75 @@
          }
        
              
+          }
+     
+ }
+
+
+ .optModal{
+    padding: 6.4%;
+    // padding: 30px;
+    background-color: rgba(0, 0, 0, 0.56);
+    // padding: 30px;
+     color:red;
+    // filter:blur(5px); 
+     //color:lightcyan;
+    //  background-color:gray;
+     .modal-wrapper {
+        //  border-radius: 7px;
+         // background: rgba(0, 0, 0, 0.5);
+         // color: gray;
+         
+         height: 35% !important;
+         width: 100% !important;
+         border-radius: 10px;
+         margin-top: 50%;
+         
+        mat-card{
+            // background-color:rgb(252, 252, 161);
+            background-color:white;
+            box-shadow: 2px 2px lavender;
+            border-radius: 5px;
+            min-height: 13em;
+            // height: 16.5em;
+            max-height: 16.5em;
+            border:1px solid lavender;
+        }
+       .mat-card-title{
+          
+            font-weight: bold;
+            font-size: 16px;
+            color:#e2412f;
+        }
+        mat-card-content{
+            // margin-left: 4%;
+        }
+        ion-item{
+            // background-color:rgb(252, 252, 161);
+            background-color: lightcyan;
+        }
+        //   margin-right: 15%;
+         
+         button{
+             font-size: 12px;
+            //  height: 40px;
+            color: #fff;
+            //  margin-bottom: 10px;
+            position: relative;
+            bottom:0.5em;
+         }
+        //  input{
+        //     // border:1px solid blueviolet;
+        //  }
+        //  mat-form-field{
+        //      width: 100%;
+        //      margin-top: 3%;
+        //  }
+        //  mat-radio-button{
+        //      margin-top: 2%;
+        //  }
+       
+             
           }
      
  }
\ No newline at end of file