From b34f2ebfff08a6b29cbfaa373a4ff0f58ceaa710 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Fri, 15 Jul 2022 08:22:02 +0000 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=ED=8A=B8=EB=84=88=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/compose/compose.component.html | 123 ------------------ .../components/all-list.component.html | 6 +- .../partner/components/all-list.component.ts | 13 +- .../components/branch-list.component.html | 6 +- .../components/branch-list.component.ts | 13 +- .../components/division-list.component.html | 6 +- .../components/division-list.component.ts | 13 +- .../main-office-list.component.html | 6 +- .../components/main-office-list.component.ts | 14 +- .../components/office-list.component.html | 6 +- .../components/office-list.component.ts | 14 +- .../recommendation-list.component.html | 6 +- .../recommendation-list.component.ts | 13 +- .../components/store-list.component.html | 6 +- .../components/store-list.component.ts | 13 +- .../admin/member/partner/compose/index.ts | 3 + .../compose/regist-compose.component.html | 111 ++++++++++++++++ .../compose/regist-compose.component.ts} | 18 +-- .../admin/member/partner/partner.module.ts | 3 +- 19 files changed, 246 insertions(+), 147 deletions(-) delete mode 100644 src/app/modules/admin/member/compose/compose.component.html create mode 100644 src/app/modules/admin/member/partner/compose/index.ts create mode 100644 src/app/modules/admin/member/partner/compose/regist-compose.component.html rename src/app/modules/admin/member/{compose/compose.component.ts => partner/compose/regist-compose.component.ts} (88%) diff --git a/src/app/modules/admin/member/compose/compose.component.html b/src/app/modules/admin/member/compose/compose.component.html deleted file mode 100644 index 079899f..0000000 --- a/src/app/modules/admin/member/compose/compose.component.html +++ /dev/null @@ -1,123 +0,0 @@ -
- -
-
New Message
- -
- - -
- - - To - -
- - Cc - - - Bcc - -
-
- - - - Cc - - - - - - Bcc - - - - - - Subject - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - -
-
-
-
diff --git a/src/app/modules/admin/member/partner/components/all-list.component.html b/src/app/modules/admin/member/partner/components/all-list.component.html index 32ec3fd..258fa76 100644 --- a/src/app/modules/admin/member/partner/components/all-list.component.html +++ b/src/app/modules/admin/member/partner/components/all-list.component.html @@ -247,7 +247,11 @@ diff --git a/src/app/modules/admin/member/partner/components/all-list.component.ts b/src/app/modules/admin/member/partner/components/all-list.component.ts index 2a9eec0..a7eff03 100644 --- a/src/app/modules/admin/member/partner/components/all-list.component.ts +++ b/src/app/modules/admin/member/partner/components/all-list.component.ts @@ -34,7 +34,9 @@ import { Partner } from '../models/partner'; import { PartnerPagination } from '../models/partner-pagination'; import { PartnerService } from '../services/partner.service'; import { Router } from '@angular/router'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; +import { MatDialog } from '@angular/material/dialog'; @Component({ selector: 'app-partner-list', templateUrl: './all-list.component.html', @@ -84,7 +86,8 @@ export class AllListComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerService: PartnerService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -195,4 +198,12 @@ export class AllListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/branch-list.component.html b/src/app/modules/admin/member/partner/components/branch-list.component.html index e279fa6..f1d0e0d 100644 --- a/src/app/modules/admin/member/partner/components/branch-list.component.html +++ b/src/app/modules/admin/member/partner/components/branch-list.component.html @@ -326,7 +326,11 @@ diff --git a/src/app/modules/admin/member/partner/components/branch-list.component.ts b/src/app/modules/admin/member/partner/components/branch-list.component.ts index 0cf5357..f753d71 100644 --- a/src/app/modules/admin/member/partner/components/branch-list.component.ts +++ b/src/app/modules/admin/member/partner/components/branch-list.component.ts @@ -34,6 +34,8 @@ import { User } from '../../user/models/user'; import { Partner as PartnerBranch } from '../models/partner'; import { PartnerPagination as PartnerBranchPagination } from '../models/partner-pagination'; import { PartnerService as PartnerBranchService } from '../services/partner.service'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; import { Router } from '@angular/router'; @@ -87,7 +89,8 @@ export class BranchListComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerBranchService: PartnerBranchService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -198,4 +201,12 @@ export class BranchListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/division-list.component.html b/src/app/modules/admin/member/partner/components/division-list.component.html index 4847b7c..f416f4a 100644 --- a/src/app/modules/admin/member/partner/components/division-list.component.html +++ b/src/app/modules/admin/member/partner/components/division-list.component.html @@ -328,7 +328,11 @@ diff --git a/src/app/modules/admin/member/partner/components/division-list.component.ts b/src/app/modules/admin/member/partner/components/division-list.component.ts index a14358b..364e269 100644 --- a/src/app/modules/admin/member/partner/components/division-list.component.ts +++ b/src/app/modules/admin/member/partner/components/division-list.component.ts @@ -34,6 +34,9 @@ import { Partner as PartnerDivision } from '../models/partner'; import { PartnerPagination as PartnerDivisionPagination } from '../models/partner-pagination'; import { PartnerService as PartnerDivisionService } from '../services/partner.service'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; + import { Router } from '@angular/router'; @Component({ @@ -85,7 +88,8 @@ export class DivisionListComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerDivisionService: PartnerDivisionService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -196,4 +200,11 @@ export class DivisionListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/main-office-list.component.html b/src/app/modules/admin/member/partner/components/main-office-list.component.html index 28ecee3..efc914b 100644 --- a/src/app/modules/admin/member/partner/components/main-office-list.component.html +++ b/src/app/modules/admin/member/partner/components/main-office-list.component.html @@ -332,7 +332,11 @@ diff --git a/src/app/modules/admin/member/partner/components/main-office-list.component.ts b/src/app/modules/admin/member/partner/components/main-office-list.component.ts index 080ed08..0ccfe67 100644 --- a/src/app/modules/admin/member/partner/components/main-office-list.component.ts +++ b/src/app/modules/admin/member/partner/components/main-office-list.component.ts @@ -35,6 +35,9 @@ import { PartnerPagination as PartnerMainofficePagination } from '../models/part import { PartnerService as PartnerMainofficeService } from '../services/partner.service'; import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; + @Component({ selector: 'app-partner-main-office-list', templateUrl: './main-office-list.component.html', @@ -86,7 +89,8 @@ export class MainOfficeListComponent private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerMainofficeService: PartnerMainofficeService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -197,4 +201,12 @@ export class MainOfficeListComponent __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/office-list.component.html b/src/app/modules/admin/member/partner/components/office-list.component.html index 7d65219..02e9cde 100644 --- a/src/app/modules/admin/member/partner/components/office-list.component.html +++ b/src/app/modules/admin/member/partner/components/office-list.component.html @@ -326,7 +326,11 @@ diff --git a/src/app/modules/admin/member/partner/components/office-list.component.ts b/src/app/modules/admin/member/partner/components/office-list.component.ts index 111189e..d3b7277 100644 --- a/src/app/modules/admin/member/partner/components/office-list.component.ts +++ b/src/app/modules/admin/member/partner/components/office-list.component.ts @@ -37,6 +37,9 @@ import { PartnerService as PartnerOfficeService } from '../services/partner.serv import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; + @Component({ selector: 'app-partner-office-list', templateUrl: './office-list.component.html', @@ -86,7 +89,8 @@ export class OfficeListComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerOfficeService: PartnerOfficeService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -197,4 +201,12 @@ export class OfficeListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/recommendation-list.component.html b/src/app/modules/admin/member/partner/components/recommendation-list.component.html index f0b2e6e..a8fb09c 100644 --- a/src/app/modules/admin/member/partner/components/recommendation-list.component.html +++ b/src/app/modules/admin/member/partner/components/recommendation-list.component.html @@ -335,7 +335,11 @@ diff --git a/src/app/modules/admin/member/partner/components/recommendation-list.component.ts b/src/app/modules/admin/member/partner/components/recommendation-list.component.ts index 29026e9..c67465a 100644 --- a/src/app/modules/admin/member/partner/components/recommendation-list.component.ts +++ b/src/app/modules/admin/member/partner/components/recommendation-list.component.ts @@ -37,6 +37,8 @@ import { PartnerService as PartnerRecommendationService } from '../services/part import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; @Component({ selector: 'app-partner-recommendation-list', templateUrl: './recommendation-list.component.html', @@ -88,7 +90,8 @@ export class RecommendationListComponent private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerRecommendationService: PartnerRecommendationService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -199,4 +202,12 @@ export class RecommendationListComponent __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/components/store-list.component.html b/src/app/modules/admin/member/partner/components/store-list.component.html index 84fc25d..d0d62be 100644 --- a/src/app/modules/admin/member/partner/components/store-list.component.html +++ b/src/app/modules/admin/member/partner/components/store-list.component.html @@ -323,7 +323,11 @@ diff --git a/src/app/modules/admin/member/partner/components/store-list.component.ts b/src/app/modules/admin/member/partner/components/store-list.component.ts index c765d70..656da84 100644 --- a/src/app/modules/admin/member/partner/components/store-list.component.ts +++ b/src/app/modules/admin/member/partner/components/store-list.component.ts @@ -36,6 +36,8 @@ import { PartnerService as PartnerStoreService } from '../services/partner.servi import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { RegistComposeComponent } from '../compose/regist-compose.component'; @Component({ selector: 'app-partner-store-list', templateUrl: './store-list.component.html', @@ -85,7 +87,8 @@ export class StoreListComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _partnerStoreService: PartnerStoreService, - private router: Router + private router: Router, + private _matDialog: MatDialog ) {} // ----------------------------------------------------------------------------------------------------- @@ -196,4 +199,12 @@ export class StoreListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __onClickRegist(event: MouseEvent): void { + const dialogRef = this._matDialog.open(RegistComposeComponent); + + dialogRef.afterClosed().subscribe((result) => { + console.log('Compose dialog was closed!'); + }); + } } diff --git a/src/app/modules/admin/member/partner/compose/index.ts b/src/app/modules/admin/member/partner/compose/index.ts new file mode 100644 index 0000000..593e5ce --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/index.ts @@ -0,0 +1,3 @@ +import { RegistComposeComponent } from './regist-compose.component'; + +export const COMPOSE = [RegistComposeComponent]; diff --git a/src/app/modules/admin/member/partner/compose/regist-compose.component.html b/src/app/modules/admin/member/partner/compose/regist-compose.component.html new file mode 100644 index 0000000..109a5cd --- /dev/null +++ b/src/app/modules/admin/member/partner/compose/regist-compose.component.html @@ -0,0 +1,111 @@ +
+ +
+
대본사 생성
+ +
+ + +
+ + + 파트너아이디 + + + + + + 사이트명 + + + + + + 회원 아이디 + + + + + + 비밀번호 + + + + + 환전 비밀번호 + + + + + 닉네임 + + + + + 정산종류 + + + + + 휴대폰번호 + + + + + 은행명 + + + + + 계좌번호 + + + + + 예금주 + + + + + + + +
+
+ + + + + + +
+
+
+
diff --git a/src/app/modules/admin/member/compose/compose.component.ts b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts similarity index 88% rename from src/app/modules/admin/member/compose/compose.component.ts rename to src/app/modules/admin/member/partner/compose/regist-compose.component.ts index 74a6dc3..3f0319b 100644 --- a/src/app/modules/admin/member/compose/compose.component.ts +++ b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts @@ -3,8 +3,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'member-regist-compose', - templateUrl: './compose.component.html', + selector: 'app-regist-compose', + templateUrl: './regist-compose.component.html', encapsulation: ViewEncapsulation.None, }) export class RegistComposeComponent implements OnInit { @@ -13,13 +13,13 @@ export class RegistComposeComponent implements OnInit { cc: false, bcc: false, }; - quillModules: any = { - toolbar: [ - ['bold', 'italic', 'underline'], - [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], - ['clean'], - ], - }; + // quillModules: any = { + // toolbar: [ + // ['bold', 'italic', 'underline'], + // [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }], + // ['clean'], + // ], + // }; /** * Constructor diff --git a/src/app/modules/admin/member/partner/partner.module.ts b/src/app/modules/admin/member/partner/partner.module.ts index aee0b43..4b31950 100644 --- a/src/app/modules/admin/member/partner/partner.module.ts +++ b/src/app/modules/admin/member/partner/partner.module.ts @@ -21,11 +21,12 @@ import { TranslocoModule } from '@ngneat/transloco'; import { SharedModule } from 'app/shared/shared.module'; import { COMPONENTS } from './components'; +import { COMPOSE } from './compose'; import { partnerRoutes } from './partner.routing'; @NgModule({ - declarations: [COMPONENTS], + declarations: [COMPONENTS, COMPOSE], imports: [ TranslocoModule, SharedModule,