Sineedge/salespd_pwa
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot password fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-08-18 18:15:09 +05:30
parent 9415e50f04
commit 237054366a
5 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ng6-seed/src/app/app.module.ts
View File

@ -40,7 +40,8 @@ import { AuthLayoutComponent } from './layouts/auth/auth-layout.component';
import { SharedModule } from './shared/shared.module'; import { SharedModule } from './shared/shared.module';
import { AwsService } from './AwsService/aws.service'; import { AwsService } from './AwsService/aws.service';
import { TokenInterceptor } from './_guard/token.interceptor'; import { TokenInterceptor } from './_guard/token.interceptor';
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 { AuthGuard } from './_guard/auth.guard';
import { RoleMenuItemsPipe } from './layouts/role-menu-items.pipe'; import { RoleMenuItemsPipe } from './layouts/role-menu-items.pipe';
import { ResizableModule } from 'angular-resizable-element'; import { ResizableModule } from 'angular-resizable-element';
@ -73,7 +74,7 @@ export function createTranslateLoader(http: HttpClient) {
AppComponent, AppComponent,
AdminLayoutComponent, AdminLayoutComponent,
AuthLayoutComponent, AuthLayoutComponent,
NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, NewPasswordDialog,ForgotPass,NewPasswordDialog2,ForgotPass2,ChangePasswordDialog, RoleMenuItemsPipe,
HttpLoaderComponent, HttpLoaderComponent,
DialogOverviewExampleDialog,OtpComponent DialogOverviewExampleDialog,OtpComponent
@ -134,7 +135,7 @@ export function createTranslateLoader(http: HttpClient) {
}, },
{ provide:MAT_DATE_LOCALE, useValue: 'en-GB' } { provide:MAT_DATE_LOCALE, useValue: 'en-GB' }
], ],
entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent], entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent,NewPasswordDialog2,ForgotPass2],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule { }

135
ng6-seed/src/app/session/login/login.component.ts
View File

