From 0f9d7148d9bcc6d97e86c7fdd94630c54f41a710 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 17 Jul 2022 05:00:07 +0000 Subject: [PATCH 1/5] bug fix --- src/app/mock-api/apps/board/notice/api.ts | 2 +- src/app/mock-api/apps/board/notice/data.ts | 13 +- .../notice/components/list.component.html | 61 ++++-- .../board/notice/components/list.component.ts | 2 +- .../components/registration.component.html | 2 - .../components/registration.component.ts | 183 ------------------ .../notice/components/view.component.html | 2 +- .../admin/board/notice/models/notice.ts | 1 + .../board/notice/resolvers/notice.resolver.ts | 4 +- .../{service => services}/notice.service.ts | 10 +- .../popup/components/list.component.html | 12 +- .../popup/components/view.component.html | 2 +- 12 files changed, 68 insertions(+), 226 deletions(-) delete mode 100644 src/app/modules/admin/board/notice/components/registration.component.html delete mode 100644 src/app/modules/admin/board/notice/components/registration.component.ts rename src/app/modules/admin/board/notice/{service => services}/notice.service.ts (92%) diff --git a/src/app/mock-api/apps/board/notice/api.ts b/src/app/mock-api/apps/board/notice/api.ts index af86cb9..5974981 100644 --- a/src/app/mock-api/apps/board/notice/api.ts +++ b/src/app/mock-api/apps/board/notice/api.ts @@ -185,7 +185,7 @@ export class BoardNoticeMockApi { // Update the notice notices[index] = assign({}, notices[index], notice); - // Store the updated notice + // Store the updated Notice updatedNotice = notices[index]; } }); diff --git a/src/app/mock-api/apps/board/notice/data.ts b/src/app/mock-api/apps/board/notice/data.ts index 599fae5..f416a0e 100644 --- a/src/app/mock-api/apps/board/notice/data.ts +++ b/src/app/mock-api/apps/board/notice/data.ts @@ -5,19 +5,10 @@ export const notices = [ idx: 80, site: '', title: - '**게임멈춤,튕기는 현상및 계좌문의시 확인및 입금전,후 확인사항 대한 공지사항**', + '게임멈춤,튕기는 현상및 계좌문의시 확인및 입금전후 확인사항 대한 공지사항', writer: '관리자', writeDate: '2021-10-25 02:25', - views: 135, - state: '노출', - }, - { - idx: 99, - site: 'All', - title: '-계좌등록안내-', - writer: '관리자', - writeDate: '2021-06-08 00:46', - views: 7, + views: 136, state: '노출', }, ]; diff --git a/src/app/modules/admin/board/notice/components/list.component.html b/src/app/modules/admin/board/notice/components/list.component.html index d857c70..d6f8e43 100644 --- a/src/app/modules/admin/board/notice/components/list.component.html +++ b/src/app/modules/admin/board/notice/components/list.component.html @@ -36,6 +36,43 @@ --> + 작성자 @@ -139,7 +176,7 @@ > - - - - - - - - diff --git a/src/app/modules/admin/board/notice/components/list.component.ts b/src/app/modules/admin/board/notice/components/list.component.ts index 017ac03..812f993 100644 --- a/src/app/modules/admin/board/notice/components/list.component.ts +++ b/src/app/modules/admin/board/notice/components/list.component.ts @@ -32,7 +32,7 @@ import { FuseConfirmationService } from '@fuse/services/confirmation'; import { User } from '../../../member/user/models/user'; import { Notice } from '../models/notice'; import { NoticePagination } from '../models/notice-pagination'; -import { NoticeService } from '../service/notice.service'; +import { NoticeService } from '../services/notice.service'; import { Router } from '@angular/router'; @Component({ diff --git a/src/app/modules/admin/board/notice/components/registration.component.html b/src/app/modules/admin/board/notice/components/registration.component.html deleted file mode 100644 index e13f190..0000000 --- a/src/app/modules/admin/board/notice/components/registration.component.html +++ /dev/null @@ -1,2 +0,0 @@ - -
공지사항 등록
diff --git a/src/app/modules/admin/board/notice/components/registration.component.ts b/src/app/modules/admin/board/notice/components/registration.component.ts deleted file mode 100644 index a6c0c0c..0000000 --- a/src/app/modules/admin/board/notice/components/registration.component.ts +++ /dev/null @@ -1,183 +0,0 @@ -import { - AfterViewInit, - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - OnDestroy, - OnInit, - ViewChild, - ViewEncapsulation, -} from '@angular/core'; -import { - FormBuilder, - FormControl, - FormGroup, - Validators, -} from '@angular/forms'; -import { MatCheckboxChange } from '@angular/material/checkbox'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatSort } from '@angular/material/sort'; -import { - debounceTime, - map, - merge, - Observable, - Subject, - switchMap, - takeUntil, -} from 'rxjs'; -import { fuseAnimations } from '@fuse/animations'; -import { FuseConfirmationService } from '@fuse/services/confirmation'; - -import { User } from 'app/modules/admin/member/user/models/user'; -import { UserService } from 'app/modules/admin/member/user/services/user.service'; - -@Component({ - selector: 'notice-registration', - templateUrl: './registration.component.html', - styles: [ - /* language=SCSS */ - ` - .inventory-grid { - grid-template-columns: 48px auto 40px; - - @screen sm { - grid-template-columns: 48px auto 112px 72px; - } - - @screen md { - grid-template-columns: 48px 112px auto 112px 72px; - } - - @screen lg { - grid-template-columns: 48px 112px auto 112px 96px 96px 72px; - } - } - `, - ], - encapsulation: ViewEncapsulation.None, - changeDetection: ChangeDetectionStrategy.OnPush, - animations: fuseAnimations, -}) -export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild(MatPaginator) private _paginator!: MatPaginator; - @ViewChild(MatSort) private _sort!: MatSort; - - isLoading = false; - searchInputControl = new FormControl(); - selectedProductForm!: FormGroup; - selectedUser?: User; - - private _unsubscribeAll: Subject = new Subject(); - - /** - * Constructor - */ - constructor( - private _changeDetectorRef: ChangeDetectorRef, - private _fuseConfirmationService: FuseConfirmationService, - private _formBuilder: FormBuilder, - private _userService: UserService - ) {} - - // ----------------------------------------------------------------------------------------------------- - // @ Lifecycle hooks - // ----------------------------------------------------------------------------------------------------- - - /** - * On init - */ - ngOnInit(): void { - this.selectedProductForm = this._formBuilder.group({ - id: [''], - signinId: [{ value: '', disabled: true }], - signinPw: [{ value: '' }], - exchangePw: [''], - description: [''], - tags: [[]], - nickname: [{ value: '', disabled: true }], - ownCash: [''], - phoneNumber: [''], - level: [''], - status: [''], - isExcahngeMoney: [''], - bankname: [''], - accountNumber: [''], - accountHolder: [''], - comp: [''], - coupon: [''], - recommender: [{ value: '', disabled: true }], - changeSite: [''], - recommendCount: [''], - hodingGameMoney: [{ value: '0', disabled: true }], - memo: [''], - bacaraRate: [], - rulletRate: [], - dragonRate: [], - etcRate: [], - slotRate: [], - casinoRusingRate: [], - slotRusingRate: [], - }); - - // Get the User - this._userService.user$ - .pipe(takeUntil(this._unsubscribeAll)) - .subscribe((user: User | undefined) => { - if (!user) { - return; - } - this.selectedUser = user; - - this.selectedProductForm.patchValue(user); - // Mark for check - this._changeDetectorRef.markForCheck(); - }); - - /* this.user$ = this._userService.user$; */ - } - - /** - * After view init - */ - ngAfterViewInit(): void {} - - /** - * On destroy - */ - ngOnDestroy(): void { - // Unsubscribe from all subscriptions - this._unsubscribeAll.next(null); - this._unsubscribeAll.complete(); - } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Create product - */ - __createProduct(): void {} - - /** - * Toggle product details - * - * @param productId - */ - __toggleDetails(productId: string): void {} - - /** - * Track by function for ngFor loops - * - * @param index - * @param item - */ - __trackByFn(index: number, item: any): any { - return item.id || index; - } -} diff --git a/src/app/modules/admin/board/notice/components/view.component.html b/src/app/modules/admin/board/notice/components/view.component.html index 4e4f148..07b309a 100644 --- a/src/app/modules/admin/board/notice/components/view.component.html +++ b/src/app/modules/admin/board/notice/components/view.component.html @@ -1,2 +1,2 @@ -
팝업-상세page
+
고객센터-상세page
diff --git a/src/app/modules/admin/board/notice/models/notice.ts b/src/app/modules/admin/board/notice/models/notice.ts index c405749..c322533 100644 --- a/src/app/modules/admin/board/notice/models/notice.ts +++ b/src/app/modules/admin/board/notice/models/notice.ts @@ -1,4 +1,5 @@ export interface Notice { + id?: string; idx?: number; site?: string; title?: string; diff --git a/src/app/modules/admin/board/notice/resolvers/notice.resolver.ts b/src/app/modules/admin/board/notice/resolvers/notice.resolver.ts index 02c519f..fb5b3b5 100644 --- a/src/app/modules/admin/board/notice/resolvers/notice.resolver.ts +++ b/src/app/modules/admin/board/notice/resolvers/notice.resolver.ts @@ -9,7 +9,7 @@ import { catchError, Observable, throwError } from 'rxjs'; import { Notice } from '../models/notice'; import { NoticePagination } from '../models/notice-pagination'; -import { NoticeService } from '../service/notice.service'; +import { NoticeService } from '../services/notice.service'; @Injectable({ providedIn: 'root', @@ -34,7 +34,7 @@ export class NoticeResolver implements Resolve { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Observable { - return this._noticeService.getNoticeById(route.paramMap.get('title')).pipe( + return this._noticeService.getNoticeById(route.paramMap.get('id')).pipe( // Error here means the requested product is not available catchError((error) => { // Log the error diff --git a/src/app/modules/admin/board/notice/service/notice.service.ts b/src/app/modules/admin/board/notice/services/notice.service.ts similarity index 92% rename from src/app/modules/admin/board/notice/service/notice.service.ts rename to src/app/modules/admin/board/notice/services/notice.service.ts index b873a5a..a8a52a8 100644 --- a/src/app/modules/admin/board/notice/service/notice.service.ts +++ b/src/app/modules/admin/board/notice/services/notice.service.ts @@ -104,14 +104,12 @@ export class NoticeService { /** * Get product by id */ - getNoticeById(title: string | null): Observable { + getNoticeById(id: string | null): Observable { return this.__notices.pipe( take(1), map((notices) => { // Find the product - const notice = - notices?.find((item) => !!item && !!item.title === !!title) || - undefined; + const notice = notices?.find((item) => item.id === id) || undefined; // Update the product this.__notice.next(notice); @@ -121,9 +119,7 @@ export class NoticeService { }), switchMap((product) => { if (!product) { - return throwError( - 'Could not found product with id of ' + title + '!' - ); + return throwError('Could not found product with id of ' + id + '!'); } return of(product); diff --git a/src/app/modules/admin/board/popup/components/list.component.html b/src/app/modules/admin/board/popup/components/list.component.html index 68c5687..af2d2b2 100644 --- a/src/app/modules/admin/board/popup/components/list.component.html +++ b/src/app/modules/admin/board/popup/components/list.component.html @@ -15,19 +15,19 @@
-
공지사항-상세page
+
팝업-상세page
From d377fc985fb6dc52a7d212b1348ebc4abdac03fd Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 17 Jul 2022 05:07:02 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/member/partner/components/branch-list.component.html | 1 + .../admin/member/partner/components/division-list.component.html | 1 + .../admin/member/partner/components/office-list.component.html | 1 + .../admin/member/partner/components/store-list.component.html | 1 + 4 files changed, 4 insertions(+) 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 f1d0e0d..8f5304a 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 @@ -331,6 +331,7 @@ [color]="'primary'" (click)="__onClickRegist($event)" > + 부본등록 {{ partnerBranch.note }}
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 f416f4a..9e1dba8 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 @@ -333,6 +333,7 @@ [color]="'primary'" (click)="__onClickRegist($event)" > + 총판등록 {{ partnerDivision.note }} 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 02e9cde..83a451b 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 @@ -331,6 +331,7 @@ [color]="'primary'" (click)="__onClickRegist($event)" > + 매장등록 {{ partnerOffice.note }} 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 d0d62be..7d076f0 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 @@ -328,6 +328,7 @@ [color]="'primary'" (click)="__onClickRegist($event)" > + 회원등록 {{ partnerStore.note }} From d937a674534cce92137168dfce08dacd2eecc963 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 17 Jul 2022 05:45:46 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20page=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/board/popup/data.ts | 34 +- .../popup/components/list.component.html | 316 ++++++------------ .../modules/admin/board/popup/models/popup.ts | 34 +- 3 files changed, 123 insertions(+), 261 deletions(-) diff --git a/src/app/mock-api/apps/board/popup/data.ts b/src/app/mock-api/apps/board/popup/data.ts index 2945bfb..0151900 100644 --- a/src/app/mock-api/apps/board/popup/data.ts +++ b/src/app/mock-api/apps/board/popup/data.ts @@ -3,31 +3,13 @@ export const popups = [ { id: 'on00', - totalPartnerCount: '5', - totalHoldingMoney: 303675, - totalComp: 108933, - total: 412608, - branchCount: 1, - divisionCount: 1, - officeCount: 1, - storeCount: 1, - memberCount: 1, - nickname: 'on00', - accountHolder: '11', - phoneNumber: '010-1111-1111', - calculateType: '롤링', - ownCash: 50000, - ownComp: 1711, - ownCoupon: 50000, - gameMoney: 0, - todayComp: 0, - totalDeposit: 0, - totalWithdraw: 0, - balance: 0, - registDate: '2022-06-12 15:38', - finalSigninDate: '', - ip: '', - state: '정상', - note: '', + index: 10, + title: '악성배팅 제제 안내', + widthSize: 500, + verticalSize: 830, + topMargin: 100, + leftMargin: 100, + site: 'all', + useOrNot: 'N', }, ]; diff --git a/src/app/modules/admin/board/popup/components/list.component.html b/src/app/modules/admin/board/popup/components/list.component.html index af2d2b2..8787ded 100644 --- a/src/app/modules/admin/board/popup/components/list.component.html +++ b/src/app/modules/admin/board/popup/components/list.component.html @@ -36,7 +36,7 @@ --> - + - - + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+
- There are no popups! + + +
+ +
+ + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + +
+ There are no popups! +
+
- +
diff --git a/src/app/modules/admin/board/popup/models/popup.ts b/src/app/modules/admin/board/popup/models/popup.ts index 533f1bf..d49a9b3 100644 --- a/src/app/modules/admin/board/popup/models/popup.ts +++ b/src/app/modules/admin/board/popup/models/popup.ts @@ -1,29 +1,11 @@ export interface Popup { id?: string; - totalPartnerCount?: number; - totalHoldingMoney?: number; - totalComp?: number; - total?: number; - branchCount?: number; - divisionCount?: number; - officeCount?: number; - storeCount?: number; - memberCount?: number; - nickname?: string; - accountHolder?: string; - phoneNumber?: string; - calculateType?: string; - ownCash?: number; - ownComp?: number; - ownCoupon?: number; - gameMoney?: number; - todayComp?: number; - totalDeposit?: number; - totalWithdraw?: number; - balance?: number; - registDate?: string; - finalSigninDate?: string; - ip?: string; - state?: string; - note?: string; + index?: number; + title?: string; + widthSize?: number; + verticalSize?: number; + topMargin?: number; + leftMargin?: number; + Site?: string; + useOrNot?: string; } From 5a8b5939dbe3510fdfecacdff71ad66bac0ddf32 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 17 Jul 2022 05:49:18 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20page=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/notice/components/list.component.html | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/app/modules/admin/board/notice/components/list.component.html b/src/app/modules/admin/board/notice/components/list.component.html index d6f8e43..753facc 100644 --- a/src/app/modules/admin/board/notice/components/list.component.html +++ b/src/app/modules/admin/board/notice/components/list.component.html @@ -206,21 +206,12 @@ - - - - - - + + + Date: Sun, 17 Jul 2022 06:48:50 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=EC=AA=BD=EC=A7=80=ED=95=A8=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20page=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/board/message/data.ts | 34 +--- src/app/mock-api/apps/board/popup/data.ts | 1 - .../message/components/list.component.html | 184 ++++-------------- .../admin/board/message/models/message.ts | 31 +-- 4 files changed, 53 insertions(+), 197 deletions(-) diff --git a/src/app/mock-api/apps/board/message/data.ts b/src/app/mock-api/apps/board/message/data.ts index 3b42aaa..6cfec8f 100644 --- a/src/app/mock-api/apps/board/message/data.ts +++ b/src/app/mock-api/apps/board/message/data.ts @@ -2,32 +2,12 @@ export const messages = [ { - id: 'on00', - totalPartnerCount: '5', - totalHoldingMoney: 303675, - totalComp: 108933, - total: 412608, - branchCount: 1, - divisionCount: 1, - officeCount: 1, - storeCount: 1, - memberCount: 1, - nickname: 'on00', - accountHolder: '11', - phoneNumber: '010-1111-1111', - calculateType: '롤링', - ownCash: 50000, - ownComp: 1711, - ownCoupon: 50000, - gameMoney: 0, - todayComp: 0, - totalDeposit: 0, - totalWithdraw: 0, - balance: 0, - registDate: '2022-06-12 15:38', - finalSigninDate: '', - ip: '', - state: '정상', - note: '', + title: '입금계좌 고객문의 부탁드립니다', + writer: 'aa100에게 관리자 쪽지(답변)', + site: '', + views: '1', + writeDate: '2022-06-12 20:52', + answer: '완료', + state: '사용자삭제', }, ]; diff --git a/src/app/mock-api/apps/board/popup/data.ts b/src/app/mock-api/apps/board/popup/data.ts index 0151900..9d88864 100644 --- a/src/app/mock-api/apps/board/popup/data.ts +++ b/src/app/mock-api/apps/board/popup/data.ts @@ -2,7 +2,6 @@ export const popups = [ { - id: 'on00', index: 10, title: '악성배팅 제제 안내', widthSize: 500, diff --git a/src/app/modules/admin/board/message/components/list.component.html b/src/app/modules/admin/board/message/components/list.component.html index d9c77c4..000857b 100644 --- a/src/app/modules/admin/board/message/components/list.component.html +++ b/src/app/modules/admin/board/message/components/list.component.html @@ -36,7 +36,7 @@ --> - + - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 + + 아이디 + 작성자 + 글제목 + 글내용 + 사이트명 검색하기 - - @@ -161,25 +160,15 @@ matSortDisableClear > - - - - - - - - - - - - - - - - + + + + + + + + - - @@ -192,143 +181,50 @@ - + - + + + + + - + - - - - - - - + - + - + - - - - - - - - - - - - - - - + - - - - +