From 25687030622fe3ea37acf613e5f375d1877e159e Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Tue, 13 Sep 2022 08:35:41 +0000
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/bank/deposit/components/list.component.ts | 13 +++++++++++++
 .../auth/sign-in/components/sign-in.component.html  | 11 +++++++++--
 .../auth/sign-in/components/sign-in.component.ts    |  8 +++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/app/modules/admin/bank/deposit/components/list.component.ts b/src/app/modules/admin/bank/deposit/components/list.component.ts
index 95314b5..178bffa 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.ts
+++ b/src/app/modules/admin/bank/deposit/components/list.component.ts
@@ -50,6 +50,7 @@ import { ListMembersResponse } from 'app/modules/proto/c2se/member_pb';
 import { ListMemberClassesResponse } from 'app/modules/proto/c2se/member_class_pb';
 import { MemberClass } from 'app/modules/proto/models/member_class_pb';
 import { MemberBankDepositService } from 'app/modules/polyglot/member_bank_deposit/services/member_bank_deposit.service';
+import { environment } from 'environments/environment';
 
 @Component({
   selector: 'deposit-list',
@@ -76,6 +77,9 @@ import { MemberBankDepositService } from 'app/modules/polyglot/member_bank_depos
           grid-template-columns: 20px 80px 100px auto 60px 140px 120px 140px 80px 120px 80px 60px;
         }
       }
+      .mat-tooltip {
+        white-space: pre-line;
+      }
     `,
   ],
   encapsulation: ViewEncapsulation.None,
@@ -299,6 +303,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
+  __getMemberParentTooltip(depositMember: MemberBankDepositModel): void {
+    const memberId = depositMember.getMember()?.getId();
+    const member = this.__getMemberById(memberId);
+
+    /* const resultTooltip = `
+    요율확인 \n 카지노-바카라: ${tempRate}% \n 카지노-룰렛: ${tempRate}% \n 카지노-드레곤타이거: ${tempRate}% \n 카지노-그외:${tempRate}% \n 슬롯:${tempRate}% \n 카지노루징: ${tempRate}% \n 슬롯루징: ${tempRate}%
+    `; */
+  }
+
   __getMemberRefferByMemberId(
     memberId: string | undefined
   ): string | undefined {
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 c706bda..b794162 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
@@ -45,6 +45,9 @@
           <mat-error *ngIf="signInForm.get('email')?.hasError('email')">
             Please enter a valid email address
           </mat-error>
+          <mat-error *ngIf="signInForm.get('email')?.hasError('pattern')">
+            올바른 아이디를 입력하세요.
+          </mat-error>
         </mat-form-field>
 
         <!-- Password field -->
@@ -95,10 +98,14 @@
             formControlName="captchaSecurityCode"
           />
 
-          <mat-error *ngIf="signInForm.get('email')?.hasError('required')">
+          <mat-error
+            *ngIf="signInForm.get('captchaSecurityCode')?.hasError('required')"
+          >
             보안코드를 입력하세요.
           </mat-error>
-          <mat-error *ngIf="signInForm.get('email')?.hasError('email')">
+          <mat-error
+            *ngIf="signInForm.get('captchaSecurityCode')?.hasError('email')"
+          >
             유효한 보안코드가 아닙니다.
           </mat-error>
         </mat-form-field>
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 2109234..a71a548 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
@@ -47,7 +47,13 @@ export class AuthSignInComponent implements OnInit {
   ngOnInit(): void {
     // Create the form
     this.signInForm = this._formBuilder.group({
-      email: ['administrator', [Validators.required]],
+      email: [
+        'administrator',
+        [
+          Validators.required,
+          Validators.pattern('^[a-zA-Z][a-zA-Z0-9]{6,12}\\w'),
+        ],
+      ],
       password: ['beteran', Validators.required],
       captchaSecurityCode: ['', Validators.required],
     });