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..1f6f706 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -99,10 +99,25 @@ > 수수료설정 - - - + + + +
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 5c6b5fa..9c5fefd 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -39,6 +39,10 @@ import { } 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 { 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/site/services/site.service'; @@ -276,6 +280,42 @@ 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!'); + }); + } + __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; 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/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 9c9216f..393c761 100644 --- a/src/app/modules/admin/member/partner/compose/index.ts +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -1,9 +1,17 @@ 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'; +import { MessageComposeComponent } from './message-compose.component'; +import { SignoutComposeComponent } from './signout-compose.component'; export const COMPOSE = [ RegistComposeComponent, CashComposeComponent, CommissionComposeComponent, + CompComposeComponent, + CouponComposeComponent, + MessageComposeComponent, + SignoutComposeComponent, ]; 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 {} +} 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 {} +} 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'], }, }, };