diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index 0bfe0de..7c01d1d 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -40,7 +40,8 @@ import { AuthLayoutComponent } from './layouts/auth/auth-layout.component'; import { SharedModule } from './shared/shared.module'; import { AwsService } from './AwsService/aws.service'; import { TokenInterceptor } from './_guard/token.interceptor'; -import { NewPasswordDialog, ForgotPass } from './session/login/login.component'; +// import { NewPasswordDialog, ForgotPass } from './session/login/login.component'; +import { NewPasswordDialog,ForgotPass } from './session/otp/otp.component'; import { AuthGuard } from './_guard/auth.guard'; import { RoleMenuItemsPipe } from './layouts/role-menu-items.pipe'; import { ResizableModule } from 'angular-resizable-element'; diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 77f02d7..a2d7c58 100755 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -17,10 +17,16 @@ - - - + + + {{hide ? 'visibility_off' : 'visibility'}} + + +
Forgot password?
diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss index 0829347..50bfa54 100755 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -38,4 +38,8 @@ .bottom-sec,.mat-green{ color:white !important; font-weight: 700; +} +.passwordIcon{ + font-size: larger !important; + color: #f34325 !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index 2e8ccce..4ca8f0d 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -44,12 +44,14 @@ export class LoginComponent implements OnInit{ }; commonDetails: any; dialogRef: MatDialogRef; + hide: boolean; constructor( private router: Router, public aws: AwsService, public dialog: MatDialog, public shared:CognitoService,private dashBoardService:DashboardService , private loaderService:LoaderService) { } ngOnInit(){ + this.hide = true; this.loggedInCheck(); } @@ -72,6 +74,7 @@ export class LoginComponent implements OnInit{ //alert('login - function') const mailid = this.email.split(/\s/).join(''); + const password = this.password.split(/\s/).join(''); let auth = { 'Username': mailid, 'Password': this.password }; // alert(auth) this.loaderService.showMatSpinnerDialog(''); @@ -99,7 +102,7 @@ export class LoginComponent implements OnInit{ this.loaderService.closeMatSpinnerDialog(); }, err => { if (err.message == "New password is required.") { - this.newpassopen(); + // this.newpassopen(); } else { } @@ -122,11 +125,10 @@ export class LoginComponent implements OnInit{ } else { - + // alert(data.msg);//comment this. } }); - } /** * New password set @@ -179,79 +181,79 @@ export class LoginComponent implements OnInit{ * New password Dialog */ -const newpassword = new FormControl('', Validators.required); -const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword)); +// const newpassword = new FormControl('', Validators.required); +// const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword)); -@Component({ - selector: 'app-jazz-dialog', - template: ` -
New Password Change.
+// @Component({ +// selector: 'app-jazz-dialog', +// template: ` +//
New Password Change.
- - +// +// - +// -
- - - +//
+// +// +// - Passwords do not match. +// Passwords do not match. -
+//
- +// - ` -}) -export class NewPasswordDialog { +// ` +// }) +// export class NewPasswordDialog { - newpassword: any = newpassword; - confirmPassword: any = confirmPassword; - jazzMessage = 'Jazzy jazz jazz'; +// newpassword: any = newpassword; +// confirmPassword: any = confirmPassword; +// jazzMessage = 'Jazzy jazz jazz'; - constructor(public dialogRef: MatDialogRef) { +// constructor(public dialogRef: MatDialogRef) { - } +// } -} +// } -@Component({ - selector: 'app-jazz-dialog', - template: ` -
Forgot Password
+// @Component({ +// selector: 'app-jazz-dialog', +// template: ` +//
Forgot Password
- - +// +// - +// -
+//
- +// - ` -}) -export class ForgotPass { +// ` +// }) +// export class ForgotPass { - newpassword: any = newpassword; - confirmPassword: any = confirmPassword; - jazzMessage = 'Jazzy jazz jazz'; +// newpassword: any = newpassword; +// confirmPassword: any = confirmPassword; +// jazzMessage = 'Jazzy jazz jazz'; - constructor(public dialogRef: MatDialogRef) { +// constructor(public dialogRef: MatDialogRef) { - } +// } -} +// } diff --git a/ng6-seed/src/app/session/otp/otp.component.html b/ng6-seed/src/app/session/otp/otp.component.html index dbe4e39..0b2905a 100644 --- a/ng6-seed/src/app/session/otp/otp.component.html +++ b/ng6-seed/src/app/session/otp/otp.component.html @@ -12,17 +12,23 @@ - + + + +
- + + + +
diff --git a/ng6-seed/src/app/session/otp/otp.component.ts b/ng6-seed/src/app/session/otp/otp.component.ts index 6f53e18..2d11b74 100644 --- a/ng6-seed/src/app/session/otp/otp.component.ts +++ b/ng6-seed/src/app/session/otp/otp.component.ts @@ -1,41 +1,202 @@ import { Component, OnInit,Inject } from '@angular/core'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition , MatDialogConfig} from '@angular/material'; import { DashboardService } from 'app/dashboard/dashboard.service'; import { NotifierService } from 'angular-notifier'; +import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; +import { CustomValidators } from 'ng2-validation'; +import { Router } from "@angular/router"; +import { AwsService } from '../../AwsService/aws.service'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; + @Component({ selector: 'app-otp', templateUrl: './otp.component.html', styleUrls: ['./otp.component.scss'] }) export class OtpComponent implements OnInit { + timeLeft: number = 0; + loggedEmailID:any=""; + interval; + config: MatDialogConfig = { + disableClose: false, + width: '', + height: '', + position: { + top: '', + bottom: '', + left: '', + right: '' + } + }; //public notifier : NotifierService; - constructor( private dialogRef: MatDialogRef,private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any,private dashBoardService:DashboardService) + constructor( private dialogRef: MatDialogRef,private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any,private dashBoardService:DashboardService + ,private loaderService:LoaderService,private router: Router, + public aws: AwsService) { - + this.loggedEmailID = this.data; + this.timeLeft = 60; + this.interval = setInterval(() => { + if(this.timeLeft > 0) { + this.timeLeft--; + } else { + clearInterval(this.interval); + } + },1000) } - ngOnInit() { + ngOnInit() {} + + resendOTP() { + this.timeLeft = 60; + this.dashBoardService.generateotp(this.loggedEmailID.split(/\s/).join('')).subscribe( + response => { + // if(response.status == 200) + this.interval = setInterval(() => { + if(this.timeLeft > 0) { + this.timeLeft--; + } else { + clearInterval(this.interval); + // alert(response.msg);//comment this. + } + },1000) + }); + } + + updatePassword(otp) + { + this.dashBoardService.resetpassword(this.loggedEmailID,otp).subscribe( + data => { + console.log('resetpassword api res data',data); + if (data.status == 200) { + this.dialogRef.close(); + this.loggedEmailID = this.data; + // alert('Password Reset Successfully'); + this.newPasswordDialog(this.loggedEmailID); + } + else{ alert('OTP is invalid. Plesae enter correct OTP.!'); } + }); + } + + newPasswordDialog(email) { + + let dialogRef = this.dialog.open(NewPasswordDialog, this.config); + + dialogRef.afterClosed().subscribe(result => { + if (result !== undefined) { + console.log(result); + let auth = { 'Username': email, 'Password': 'temp1234', 'newpassword': result }; + this.aws.dologin(auth).subscribe(res => { + this.getCommonSettings(); + // this.router.navigate(['/']); + this.router.navigate(['personal_discussion/pdlist']); + localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); + //this.router.navigate(['/']); + //alert(localStorage.getItem('user_role')) + this.loaderService.closeMatSpinnerDialog(); + if(res.idToken.payload["custom:role_id"]=='11') + { + this.router.navigate(['sales-pd-list/list-pd']); + } + else + { + this.router.navigate(['personal_discussion/pdlist']); + } + + }, err => { + this.loaderService.closeMatSpinnerDialog(); + // alert(err.message); + }) + } + }); + } + + + commonDetails: any; + getCommonSettings(){ + this.dashBoardService.getCommonSettingsConfig().subscribe(res=>{ + this.commonDetails = res; + if(this.commonDetails.dataStatus == true){ + localStorage.setItem("commonSettings",JSON.stringify(this.commonDetails.records)); + } + }) } - updatepassword(otp) - { - console.log('data'); - console.log(this.data); - this.dashBoardService.resetpassword(this.data,otp).subscribe( - data => { - console.log('data'); - console.log(data) - if (data.status == 200) { - alert('Password Reset Successfully'); - this.dialogRef.close(); - } - else - { - alert('OTP is invalid. Plesae enter correct OTP.!'); - - } - - }) -} } +/** ======================= OtpComponent Ends Here ============================== */ + +/** ==================== New password Dialog Starts Here ======================== */ + + const newpassword = new FormControl('', Validators.required); + const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword)); + + @Component({ + selector: 'app-jazz-dialog', + template: ` +
New Password Change.
+ + + + {{hide1 ? 'visibility_off' : 'visibility'}} + + +
+ + + {{hide2 ? 'visibility_off' : 'visibility'}} + + + Passwords do not match. + +
+ + + + ` + }) + export class NewPasswordDialog { + + newpassword: any = newpassword; + confirmPassword: any = confirmPassword; + hide1: boolean = true; + hide2: boolean = true; + jazzMessage = 'Jazzy jazz jazz'; + + constructor(public dialogRef: MatDialogRef) { + + } + + + } +/** ==================== New password Dialog Ends Here ======================== */ +/** ==================== Forgot Password Dialog Starts Here =================== */ + + @Component({ + selector: 'app-jazz-dialog', + template: ` +
Forgot Password
+ + + + + + +
+ + + + + ` +}) +export class ForgotPass { + + newpassword: any = newpassword; + confirmPassword: any = confirmPassword; + jazzMessage = 'Jazzy jazz jazz'; + + constructor(public dialogRef: MatDialogRef) { + + } + +} +/** ==================== Forgot Password Dialog Ends Here =================== */ \ No newline at end of file