diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index d43467d2c..96e992638 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -42,8 +42,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 { NewPasswordDialog2, ForgotPass } from './session/login/login.component'; -import { NewPasswordDialog,ForgotPass } from './session/otp/otp.component'; + import { NewPasswordDialog, ForgotPass } from './session/login/login.component'; +import { NewPasswordDialog2,ForgotPass2 } 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'; @@ -133,7 +133,7 @@ const pdCustomNotifierOptions: NotifierOptions = { AppComponent, AdminLayoutComponent, AuthLayoutComponent, - OtpComponent, + OtpComponent,NewPasswordDialog2,ForgotPass2, NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, HttpLoaderComponent, IncomingCallComponent, VideoChatComponent, DynamicNotifyComponent, ], @@ -202,7 +202,7 @@ const pdCustomNotifierOptions: NotifierOptions = { MessagingService, AsyncPipe,LoaderService ], // entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,DynamicNotifyComponent] - entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent,DynamicNotifyComponent] + entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent,DynamicNotifyComponent,NewPasswordDialog2,ForgotPass2] // IncomingCallComponent,VideoChatComponent,], ,bootstrap: [AppComponent] }) diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index ac55b59ac..01bb419b4 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -176,15 +176,16 @@ const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword
New Password Change.
- - - + + {{hide1 ? 'visibility_off' : 'visibility'}} +
- - + + {{hide2 ? 'visibility_off' : 'visibility'}} + Passwords do not match. @@ -200,7 +201,8 @@ export class NewPasswordDialog { newpassword: any = newpassword; confirmPassword: any = confirmPassword; jazzMessage = 'Jazzy jazz jazz'; - + hide1: boolean = true; + hide2: boolean = true; constructor(public dialogRef: MatDialogRef) { } diff --git a/ng6-seed/src/app/session/otp/otp.component.ts b/ng6-seed/src/app/session/otp/otp.component.ts index 64be181eb..08cc5de40 100644 --- a/ng6-seed/src/app/session/otp/otp.component.ts +++ b/ng6-seed/src/app/session/otp/otp.component.ts @@ -80,7 +80,7 @@ export class OtpComponent implements OnInit { newPasswordDialog(email) { - let dialogRef = this.dialog.open(NewPasswordDialog, this.config); + let dialogRef = this.dialog.open(NewPasswordDialog2, this.config); dialogRef.afterClosed().subscribe(result => { if (result !== undefined) { @@ -173,7 +173,7 @@ const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword ` }) -export class NewPasswordDialog { +export class NewPasswordDialog2 { newpassword: any = newpassword; confirmPassword: any = confirmPassword; @@ -181,7 +181,7 @@ export class NewPasswordDialog { hide2: boolean = true; jazzMessage = 'Jazzy jazz jazz'; - constructor(public dialogRef: MatDialogRef) { + constructor(public dialogRef: MatDialogRef) { } @@ -207,13 +207,13 @@ export class NewPasswordDialog { ` }) -export class ForgotPass { +export class ForgotPass2 { 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/session.module.ts b/ng6-seed/src/app/session/session.module.ts index 7687062c4..ec543a3db 100755 --- a/ng6-seed/src/app/session/session.module.ts +++ b/ng6-seed/src/app/session/session.module.ts @@ -11,13 +11,13 @@ import { import { FormsModule } from '@angular/forms'; import { MatIconModule} from '@angular/material'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { LoginComponent } from './login/login.component'; +import { LoginComponent,ForgotPass,NewPasswordDialog } from './login/login.component'; import { RegisterComponent } from './register/register.component'; import { ForgotPasswordComponent } from './forgot-password/forgot-password.component'; import { LockScreenComponent } from './lockscreen/lockscreen.component'; import { SessionRoutes } from './session.routing'; -import { NewPasswordDialog, OtpComponent } from './otp/otp.component'; +import { OtpComponent } from './otp/otp.component'; @NgModule({ imports: [ @@ -42,7 +42,7 @@ import { NewPasswordDialog, OtpComponent } from './otp/otp.component'; LockScreenComponent, ], - // entryComponents:[NewPasswordDialog,OtpComponent] + // entryComponents:[NewPasswordDialog,ForgotPass] }) export class SessionModule {}