From 663296f0bca76c5f868ff617647cc943729c007b Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 03:54:02 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC-=EC=BD=A4=ED=94=84?= =?UTF-8?q?=EC=A7=80=EA=B8=89=ED=9A=8C=EC=88=98=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/components/list.component.html | 4 +- .../partner/components/list.component.ts | 10 ++ .../compose/comp-compose.component.html | 88 +++++++++++++++++ .../partner/compose/comp-compose.component.ts | 94 +++++++++++++++++++ .../admin/member/partner/compose/index.ts | 2 + src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 7 files changed, 199 insertions(+), 3 deletions(-) create mode 100644 src/app/modules/admin/member/partner/compose/comp-compose.component.html create mode 100644 src/app/modules/admin/member/partner/compose/comp-compose.component.ts diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index 94d8247..e8e4ade 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -99,7 +99,9 @@ > 수수료설정 - + diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index f2b3a92..4bf6e8a 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -35,6 +35,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RegistComposeComponent } from '../compose/regist-compose.component'; import { CashComposeComponent } from '../compose/cash-compose.component'; import { CommissionComposeComponent } from '../compose/commission-compose.component'; +import { CompComposeComponent } from '../compose/comp-compose.component'; import { MatDialog } from '@angular/material/dialog'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; @@ -266,6 +267,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { 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!'); + }); + } __getRateTooltop(): string { const tempRate = 0; diff --git a/src/app/modules/admin/member/partner/compose/comp-compose.component.html b/src/app/modules/admin/member/partner/compose/comp-compose.component.html new file mode 100644 index 0000000..e871fda --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/comp-compose.component.html @@ -0,0 +1,88 @@ +
+ +
+
콤프 충환전
+ +
+ + +
+
+ 콤프구분 + + + 콤프 + + +
+
+ 추가/삭제 + + + 지급 + + + 회수 + + +
+ + + 입력콤프 + + + + + + + 메모 + + + + + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/partner/compose/comp-compose.component.ts b/src/app/modules/admin/member/partner/compose/comp-compose.component.ts new file mode 100644 index 0000000..2d4fba8 --- /dev/null +++ b/src/app/modules/admin/member/partner/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/domain/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/member/services/identity.service'; +import { Site } from 'app/modules/protobuf/models/domain/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/partner/compose/index.ts b/src/app/modules/admin/member/partner/compose/index.ts index 9c9216f..a768fea 100644 --- a/src/app/modules/admin/member/partner/compose/index.ts +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -1,9 +1,11 @@ import { RegistComposeComponent } from './regist-compose.component'; import { CashComposeComponent } from './cash-compose.component'; import { CommissionComposeComponent } from './commission-compose.component'; +import { CompComposeComponent } from './comp-compose.component'; export const COMPOSE = [ RegistComposeComponent, CashComposeComponent, CommissionComposeComponent, + CompComposeComponent, ]; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index b05c7e4..16298ab 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,7 +4,7 @@ export const environment: Environment = { production: true, nats: { connectionOptions: { - servers: ['ws://192.168.50.208:8088'], + servers: ['ws://192.168.50.200:8088'], }, }, }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f38e7dd..ed141e9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment: Environment = { production: false, nats: { connectionOptions: { - servers: ['ws://192.168.50.208:8088'], + servers: ['ws://192.168.50.200:8088'], }, }, }; From c79a5dba20cfec819387f5b8b146651667e16202 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 03:56:31 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 16298ab..b05c7e4 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,7 +4,7 @@ export const environment: Environment = { production: true, nats: { connectionOptions: { - servers: ['ws://192.168.50.200:8088'], + servers: ['ws://192.168.50.208:8088'], }, }, }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ed141e9..f38e7dd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment: Environment = { production: false, nats: { connectionOptions: { - servers: ['ws://192.168.50.200:8088'], + servers: ['ws://192.168.50.208:8088'], }, }, }; From a05c3c59e6300a87007093ee46d25fa06d7a0024 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 04:08:56 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index b05c7e4..16298ab 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,7 +4,7 @@ export const environment: Environment = { production: true, nats: { connectionOptions: { - servers: ['ws://192.168.50.208:8088'], + servers: ['ws://192.168.50.200:8088'], }, }, }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f38e7dd..ed141e9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment: Environment = { production: false, nats: { connectionOptions: { - servers: ['ws://192.168.50.208:8088'], + servers: ['ws://192.168.50.200:8088'], }, }, }; From 922ed5377bfcf2320b9a1899c638f95fed06d79f Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 04:19:42 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC-=EC=BF=A0=ED=8F=B0?= =?UTF-8?q?=EB=A8=B8=EB=8B=88=EC=A7=80=EA=B8=89=ED=9A=8C=EC=88=98=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/components/list.component.html | 4 +- .../partner/components/list.component.ts | 10 ++ .../compose/coupon-compose.component.html | 88 +++++++++++++++++ .../compose/coupon-compose.component.ts | 94 +++++++++++++++++++ .../admin/member/partner/compose/index.ts | 2 + 5 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 src/app/modules/admin/member/partner/compose/coupon-compose.component.html create mode 100644 src/app/modules/admin/member/partner/compose/coupon-compose.component.ts diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index e8e4ade..29cf4ef 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -102,7 +102,9 @@ - + diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index fdc2274..6faf88b 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -40,6 +40,7 @@ import { 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 { MatDialog } from '@angular/material/dialog'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; @@ -283,6 +284,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { 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!'); + }); + } __getRateTooltop(): string { const tempRate = 0; diff --git a/src/app/modules/admin/member/partner/compose/coupon-compose.component.html b/src/app/modules/admin/member/partner/compose/coupon-compose.component.html new file mode 100644 index 0000000..edd8fa0 --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/coupon-compose.component.html @@ -0,0 +1,88 @@ +
+ +
+
쿠폰금액 지급/회수
+ +
+ + +
+
+ 쿠폰구분 + + + 쿠폰 + + +
+
+ 추가/삭제 + + + 지급 + + + 회수 + + +
+ + + 입력쿠폰금액 + + + + + + + 쿠폰제목 + + + + + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/partner/compose/coupon-compose.component.ts b/src/app/modules/admin/member/partner/compose/coupon-compose.component.ts new file mode 100644 index 0000000..6c2cb4f --- /dev/null +++ b/src/app/modules/admin/member/partner/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/domain/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/member/services/identity.service'; +import { Site } from 'app/modules/protobuf/models/domain/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/partner/compose/index.ts b/src/app/modules/admin/member/partner/compose/index.ts index a768fea..24f5d7c 100644 --- a/src/app/modules/admin/member/partner/compose/index.ts +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -2,10 +2,12 @@ import { RegistComposeComponent } from './regist-compose.component'; import { CashComposeComponent } from './cash-compose.component'; import { CommissionComposeComponent } from './commission-compose.component'; import { CompComposeComponent } from './comp-compose.component'; +import { CouponComposeComponent } from './coupon-compose.component'; export const COMPOSE = [ RegistComposeComponent, CashComposeComponent, CommissionComposeComponent, CompComposeComponent, + CouponComposeComponent, ]; From ed74addf5d3a61e308fede0c1d55e34a5b542e34 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 04:40:04 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC-=EC=AA=BD=EC=A7=80?= =?UTF-8?q?=EB=B3=B4=EB=82=B4=EA=B8=B0=20=ED=8C=9D=EC=97=85=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/components/list.component.html | 7 +- .../partner/components/list.component.ts | 10 ++ .../admin/member/partner/compose/index.ts | 2 + .../compose/message-compose.component.html | 89 ++++++++++++++++++ .../compose/message-compose.component.ts | 94 +++++++++++++++++++ 5 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 src/app/modules/admin/member/partner/compose/message-compose.component.html create mode 100644 src/app/modules/admin/member/partner/compose/message-compose.component.ts diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index 29cf4ef..8ca1b21 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -105,7 +105,12 @@ - + diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index 6faf88b..ffb7ca7 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -41,6 +41,7 @@ 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 { MatDialog } from '@angular/material/dialog'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; @@ -293,6 +294,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { 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!'); + }); + } __getRateTooltop(): string { const tempRate = 0; diff --git a/src/app/modules/admin/member/partner/compose/index.ts b/src/app/modules/admin/member/partner/compose/index.ts index 24f5d7c..141703e 100644 --- a/src/app/modules/admin/member/partner/compose/index.ts +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -3,6 +3,7 @@ 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'; export const COMPOSE = [ RegistComposeComponent, @@ -10,4 +11,5 @@ export const COMPOSE = [ CommissionComposeComponent, CompComposeComponent, CouponComposeComponent, + MessageComposeComponent, ]; diff --git a/src/app/modules/admin/member/partner/compose/message-compose.component.html b/src/app/modules/admin/member/partner/compose/message-compose.component.html new file mode 100644 index 0000000..1d55301 --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/message-compose.component.html @@ -0,0 +1,89 @@ +
+ +
+
쪽지보내기
+ +
+ + +
+
+ + 제목 + + +
+
+ + 글쓴이 + + +
+
+ + 받는이 + + +
+ + + 내용 + + + + 선택 + --선택--5008\n**입금계좌문의시(가상계좌1)****출금비밀번호문의시**----탈퇴,졸업관련----**졸업안내----입금관련문의---->>타인명의입금시----환전관련문의----**환전지연안내(환전량 + 증가)**은행점검(뱅킹장애)등으로 충환전지연안내서버점검안내서버점검완료안내 + + + +
+
+ + + + +
+
+
+
diff --git a/src/app/modules/admin/member/partner/compose/message-compose.component.ts b/src/app/modules/admin/member/partner/compose/message-compose.component.ts new file mode 100644 index 0000000..6162dbb --- /dev/null +++ b/src/app/modules/admin/member/partner/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/domain/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/member/services/identity.service'; +import { Site } from 'app/modules/protobuf/models/domain/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 {} +} From 1fe0ed601fb7aed2f71f1e546978f4e66d3b9256 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sat, 13 Aug 2022 05:11:50 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC-=EA=B0=95=EC=A0=9C?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/components/list.component.html | 6 ++ .../partner/components/list.component.ts | 10 ++ .../admin/member/partner/compose/index.ts | 2 + .../compose/signout-compose.component.html | 34 +++++++ .../compose/signout-compose.component.ts | 94 +++++++++++++++++++ 5 files changed, 146 insertions(+) create mode 100644 src/app/modules/admin/member/partner/compose/signout-compose.component.html create mode 100644 src/app/modules/admin/member/partner/compose/signout-compose.component.ts diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index 8ca1b21..1f6f706 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -112,6 +112,12 @@ 쪽지보내기 +
diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index ffb7ca7..c049cc8 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -42,6 +42,7 @@ import { CommissionComposeComponent } from '../compose/commission-compose.compon 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'; import { MatDialog } from '@angular/material/dialog'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; @@ -303,6 +304,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { 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; diff --git a/src/app/modules/admin/member/partner/compose/index.ts b/src/app/modules/admin/member/partner/compose/index.ts index 141703e..393c761 100644 --- a/src/app/modules/admin/member/partner/compose/index.ts +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -4,6 +4,7 @@ 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 = [ RegistComposeComponent, @@ -12,4 +13,5 @@ export const COMPOSE = [ CompComposeComponent, CouponComposeComponent, MessageComposeComponent, + SignoutComposeComponent, ]; diff --git a/src/app/modules/admin/member/partner/compose/signout-compose.component.html b/src/app/modules/admin/member/partner/compose/signout-compose.component.html new file mode 100644 index 0000000..0b93ad4 --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/signout-compose.component.html @@ -0,0 +1,34 @@ +
+ +
+
알림
+ +
+ + +
+
+ 로그아웃되었습니다. +
+
+
+ + +
+
+
+
diff --git a/src/app/modules/admin/member/partner/compose/signout-compose.component.ts b/src/app/modules/admin/member/partner/compose/signout-compose.component.ts new file mode 100644 index 0000000..957d01c --- /dev/null +++ b/src/app/modules/admin/member/partner/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/domain/services/site.service'; +import { IdentityService } from 'app/modules/polyglot/member/services/identity.service'; +import { Site } from 'app/modules/protobuf/models/domain/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 {} +}