diff --git a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts index 114753b..a7158de 100644 --- a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts +++ b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts @@ -81,12 +81,7 @@ export class RegistComposeComponent implements OnInit { ], password: [ 'beteran', - [ - Validators.required, - Validators.pattern( - '^(?=.*[A-Za-z])(?=.*d)(?=.*[@$!%*#?&])[A-Za-zd@$!%*#?&]{8,20}$' - ), - ], + [Validators.required, Validators.pattern('^[A-Za-zd@$!%*#?&]{8,20}$')], ], exchangePassword: [ 'beteran', diff --git a/src/app/modules/auth/sign-in/components/sign-in.component.html b/src/app/modules/auth/sign-in/components/sign-in.component.html index b794162..e2917b0 100644 --- a/src/app/modules/auth/sign-in/components/sign-in.component.html +++ b/src/app/modules/auth/sign-in/components/sign-in.component.html @@ -81,7 +81,12 @@ [svgIcon]="'heroicons_solid:eye-off'" > - 비밀번호를 입력하세요 + + 비밀번호를 입력하세요 + + + 올바른 비밀번호를 입력하세요. +
diff --git a/src/app/modules/auth/sign-in/components/sign-in.component.ts b/src/app/modules/auth/sign-in/components/sign-in.component.ts index cd39624..b79287b 100644 --- a/src/app/modules/auth/sign-in/components/sign-in.component.ts +++ b/src/app/modules/auth/sign-in/components/sign-in.component.ts @@ -49,9 +49,15 @@ export class AuthSignInComponent implements OnInit { this.signInForm = this._formBuilder.group({ email: [ 'administrator', - [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,12}$')], + [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,14}$')], + ], + password: [ + 'beteran', + [ + Validators.required, + // Validators.pattern('^[A-Za-z\\d@$!%*#?&]{8,20}$'), + ], ], - password: ['beteran', Validators.required], captchaSecurityCode: ['', Validators.required], });