From 5cb66cf8920146adf7c983cac4487a333015015d Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 03:47:40 +0000 Subject: [PATCH 1/6] bug fix --- .../user/components/list.component.html | 21 +++++++++++++++++-- .../member/user/components/list.component.ts | 12 +++++++++++ .../modules/admin/member/user/user.module.ts | 4 ++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/app/modules/admin/member/user/components/list.component.html b/src/app/modules/admin/member/user/components/list.component.html index c00ca7a..f71abae 100644 --- a/src/app/modules/admin/member/user/components/list.component.html +++ b/src/app/modules/admin/member/user/components/list.component.html @@ -204,8 +204,25 @@
-
관리
-
요율
+ +
요율
{{ user.highRank }}
diff --git a/src/app/modules/admin/member/user/components/list.component.ts b/src/app/modules/admin/member/user/components/list.component.ts index 8146510..1b4c2cf 100644 --- a/src/app/modules/admin/member/user/components/list.component.ts +++ b/src/app/modules/admin/member/user/components/list.component.ts @@ -46,6 +46,10 @@ import { IdentityService } from 'app/modules/polyglot/identity/services/identity grid-template-columns: 20px 40px 40px 100px auto 40px 140px 140px 140px 140px 140px 140px; } } + + .mat-tooltip { + white-space: pre-line; + } `, ], encapsulation: ViewEncapsulation.None, @@ -194,4 +198,12 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __getRateTooltop(): string { + const tempRate = 0; + const resultTooltip = ` + 요율확인 \n 카지노-바카라: ${tempRate}% \n 카지노-룰렛: ${tempRate}% \n 카지노-드레곤타이거: ${tempRate}% \n 카지노-그외:${tempRate}% \n 슬롯:${tempRate}% \n 카지노루징: ${tempRate}% \n 슬롯루징: ${tempRate}% + `; + return resultTooltip; + } } diff --git a/src/app/modules/admin/member/user/user.module.ts b/src/app/modules/admin/member/user/user.module.ts index 656f6e7..250d043 100644 --- a/src/app/modules/admin/member/user/user.module.ts +++ b/src/app/modules/admin/member/user/user.module.ts @@ -16,6 +16,8 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatRadioModule } from '@angular/material/radio'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatDividerModule } from '@angular/material/divider'; import { FuseCardModule } from '@fuse/components/card'; @@ -49,6 +51,8 @@ import { userRoutes } from 'app/modules/admin/member/user/user.routing'; MatRadioModule, MatCheckboxModule, MatChipsModule, + MatMenuModule, + MatDividerModule, FuseCardModule, ], From c3e8b13e4f4e5f9191e824bd6326236537898d42 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 03:57:30 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=B0=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/components/list.component.html | 27 +++-- .../member/user/components/list.component.ts | 64 +++++++++++- .../user/compose/cash-compose.component.html | 88 +++++++++++++++++ .../user/compose/cash-compose.component.ts | 94 ++++++++++++++++++ .../compose/commission-compose.component.html | 96 ++++++++++++++++++ .../compose/commission-compose.component.ts | 99 +++++++++++++++++++ .../user/compose/comp-compose.component.html | 88 +++++++++++++++++ .../user/compose/comp-compose.component.ts | 94 ++++++++++++++++++ .../compose/coupon-compose.component.html | 88 +++++++++++++++++ .../user/compose/coupon-compose.component.ts | 94 ++++++++++++++++++ .../admin/member/user/compose/index.ts | 15 +++ .../compose/message-compose.component.html | 89 +++++++++++++++++ .../user/compose/message-compose.component.ts | 94 ++++++++++++++++++ .../compose/signout-compose.component.html | 34 +++++++ .../user/compose/signout-compose.component.ts | 94 ++++++++++++++++++ .../modules/admin/member/user/user.module.ts | 5 +- 16 files changed, 1155 insertions(+), 8 deletions(-) create mode 100644 src/app/modules/admin/member/user/compose/cash-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/cash-compose.component.ts create mode 100644 src/app/modules/admin/member/user/compose/commission-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/commission-compose.component.ts create mode 100644 src/app/modules/admin/member/user/compose/comp-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/comp-compose.component.ts create mode 100644 src/app/modules/admin/member/user/compose/coupon-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/coupon-compose.component.ts create mode 100644 src/app/modules/admin/member/user/compose/index.ts create mode 100644 src/app/modules/admin/member/user/compose/message-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/message-compose.component.ts create mode 100644 src/app/modules/admin/member/user/compose/signout-compose.component.html create mode 100644 src/app/modules/admin/member/user/compose/signout-compose.component.ts diff --git a/src/app/modules/admin/member/user/components/list.component.html b/src/app/modules/admin/member/user/components/list.component.html index f71abae..140ef60 100644 --- a/src/app/modules/admin/member/user/components/list.component.html +++ b/src/app/modules/admin/member/user/components/list.component.html @@ -213,13 +213,28 @@ 관리 - - - - - + + + + + - +
요율
diff --git a/src/app/modules/admin/member/user/components/list.component.ts b/src/app/modules/admin/member/user/components/list.component.ts index 1b4c2cf..adf8393 100644 --- a/src/app/modules/admin/member/user/components/list.component.ts +++ b/src/app/modules/admin/member/user/components/list.component.ts @@ -20,6 +20,13 @@ import { UserPagination } from '../models/user-pagination'; import { UserService } from '../services/user.service'; import { Router } from '@angular/router'; import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { MatDialog } from '@angular/material/dialog'; +import { CashComposeComponent } from '../compose/cash-compose.component'; +import { CommissionComposeComponent } from '../compose/commission-compose.component'; +import { CompComposeComponent } from '../compose/comp-compose.component'; +import { CouponComposeComponent } from '../compose/coupon-compose.component'; +import { MessageComposeComponent } from '../compose/message-compose.component'; +import { SignoutComposeComponent } from '../compose/signout-compose.component'; @Component({ selector: 'user-list', @@ -79,7 +86,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _formBuilder: FormBuilder, private _userService: UserService, private _identityService: IdentityService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -199,6 +207,60 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { return item.id || index; } + __onClickCash(event: MouseEvent): void { + const dialogRef = this._matDialog.open(CashComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } + __onClickCommission(event: MouseEvent): void { + const dialogRef = this._matDialog.open(CommissionComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } + __onClickComp(event: MouseEvent): void { + const dialogRef = this._matDialog.open(CompComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } + __onClickCoupon(event: MouseEvent): void { + const dialogRef = this._matDialog.open(CouponComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } + __onClickMessage(event: MouseEvent): void { + const dialogRef = this._matDialog.open(MessageComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } + __onClickSignout(event: MouseEvent): void { + const dialogRef = this._matDialog.open(SignoutComposeComponent, { + data: { price: '', memo: '' }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } __getRateTooltop(): string { const tempRate = 0; const resultTooltip = ` diff --git a/src/app/modules/admin/member/user/compose/cash-compose.component.html b/src/app/modules/admin/member/user/compose/cash-compose.component.html new file mode 100644 index 0000000..603d2bb --- /dev/null +++ b/src/app/modules/admin/member/user/compose/cash-compose.component.html @@ -0,0 +1,88 @@ +
+ +
+
캐쉬 충환전
+ +
+ + +
+
+ 캐쉬구분 + + + 캐쉬 + + +
+
+ 추가/삭제 + + + 지급 + + + 회수 + + +
+ + + 입력금액 + + + + + + + 메모 + + + + + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/cash-compose.component.ts b/src/app/modules/admin/member/user/compose/cash-compose.component.ts new file mode 100644 index 0000000..21b0dda --- /dev/null +++ b/src/app/modules/admin/member/user/compose/cash-compose.component.ts @@ -0,0 +1,94 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface CashComposeData { + price: string; + memo: string; +} +export interface CashComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-cash-compose', + templateUrl: './cash-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class CashComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: CashComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + price: ['', [Validators.required]], + memo: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/compose/commission-compose.component.html b/src/app/modules/admin/member/user/compose/commission-compose.component.html new file mode 100644 index 0000000..3c40fc8 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/commission-compose.component.html @@ -0,0 +1,96 @@ +
+ +
+
수수료 변경
+ +
+ + +
+
+
카지노 요율
+ + + 바카라 + 2.00 + + %(최소 2 ~ 최대 5)        + + + 룰렛 + 2.00 + + %(최소 1.8 ~ 최대 5) +
+ + + 드레곤타이거 + 2.00 + + %(최소 1.8 ~ 최대 5)      + + + 기타게임 + 2.00 + + %(최소 1.5 ~ 최대 5) +
+ + +
+ + 슬롯요율 + 5.00 + + %(최소 4 ~ 최대 5) +
+ +
+ + + 카지노 루징 + 50.00 + + %(최소 40 ~ 최대 50) +     + + + 슬롯 루징 + 50.00 + + %(최소 40 ~ 최대 50) +
+ +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/commission-compose.component.ts b/src/app/modules/admin/member/user/compose/commission-compose.component.ts new file mode 100644 index 0000000..f40d22b --- /dev/null +++ b/src/app/modules/admin/member/user/compose/commission-compose.component.ts @@ -0,0 +1,99 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface CommissionComposeData { + price: string; + memo: string; +} +export interface CommissionComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-commission-compose', + templateUrl: './commission-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class CommissionComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: CommissionComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + bacaraRate: ['', [Validators.required]], + rouletteRate: ['', [Validators.required]], + dragonTigerRate: ['', [Validators.required]], + otherGameRate: ['', [Validators.required]], + slotRate: ['', [Validators.required]], + casinoLoosing: ['', [Validators.required]], + slotLoosing: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/compose/comp-compose.component.html b/src/app/modules/admin/member/user/compose/comp-compose.component.html new file mode 100644 index 0000000..e871fda --- /dev/null +++ b/src/app/modules/admin/member/user/compose/comp-compose.component.html @@ -0,0 +1,88 @@ +
+ +
+
콤프 충환전
+ +
+ + +
+
+ 콤프구분 + + + 콤프 + + +
+
+ 추가/삭제 + + + 지급 + + + 회수 + + +
+ + + 입력콤프 + + + + + + + 메모 + + + + + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/comp-compose.component.ts b/src/app/modules/admin/member/user/compose/comp-compose.component.ts new file mode 100644 index 0000000..a09d7c6 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/comp-compose.component.ts @@ -0,0 +1,94 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface CompComposeData { + price: string; + memo: string; +} +export interface CompComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-comp-compose', + templateUrl: './comp-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class CompComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: CompComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + price: ['', [Validators.required]], + memo: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/compose/coupon-compose.component.html b/src/app/modules/admin/member/user/compose/coupon-compose.component.html new file mode 100644 index 0000000..edd8fa0 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/coupon-compose.component.html @@ -0,0 +1,88 @@ +
+ +
+
쿠폰금액 지급/회수
+ +
+ + +
+
+ 쿠폰구분 + + + 쿠폰 + + +
+
+ 추가/삭제 + + + 지급 + + + 회수 + + +
+ + + 입력쿠폰금액 + + + + + + + 쿠폰제목 + + + + + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/coupon-compose.component.ts b/src/app/modules/admin/member/user/compose/coupon-compose.component.ts new file mode 100644 index 0000000..7a64bc9 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/coupon-compose.component.ts @@ -0,0 +1,94 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface CouponComposeData { + price: string; + memo: string; +} +export interface CouponComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-coupon-compose', + templateUrl: './coupon-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class CouponComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: CouponComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + price: ['', [Validators.required]], + memo: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/compose/index.ts b/src/app/modules/admin/member/user/compose/index.ts new file mode 100644 index 0000000..c742e24 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/index.ts @@ -0,0 +1,15 @@ +import { CashComposeComponent } from './cash-compose.component'; +import { CommissionComposeComponent } from './commission-compose.component'; +import { CompComposeComponent } from './comp-compose.component'; +import { CouponComposeComponent } from './coupon-compose.component'; +import { MessageComposeComponent } from './message-compose.component'; +import { SignoutComposeComponent } from './signout-compose.component'; + +export const COMPOSE = [ + CashComposeComponent, + CommissionComposeComponent, + CompComposeComponent, + CouponComposeComponent, + MessageComposeComponent, + SignoutComposeComponent, +]; diff --git a/src/app/modules/admin/member/user/compose/message-compose.component.html b/src/app/modules/admin/member/user/compose/message-compose.component.html new file mode 100644 index 0000000..1d55301 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/message-compose.component.html @@ -0,0 +1,89 @@ +
+ +
+
쪽지보내기
+ +
+ + +
+
+ + 제목 + + +
+
+ + 글쓴이 + + +
+
+ + 받는이 + + +
+ + + 내용 + + + + 선택 + --선택--5008\n**입금계좌문의시(가상계좌1)****출금비밀번호문의시**----탈퇴,졸업관련----**졸업안내----입금관련문의---->>타인명의입금시----환전관련문의----**환전지연안내(환전량 + 증가)**은행점검(뱅킹장애)등으로 충환전지연안내서버점검안내서버점검완료안내 + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/message-compose.component.ts b/src/app/modules/admin/member/user/compose/message-compose.component.ts new file mode 100644 index 0000000..6a4639e --- /dev/null +++ b/src/app/modules/admin/member/user/compose/message-compose.component.ts @@ -0,0 +1,94 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface MessageComposeData { + price: string; + memo: string; +} +export interface MessageComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-message-compose', + templateUrl: './message-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class MessageComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: MessageComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + price: ['', [Validators.required]], + memo: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/compose/signout-compose.component.html b/src/app/modules/admin/member/user/compose/signout-compose.component.html new file mode 100644 index 0000000..0b93ad4 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/signout-compose.component.html @@ -0,0 +1,34 @@ +
+ +
+
알림
+ +
+ + +
+
+ 로그아웃되었습니다. +
+
+
+ + +
+
+
+
diff --git a/src/app/modules/admin/member/user/compose/signout-compose.component.ts b/src/app/modules/admin/member/user/compose/signout-compose.component.ts new file mode 100644 index 0000000..84d5533 --- /dev/null +++ b/src/app/modules/admin/member/user/compose/signout-compose.component.ts @@ -0,0 +1,94 @@ +import { + ChangeDetectorRef, + Component, + Inject, + OnInit, + ViewEncapsulation, +} from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { SiteService } from 'app/modules/polyglot/site/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/identity/services/identity.service'; +import { Site } from 'app/modules/proto/models/site_pb'; + +export interface SignoutComposeData { + price: string; + memo: string; +} +export interface SignoutComposeResult { + price: string; + memo: string; +} + +@Component({ + selector: 'app-signout-compose', + templateUrl: './signout-compose.component.html', + encapsulation: ViewEncapsulation.None, +}) +export class SignoutComposeComponent implements OnInit { + composeForm!: FormGroup; + sites: any[] = []; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; + + /** + * Constructor + */ + constructor( + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: SignoutComposeData, + private _formBuilder: FormBuilder, + private _identityService: IdentityService, + private _changeDetectorRef: ChangeDetectorRef + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Create the form + this.composeForm = this._formBuilder.group({ + price: ['', [Validators.required]], + memo: ['', [Validators.required]], + }); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Save and close + */ + saveAndClose(): void { + // Save the message as a draft + this.saveAsDraft(); + + // Close the dialog + this.matDialogRef.close(); + } + + /** + * Discard the message + */ + discard(): void {} + + /** + * Save the message as a draft + */ + saveAsDraft(): void {} + + /** + * Send the message + */ + send(): void {} +} diff --git a/src/app/modules/admin/member/user/user.module.ts b/src/app/modules/admin/member/user/user.module.ts index 250d043..312ef04 100644 --- a/src/app/modules/admin/member/user/user.module.ts +++ b/src/app/modules/admin/member/user/user.module.ts @@ -18,6 +18,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; import { MatMenuModule } from '@angular/material/menu'; import { MatDividerModule } from '@angular/material/divider'; +import { MatDialogModule } from '@angular/material/dialog'; import { FuseCardModule } from '@fuse/components/card'; @@ -26,11 +27,12 @@ import { TranslocoModule } from '@ngneat/transloco'; import { SharedModule } from 'app/shared/shared.module'; import { COMPONENTS } from './components'; +import { COMPOSE } from './compose'; import { userRoutes } from 'app/modules/admin/member/user/user.routing'; @NgModule({ - declarations: [COMPONENTS], + declarations: [COMPONENTS, COMPOSE], imports: [ TranslocoModule, SharedModule, @@ -53,6 +55,7 @@ import { userRoutes } from 'app/modules/admin/member/user/user.routing'; MatChipsModule, MatMenuModule, MatDividerModule, + MatDialogModule, FuseCardModule, ], From 7172b4b9bf7ed22eb8cc0758293fa8ace8d62f7c Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 04:25:20 +0000 Subject: [PATCH 3/6] bug fixed --- .../components/list.component.html | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/app/modules/admin/member/unconnected/components/list.component.html b/src/app/modules/admin/member/unconnected/components/list.component.html index 3945024..80dfbcb 100644 --- a/src/app/modules/admin/member/unconnected/components/list.component.html +++ b/src/app/modules/admin/member/unconnected/components/list.component.html @@ -254,6 +254,32 @@ +
+
+ +
+
+ +
+
-
- -
-
- -
From ffda32c5e881508e47458ca26209374a280461f8 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 07:22:47 +0000 Subject: [PATCH 4/6] bug fix --- .../components/list.component.html | 440 +++++++++++------- .../current-user/components/list.component.ts | 26 +- 2 files changed, 302 insertions(+), 164 deletions(-) diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index 5e411f9..d34a095 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -1,174 +1,296 @@ + +
+
- -
- -
- -
- -
- 현재접속자&쪽지전송 -
+
+ 현재접속자&쪽지전송
- -
- -
+ - - -
- -
-
번호
-
상부
-
- 아이디 -
- 닉네임 -
-
- 등급 -
- 레벨 -
-
현재위치
- - - - - - - -
- - - -
-
{{ currentUser.idx }}
-
{{ currentUser.highRank }}
-
-
- {{ currentUser.signinId }} -
-
- {{ currentUser.nickname }} -
- {{ currentUser.currentLocation }} -
-
- {{ currentUser.rank }} -
- {{ currentUser.level }} -
-
{{ currentUser.currentLocation }}
- - - - - - - -
- - -
- - - + + + + - -
- There are no data! -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호 + {{ info.idx }} + 상위{{ info.highRank }} + 아이디 +
+ 닉네임 + 		+ {{ info.signinId }} +
+ {{ info.nickname }} + 		+ 등급 +
+ 레벨 +
+ 현재위치 + 		+ {{ info.rank }} +
+ {{ info.level }} +
+ {{ info.currentLocation }} + 		캐쉬{{ info.ownCash }} + 게임중머니 +
+ 콤프 + 		+ {{ info.gameMoney }} +
+ {{ info.ownComp }} + 		사이트{{ info.siteAddress }}카지노->캐쉬 + +
+ + 		+ 쪽지보내기 +
+ 배팅내역 +
+ 로그아웃 + 		+ +
+ +
+ +
+
+ +
= + new MatTableDataSource(); + currentUsers$!: Observable; users$!: Observable; @@ -79,6 +82,18 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { pagination?: CurrentUserPagination; targetForm!: FormGroup; + currentUserTableColumns: string[] = [ + 'idx', + 'highRank', + 'signinId', + 'level', + 'ownCash', + 'comp', + 'site', + 'casino', + 'etcBtn', + ]; + private _unsubscribeAll: Subject = new Subject(); /** @@ -122,6 +137,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (!curUsers) { return; } + this.currentUserDataSource.data = curUsers; this.targetForm.patchValue(curUsers[0]); // Mark for check From f57364bb4dbaf6140ae464b40fd4613f9e380c64 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 07:22:58 +0000 Subject: [PATCH 5/6] bug fix --- .../components/list.component.html | 131 ------------------ 1 file changed, 131 deletions(-) diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index d34a095..cecdbfa 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -1,134 +1,3 @@ - -
From 9b6c62ad2e96abdeada2eb50b9c9c48a96e0cd38 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Sun, 14 Aug 2022 08:12:12 +0000 Subject: [PATCH 6/6] bug fix --- .../coupon/components/list.component.html | 28 ++++++++++++++----- .../coupon/components/list.component.ts | 4 +-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/app/modules/admin/member/coupon/components/list.component.html b/src/app/modules/admin/member/coupon/components/list.component.html index 3650f93..5b8b4e3 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.html +++ b/src/app/modules/admin/member/coupon/components/list.component.html @@ -99,8 +99,11 @@
-
그룹번호
-
쿠폰시리얼번호
+
+ 그룹번호 +
+ 쿠폰시리얼번호 +
생성아이디
@@ -129,8 +132,18 @@
-
{{ coupon.couponGroupNumber }}
-
{{ coupon.couponSerialNumber }}
+
+ {{ coupon.couponGroupNumber }} +
+ {{ coupon.couponSerialNumber }} +
{{ coupon.issuedCouponId }} @@ -138,9 +151,7 @@
{{ coupon.issuedCouponNickname }}
-
- {{ coupon.issuedCouponMoney }} -
+
{{ coupon.issuedCoupons }}
@@ -149,6 +160,9 @@
{{ coupon.takeCouponNickname }}
+
+ {{ coupon.issuedCouponMoney }} +