@ -106,7 +106,7 @@ export class LoginComponent implements OnInit{
this.loaderService.closeMatSpinnerDialog(); this.loaderService.closeMatSpinnerDialog();
}, err => { }, err => {
if (err.message == "New password is required.") { if (err.message == "New password is required.") {
// this.newpassopen(); this.newpassopen();
} else { } else {
} }
@ -114,27 +114,27 @@ export class LoginComponent implements OnInit{
//alert(err.message); //alert(err.message);
}) })
} }
// /** /**
// * New password set * New password set
// * Defalut aws function * Defalut aws function
// * @param email password,newpassword * @param email password,newpassword
// */ */
// newpassopen() { newpassopen() {
// const mailid = this.email.split(/\s/).join(''); const mailid = this.email.split(/\s/).join('');
// const password = this.password.split(/\s/).join(''); const password = this.password.split(/\s/).join('');
// let dialogRef = this.dialog.open(NewPasswordDialog, this.config); let dialogRef = this.dialog.open(NewPasswordDialog, this.config);
// dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
// if (result !== undefined) { if (result !== undefined) {
// let auth = { 'Username': mailid, 'Password': password, 'newpassword': result }; let auth = { 'Username': mailid, 'Password': password, 'newpassword': result };
// this.aws.dologin(auth).subscribe(res => { this.aws.dologin(auth).subscribe(res => {
// this.getCommonSettings(); this.getCommonSettings();
// this.router.navigate(['/']); this.router.navigate(['/']);
// }, err => { }, err => {
// // alert(err.message); // alert(err.message);
// }) })
// } }
// }); });
// } }
forgotopen() { forgotopen() {
this.status = true; this.status = true;
@ -184,79 +184,82 @@ export class LoginComponent implements OnInit{
* New password Dialog * New password Dialog
*/ */
// const newpassword = new FormControl('', Validators.required); const newpassword = new FormControl('', Validators.required);
// const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword)); const confirmPassword = new FormControl('', CustomValidators.equalTo(newpassword));
// @Component({ @Component({
// selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
// template: ` template: `
// <h5 class="mt-0">New Password Change.</h5> <h5 class="mt-0">New Password Change.</h5>
// <mat-form-field> <mat-form-field>
// <input matInput placeholder="New Password" #newpassword type="password" style="width: 100%;"> <input matInput placeholder="New Password" #newpassword [type]="hide1 ? 'password' : 'text'" style="width: 100%;">
<mat-icon class="passwordIcon" matSuffix (click)="hide1 = !hide1">{{hide1 ? 'visibility_off' : 'visibility'}}</mat-icon>
// </mat-form-field> </mat-form-field>
// <br/> <br/>
// <mat-form-field> <mat-form-field>
// <input matInput placeholder="ConfirmPassword" #confirmPassword type="password" style="width: 100%;"> <input matInput placeholder="ConfirmPassword" #confirmPassword [type]="hide2 ? 'password' : 'text'" style="width: 100%;">
// </mat-form-field> <mat-icon class="passwordIcon" matSuffix (click)="hide2 = !hide2">{{hide2 ? 'visibility_off' : 'visibility'}}</mat-icon>
</mat-form-field>
// <small *ngIf="confirmPassword.value !='' && newpassword.value != confirmPassword.value" class="mat-text-warn">Passwords do not match.</small> <small *ngIf="confirmPassword.value !='' && newpassword.value != confirmPassword.value" class="mat-text-warn">Passwords do not match.</small>
// <br> <br>
// <button mat-raised-button class="mat-green" type="submit" (click)="dialogRef.close(newpassword.value)">Submit</button> <button mat-raised-button class="mat-green" type="submit" (click)="dialogRef.close(newpassword.value)">Submit</button>
// ` `
// }) })
// export class NewPasswordDialog { export class NewPasswordDialog {
// newpassword: any = newpassword; newpassword: any = newpassword;
// confirmPassword: any = confirmPassword; confirmPassword: any = confirmPassword;
// jazzMessage = 'Jazzy jazz jazz'; jazzMessage = 'Jazzy jazz jazz';
hide1: boolean = true;
hide2: boolean = true;
// constructor(public dialogRef: MatDialogRef<NewPasswordDialog>) { constructor(public dialogRef: MatDialogRef<NewPasswordDialog>) {
// } }
// } }
// @Component({ @Component({
// selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
// template: ` template: `
// <h5 class="mt-0">Forgot Password</h5> <h5 class="mt-0">Forgot Password</h5>
// <mat-form-field> <mat-form-field>
// <input matInput placeholder="Email Id" #newpassword type="Email" style="width: 100%;"> <input matInput placeholder="Email Id" #newpassword type="Email" style="width: 100%;">
// </mat-form-field> </mat-form-field>
// <br> <br>
// <button mat-raised-button class="mat-green" type="submit" (click)="dialogRef.close(newpassword.value)">Submit</button> <button mat-raised-button class="mat-green" type="submit" (click)="dialogRef.close(newpassword.value)">Submit</button>
// ` `
// }) })
// export class ForgotPass { export class ForgotPass {
// newpassword: any = newpassword; newpassword: any = newpassword;
// confirmPassword: any = confirmPassword; confirmPassword: any = confirmPassword;
// jazzMessage = 'Jazzy jazz jazz'; jazzMessage = 'Jazzy jazz jazz';
// constructor(public dialogRef: MatDialogRef<ForgotPass>) { constructor(public dialogRef: MatDialogRef<ForgotPass>) {
// } }
// } }

2
ng6-seed/src/app/session/otp/otp.component.html
View File

@ -18,7 +18,7 @@
</mat-form-field> </mat-form-field>
<span style="width: 25%"> <span style="width: 25%">
<button mat-button color="primary" (click)="resendOTP()" >{{timeLeft == 0 ? 'Resend OTP' : timeLeft+' Seconds Left....' }} </button> <button mat-raised-button color="primary" (click)="resendOTP()" >{{timeLeft == 0 ? 'Resend OTP' : timeLeft+' Seconds Left....' }} </button>
</span> </span>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions> <mat-dialog-actions>

12
ng6-seed/src/app/session/otp/otp.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core'; import { Component, OnInit, Inject } from '@angular/core';
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA, MatDialogConfig } from '@angular/material'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA, MatDialogConfig, DialogPosition } from '@angular/material';
import { DashboardService } from 'app/dashboard/dashboard.service'; import { DashboardService } from 'app/dashboard/dashboard.service';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
import { CustomValidators } from 'ng2-validation'; import { CustomValidators } from 'ng2-validation';
@ -100,7 +100,7 @@ export class OtpComponent implements OnInit {
* @param email password,newpassword * @param email password,newpassword
*/ */
newpassopen(email) { newpassopen(email) {
let dialogRef = this.dialog.open(NewPasswordDialog, this.config); let dialogRef = this.dialog.open(NewPasswordDialog2, this.config);
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
if (result !== undefined) { if (result !== undefined) {
console.log(result); console.log(result);
@ -172,7 +172,7 @@ export class OtpComponent implements OnInit {
` `
}) })
export class NewPasswordDialog { export class NewPasswordDialog2 {
newpassword: any = newpassword; newpassword: any = newpassword;
confirmPassword: any = confirmPassword; confirmPassword: any = confirmPassword;
@ -180,7 +180,7 @@ export class OtpComponent implements OnInit {
hide2: boolean = true; hide2: boolean = true;
jazzMessage = 'Jazzy jazz jazz'; jazzMessage = 'Jazzy jazz jazz';
constructor(public dialogRef: MatDialogRef<NewPasswordDialog>) { } constructor(public dialogRef: MatDialogRef<NewPasswordDialog2>) { }
} }
/** ==================== New password Dialog Ends Here ======================== */ /** ==================== New password Dialog Ends Here ======================== */
@ -199,13 +199,13 @@ export class OtpComponent implements OnInit {
` }) ` })
export class ForgotPass { export class ForgotPass2 {
newpassword: any = newpassword; newpassword: any = newpassword;
confirmPassword: any = confirmPassword; confirmPassword: any = confirmPassword;
jazzMessage = 'Jazzy jazz jazz'; jazzMessage = 'Jazzy jazz jazz';
constructor(public dialogRef: MatDialogRef<ForgotPass>) {} constructor(public dialogRef: MatDialogRef<ForgotPass2>) {}
} }
/** ==================== Forgot Password Dialog Ends Here =================== */ /** ==================== Forgot Password Dialog Ends Here =================== */

3
ng6-seed/src/app/settings/users/users.module.ts
View File

@ -21,7 +21,8 @@ import { RouterModule } from '@angular/router';
import { UserRoutes} from './users.routing'; import { UserRoutes} from './users.routing';
import { UserProfileComponent, ChangePasswordDialog } from './user-profile/user-profile.component'; import { UserProfileComponent, ChangePasswordDialog } from './user-profile/user-profile.component';
import { UserService } from './../service/user.service'; import { UserService } from './../service/user.service';
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 { HttpClientModule } from '@angular/common/http'; // import { HttpClientModule } from '@angular/common/http';
@NgModule({ @NgModule({
imports: [ imports: [