From 7ea5effd46f6ca39379bb77b667143c2d354223a Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Thu, 14 Jul 2022 07:20:33 +0000 Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=20page=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.routing.ts | 7 + .../mock-api/apps/board/notice-oneline/api.ts | 12 +- src/app/mock-api/apps/board/notice/api.ts | 12 +- src/app/mock-api/apps/board/popup/api.ts | 215 +++++++++++ src/app/mock-api/apps/board/popup/data.ts | 33 ++ src/app/mock-api/common/navigation/data.ts | 11 +- src/app/mock-api/index.ts | 10 +- .../services/notice-oneline.service.ts | 4 +- .../board/notice/services/notice.service.ts | 24 +- .../admin/board/popup/components/index.ts | 3 + .../popup/components/list.component.html | 353 ++++++++++++++++++ .../board/popup/components/list.component.ts | 198 ++++++++++ .../board/popup/models/popup-pagination.ts | 8 + .../modules/admin/board/popup/models/popup.ts | 29 ++ .../modules/admin/board/popup/popup.module.ts | 50 +++ .../admin/board/popup/popup.routing.ts | 24 ++ .../board/popup/resolvers/popup.resolver.ts | 84 +++++ .../board/popup/services/popup.service.ts | 151 ++++++++ src/assets/i18n/en.json | 3 +- src/assets/i18n/ko.json | 3 +- 20 files changed, 1199 insertions(+), 35 deletions(-) create mode 100644 src/app/mock-api/apps/board/popup/api.ts create mode 100644 src/app/mock-api/apps/board/popup/data.ts create mode 100644 src/app/modules/admin/board/popup/components/index.ts create mode 100644 src/app/modules/admin/board/popup/components/list.component.html create mode 100644 src/app/modules/admin/board/popup/components/list.component.ts create mode 100644 src/app/modules/admin/board/popup/models/popup-pagination.ts create mode 100644 src/app/modules/admin/board/popup/models/popup.ts create mode 100644 src/app/modules/admin/board/popup/popup.module.ts create mode 100644 src/app/modules/admin/board/popup/popup.routing.ts create mode 100644 src/app/modules/admin/board/popup/resolvers/popup.resolver.ts create mode 100644 src/app/modules/admin/board/popup/services/popup.service.ts diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index bc27dcf..ca868c3 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -462,6 +462,13 @@ export const appRoutes: Route[] = [ 'app/modules/admin/board/notice-oneline/notice-oneline.module' ).then((m: any) => m.NoticeOnelineModule), }, + { + path: 'popup', + loadChildren: () => + import('app/modules/admin/board/popup/popup.module').then( + (m: any) => m.PopupModule + ), + }, ], }, ], diff --git a/src/app/mock-api/apps/board/notice-oneline/api.ts b/src/app/mock-api/apps/board/notice-oneline/api.ts index 63e389c..af9ed95 100644 --- a/src/app/mock-api/apps/board/notice-oneline/api.ts +++ b/src/app/mock-api/apps/board/notice-oneline/api.ts @@ -6,7 +6,7 @@ import { noticeOnelines as noticeOnelinesData } from './data'; @Injectable({ providedIn: 'root', }) -export class ReportNoticeOnelineMockApi { +export class BoardNoticeOnelineMockApi { private _noticeOnelines: any[] = noticeOnelinesData; /** @@ -29,7 +29,7 @@ export class ReportNoticeOnelineMockApi { // @ NoticeOnelines - GET // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onGet('api/apps/report/notice-oneline/notice-onelines', 300) + .onGet('api/apps/board/notice-oneline/notice-onelines', 300) .reply(({ request }) => { // Get available queries const search = request.params.get('search'); @@ -115,7 +115,7 @@ export class ReportNoticeOnelineMockApi { // @ NoticeOneline - GET // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onGet('api/apps/report/notice-oneline/notice-oneline') + .onGet('api/apps/board/notice-oneline/notice-oneline') .reply(({ request }) => { // Get the id from the params const id = request.params.get('id'); @@ -136,7 +136,7 @@ export class ReportNoticeOnelineMockApi { // @ NoticeOneline - POST // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onPost('api/apps/report/notice-oneline/notice-oneline') + .onPost('api/apps/board/notice-oneline/notice-oneline') .reply(() => { // Generate a new noticeOneline const newNoticeOneline = { @@ -172,7 +172,7 @@ export class ReportNoticeOnelineMockApi { // @ NoticeOneline - PATCH // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onPatch('api/apps/report/notice-oneline/notice-oneline') + .onPatch('api/apps/board/notice-oneline/notice-oneline') .reply(({ request }) => { // Get the id and noticeOneline const id = request.body.id; @@ -204,7 +204,7 @@ export class ReportNoticeOnelineMockApi { // @ NoticeOneline - DELETE // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onDelete('api/apps/report/notice-oneline/notice-oneline') + .onDelete('api/apps/board/notice-oneline/notice-oneline') .reply(({ request }) => { // Get the id const id = request.params.get('id'); diff --git a/src/app/mock-api/apps/board/notice/api.ts b/src/app/mock-api/apps/board/notice/api.ts index e81d041..af86cb9 100644 --- a/src/app/mock-api/apps/board/notice/api.ts +++ b/src/app/mock-api/apps/board/notice/api.ts @@ -6,7 +6,7 @@ import { notices as noticesData } from './data'; @Injectable({ providedIn: 'root', }) -export class ReportNoticeMockApi { +export class BoardNoticeMockApi { private _notices: any[] = noticesData; /** @@ -29,7 +29,7 @@ export class ReportNoticeMockApi { // @ Notices - GET // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onGet('api/apps/report/notice/notices', 300) + .onGet('api/apps/board/notice/notices', 300) .reply(({ request }) => { // Get available queries const search = request.params.get('search'); @@ -115,7 +115,7 @@ export class ReportNoticeMockApi { // @ Notice - GET // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onGet('api/apps/report/notice/notice') + .onGet('api/apps/board/notice/notice') .reply(({ request }) => { // Get the id from the params const id = request.params.get('id'); @@ -134,7 +134,7 @@ export class ReportNoticeMockApi { // @ Notice - POST // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onPost('api/apps/report/notice/notice') + .onPost('api/apps/board/notice/notice') .reply(() => { // Generate a new notice const newNotice = { @@ -170,7 +170,7 @@ export class ReportNoticeMockApi { // @ Notice - PATCH // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onPatch('api/apps/report/notice/notice') + .onPatch('api/apps/board/notice/notice') .reply(({ request }) => { // Get the id and notice const id = request.body.id; @@ -198,7 +198,7 @@ export class ReportNoticeMockApi { // @ Notice - DELETE // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onDelete('api/apps/report/notice/notice') + .onDelete('api/apps/board/notice/notice') .reply(({ request }) => { // Get the id const id = request.params.get('id'); diff --git a/src/app/mock-api/apps/board/popup/api.ts b/src/app/mock-api/apps/board/popup/api.ts new file mode 100644 index 0000000..2cdc93a --- /dev/null +++ b/src/app/mock-api/apps/board/popup/api.ts @@ -0,0 +1,215 @@ +import { Injectable } from '@angular/core'; +import { assign, cloneDeep } from 'lodash-es'; +import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; +import { popups as popupsData } from './data'; + +@Injectable({ + providedIn: 'root', +}) +export class BoardPopupMockApi { + private _popups: any[] = popupsData; + + /** + * Constructor + */ + constructor(private _fuseMockApiService: FuseMockApiService) { + // Register Mock API handlers + this.registerHandlers(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Register Mock API handlers + */ + registerHandlers(): void { + // ----------------------------------------------------------------------------------------------------- + // @ Popups - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/board/popup/popups', 300) + .reply(({ request }) => { + // Get available queries + const search = request.params.get('search'); + const sort = request.params.get('sort') || 'name'; + const order = request.params.get('order') || 'asc'; + const page = parseInt(request.params.get('page') ?? '1', 10); + const size = parseInt(request.params.get('size') ?? '10', 10); + + // Clone the popups + let popups: any[] | null = cloneDeep(this._popups); + + // Sort the popups + if (sort === 'sku' || sort === 'name' || sort === 'active') { + popups.sort((a, b) => { + const fieldA = a[sort].toString().toUpperCase(); + const fieldB = b[sort].toString().toUpperCase(); + return order === 'asc' + ? fieldA.localeCompare(fieldB) + : fieldB.localeCompare(fieldA); + }); + } else { + popups.sort((a, b) => + order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] + ); + } + + // If search exists... + if (search) { + // Filter the popups + popups = popups.filter( + (contact: any) => + contact.name && + contact.name.toLowerCase().includes(search.toLowerCase()) + ); + } + + // Paginate - Start + const popupsLength = popups.length; + + // Calculate pagination details + const begin = page * size; + const end = Math.min(size * (page + 1), popupsLength); + const lastPage = Math.max(Math.ceil(popupsLength / size), 1); + + // Prepare the pagination object + let pagination = {}; + + // If the requested page number is bigger than + // the last possible page number, return null for + // popups but also send the last possible page so + // the app can navigate to there + if (page > lastPage) { + popups = null; + pagination = { + lastPage, + }; + } else { + // Paginate the results by size + popups = popups.slice(begin, end); + + // Prepare the pagination mock-api + pagination = { + length: popupsLength, + size: size, + page: page, + lastPage: lastPage, + startIndex: begin, + endIndex: end - 1, + }; + } + + // Return the response + return [ + 200, + { + popups, + pagination, + }, + ]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Popup - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/board/popup/popup') + .reply(({ request }) => { + // Get the id from the params + const id = request.params.get('id'); + + // Clone the popups + const popups = cloneDeep(this._popups); + + // Find the popup + const popup = popups.find((item: any) => item.id === id); + + // Return the response + return [200, popup]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Popup - POST + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService.onPost('api/apps/board/popup/popup').reply(() => { + // Generate a new popup + const newPopup = { + id: FuseMockApiUtils.guid(), + category: '', + name: 'A New User', + description: '', + tags: [], + sku: '', + barcode: '', + brand: '', + vendor: '', + stock: '', + reserved: '', + cost: '', + basePrice: '', + taxPercent: '', + price: '', + weight: '', + thumbnail: '', + images: [], + active: false, + }; + + // Unshift the new popup + this._popups.unshift(newPopup); + + // Return the response + return [200, newPopup]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Popup - PATCH + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPatch('api/apps/board/popup/popup') + .reply(({ request }) => { + // Get the id and popup + const id = request.body.id; + const popup = cloneDeep(request.body.popup); + + // Prepare the updated popup + let updatedPopup = null; + + // Find the popup and update it + this._popups.forEach((item, index, popups) => { + if (item.id === id) { + // Update the popup + popups[index] = assign({}, popups[index], popup); + + // Store the updated popup + updatedPopup = popups[index]; + } + }); + + // Return the response + return [200, updatedPopup]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Popup - DELETE + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onDelete('api/apps/board/popup/popup') + .reply(({ request }) => { + // Get the id + const id = request.params.get('id'); + + // Find the popup and delete it + this._popups.forEach((item, index) => { + if (item.id === id) { + this._popups.splice(index, 1); + } + }); + + // Return the response + return [200, true]; + }); + } +} diff --git a/src/app/mock-api/apps/board/popup/data.ts b/src/app/mock-api/apps/board/popup/data.ts new file mode 100644 index 0000000..2945bfb --- /dev/null +++ b/src/app/mock-api/apps/board/popup/data.ts @@ -0,0 +1,33 @@ +/* eslint-disable */ + +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: '', + }, +]; diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index 27cf490..3f0f8fd 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -365,19 +365,26 @@ export const defaultNavigation: FuseNavigationItem[] = [ icon: 'heroicons_outline:home', children: [ { - id: 'report.notice', + id: 'board.notice', title: 'Notice', type: 'basic', icon: 'heroicons_outline:academic-cap', link: '/board/notice', }, { - id: 'report.notice-oneline', + id: 'board.notice-oneline', title: 'Notice Oneline', type: 'basic', icon: 'heroicons_outline:academic-cap', link: '/board/notice-oneline', }, + { + id: 'board.popup', + title: 'Popup', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/board/popup', + }, ], }, ]; diff --git a/src/app/mock-api/index.ts b/src/app/mock-api/index.ts index d540eae..0d2a72a 100644 --- a/src/app/mock-api/index.ts +++ b/src/app/mock-api/index.ts @@ -55,8 +55,9 @@ import { ReportSessioninOverlapMockApi } from './apps/report/sessionin-overlap/a import { ReportSessioninAdminMockApi } from './apps/report/sessionin-admin/api'; import { ReportExcelLogMockApi } from './apps/report/excel-log/api'; import { ReportLoosingMockApi } from './apps/report/loosing/api'; -import { ReportNoticeMockApi } from './apps/board/notice/api'; -import { ReportNoticeOnelineMockApi } from './apps/board/notice-oneline/api'; +import { BoardNoticeMockApi } from './apps/board/notice/api'; +import { BoardNoticeOnelineMockApi } from './apps/board/notice-oneline/api'; +import { BoardPopupMockApi } from './apps/board/popup/api'; export const mockApiServices = [ AcademyMockApi, @@ -116,6 +117,7 @@ export const mockApiServices = [ ReportSessioninAdminMockApi, ReportExcelLogMockApi, ReportLoosingMockApi, - ReportNoticeMockApi, - ReportNoticeOnelineMockApi, + BoardNoticeMockApi, + BoardNoticeOnelineMockApi, + BoardPopupMockApi, ]; diff --git a/src/app/modules/admin/board/notice-oneline/services/notice-oneline.service.ts b/src/app/modules/admin/board/notice-oneline/services/notice-oneline.service.ts index a2d09a5..611bfbf 100644 --- a/src/app/modules/admin/board/notice-oneline/services/notice-oneline.service.ts +++ b/src/app/modules/admin/board/notice-oneline/services/notice-oneline.service.ts @@ -88,7 +88,7 @@ export class NoticeOnelineService { .get<{ pagination: NoticeOnelinePagination; noticeOnelines: NoticeOneline[]; - }>('api/apps/report/notice-oneline/notice-onelines', { + }>('api/apps/board/notice-oneline/notice-onelines', { params: { page: '' + page, size: '' + size, @@ -140,7 +140,7 @@ export class NoticeOnelineService { take(1), switchMap((noticeOnelines) => this._httpClient - .post('api/apps/report/notice-oneline/product', {}) + .post('api/apps/board/notice-oneline/product', {}) .pipe( map((newNoticeOneline) => { // Update the noticeOnelines with the new product diff --git a/src/app/modules/admin/board/notice/services/notice.service.ts b/src/app/modules/admin/board/notice/services/notice.service.ts index 51f7424..a8a52a8 100644 --- a/src/app/modules/admin/board/notice/services/notice.service.ts +++ b/src/app/modules/admin/board/notice/services/notice.service.ts @@ -84,7 +84,7 @@ export class NoticeService { .get<{ pagination: NoticePagination; notices: Notice[]; - }>('api/apps/report/notice/notices', { + }>('api/apps/board/notice/notices', { params: { page: '' + page, size: '' + size, @@ -134,19 +134,17 @@ export class NoticeService { return this.notices$.pipe( take(1), switchMap((notices) => - this._httpClient - .post('api/apps/report/notice/product', {}) - .pipe( - map((newNotice) => { - // Update the notices with the new product - if (!!notices) { - this.__notices.next([newNotice, ...notices]); - } + this._httpClient.post('api/apps/board/notice/product', {}).pipe( + map((newNotice) => { + // Update the notices with the new product + if (!!notices) { + this.__notices.next([newNotice, ...notices]); + } - // Return the new product - return newNotice; - }) - ) + // Return the new product + return newNotice; + }) + ) ) ); } diff --git a/src/app/modules/admin/board/popup/components/index.ts b/src/app/modules/admin/board/popup/components/index.ts new file mode 100644 index 0000000..04759eb --- /dev/null +++ b/src/app/modules/admin/board/popup/components/index.ts @@ -0,0 +1,3 @@ +import { ListComponent } from './list.component'; + +export const COMPONENTS = [ListComponent]; diff --git a/src/app/modules/admin/board/popup/components/list.component.html b/src/app/modules/admin/board/popup/components/list.component.html new file mode 100644 index 0000000..68c5687 --- /dev/null +++ b/src/app/modules/admin/board/popup/components/list.component.html @@ -0,0 +1,353 @@ +
+ +
+ +
+ +
+ +
팝업
+ +
+ + + + + + + 40 + 60 + 80 + 100 + + + + + LV.1 + LV.2 + LV.3 + LV.4 + + + + + 정상 + 대기 + 탈퇴 + 휴면 + 블랙 + 정지 + + + + + 카지노제한 + 슬롯제한 + + + + + 계좌입금 + + + + + 카지노콤프 + 슬롯콤프 + 배팅콤프 + 첫충콤프 + + + + + + + + + + + + +
+
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + +
+ There are no popups! +
+ +
+
+
diff --git a/src/app/modules/admin/board/popup/components/list.component.ts b/src/app/modules/admin/board/popup/components/list.component.ts new file mode 100644 index 0000000..9effff6 --- /dev/null +++ b/src/app/modules/admin/board/popup/components/list.component.ts @@ -0,0 +1,198 @@ +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 '../../../member/user/models/user'; +import { Popup } from '../models/popup'; +import { PopupPagination } from '../models/popup-pagination'; +import { PopupService } from '../services/popup.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'popup-list', + templateUrl: './list.component.html', + styles: [ + /* language=SCSS */ + ` + .inventory-grid { + grid-template-columns: 60px auto 40px; + + @screen sm { + grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + } + + @screen md { + grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + } + + @screen lg { + grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; + } + } + `, + ], + encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: fuseAnimations, +}) +export class ListComponent implements OnInit, AfterViewInit, OnDestroy { + @ViewChild(MatPaginator) private _paginator!: MatPaginator; + @ViewChild(MatSort) private _sort!: MatSort; + + popups$!: Observable; + users$!: Observable; + + isLoading = false; + searchInputControl = new FormControl(); + selectedPopup?: Popup; + pagination?: PopupPagination; + + private _unsubscribeAll: Subject = new Subject(); + + /** + * Constructor + */ + constructor( + private _changeDetectorRef: ChangeDetectorRef, + private _fuseConfirmationService: FuseConfirmationService, + private _formBuilder: FormBuilder, + private _popupService: PopupService, + private router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Get the pagination + this._popupService.pagination$ + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe((pagination: PopupPagination | undefined) => { + // Update the pagination + this.pagination = pagination; + + // Mark for check + this._changeDetectorRef.markForCheck(); + }); + + // Get the products + this.popups$ = this._popupService.popups$; + } + + /** + * After view init + */ + ngAfterViewInit(): void { + if (this._sort && this._paginator) { + // Set the initial sort + this._sort.sort({ + id: 'name', + start: 'asc', + disableClear: true, + }); + + // Mark for check + this._changeDetectorRef.markForCheck(); + + // If the popup changes the sort order... + this._sort.sortChange + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + // Reset back to the first page + this._paginator.pageIndex = 0; + }); + + // Get products if sort or page changes + merge(this._sort.sortChange, this._paginator.page) + .pipe( + switchMap(() => { + this.isLoading = true; + return this._popupService.getPopups( + this._paginator.pageIndex, + this._paginator.pageSize, + this._sort.active, + this._sort.direction + ); + }), + map(() => { + this.isLoading = false; + }) + ) + .subscribe(); + } + } + + /** + * On destroy + */ + ngOnDestroy(): void { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(null); + this._unsubscribeAll.complete(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + viewUserDetail(id: string): void { + let url: string = 'member/user/' + id; + this.router.navigateByUrl(url); + } + // ----------------------------------------------------------------------------------------------------- + // @ 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/popup/models/popup-pagination.ts b/src/app/modules/admin/board/popup/models/popup-pagination.ts new file mode 100644 index 0000000..64182c5 --- /dev/null +++ b/src/app/modules/admin/board/popup/models/popup-pagination.ts @@ -0,0 +1,8 @@ +export interface PopupPagination { + length: number; + size: number; + page: number; + lastPage: number; + startIndex: number; + endIndex: number; +} diff --git a/src/app/modules/admin/board/popup/models/popup.ts b/src/app/modules/admin/board/popup/models/popup.ts new file mode 100644 index 0000000..533f1bf --- /dev/null +++ b/src/app/modules/admin/board/popup/models/popup.ts @@ -0,0 +1,29 @@ +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; +} diff --git a/src/app/modules/admin/board/popup/popup.module.ts b/src/app/modules/admin/board/popup/popup.module.ts new file mode 100644 index 0000000..0691ccc --- /dev/null +++ b/src/app/modules/admin/board/popup/popup.module.ts @@ -0,0 +1,50 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { MatButtonModule } from '@angular/material/button'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatRippleModule } from '@angular/material/core'; +import { MatSortModule } from '@angular/material/sort'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatGridListModule } from '@angular/material/grid-list'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatCheckboxModule } from '@angular/material/checkbox'; + +import { TranslocoModule } from '@ngneat/transloco'; + +import { SharedModule } from 'app/shared/shared.module'; + +import { COMPONENTS } from './components'; + +import { popupRoutes } from './popup.routing'; + +@NgModule({ + declarations: [COMPONENTS], + imports: [ + TranslocoModule, + SharedModule, + RouterModule.forChild(popupRoutes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatPaginatorModule, + MatProgressBarModule, + MatRippleModule, + MatSortModule, + MatSelectModule, + MatTooltipModule, + MatGridListModule, + MatSlideToggleModule, + MatRadioModule, + MatCheckboxModule, + ], +}) +export class PopupModule {} diff --git a/src/app/modules/admin/board/popup/popup.routing.ts b/src/app/modules/admin/board/popup/popup.routing.ts new file mode 100644 index 0000000..4a53e31 --- /dev/null +++ b/src/app/modules/admin/board/popup/popup.routing.ts @@ -0,0 +1,24 @@ +import { Route } from '@angular/router'; + +import { ListComponent } from './components/list.component'; +import { ViewComponent } from '../../member/user/components/view.component'; + +import { PopupsResolver } from './resolvers/popup.resolver'; +import { UserResolver } from '../../member/user/resolvers/user.resolver'; + +export const popupRoutes: Route[] = [ + { + path: '', + component: ListComponent, + resolve: { + popups: PopupsResolver, + }, + }, + { + path: ':id', + component: ViewComponent, + resolve: { + users: UserResolver, + }, + }, +]; diff --git a/src/app/modules/admin/board/popup/resolvers/popup.resolver.ts b/src/app/modules/admin/board/popup/resolvers/popup.resolver.ts new file mode 100644 index 0000000..ebd8222 --- /dev/null +++ b/src/app/modules/admin/board/popup/resolvers/popup.resolver.ts @@ -0,0 +1,84 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { catchError, Observable, throwError } from 'rxjs'; + +import { Popup } from '../models/popup'; +import { PopupPagination } from '../models/popup-pagination'; +import { PopupService } from '../services/popup.service'; + +@Injectable({ + providedIn: 'root', +}) +export class PopupResolver implements Resolve { + /** + * Constructor + */ + constructor(private _popupService: PopupService, private _router: Router) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + return this._popupService.getPopupById(route.paramMap.get('id')).pipe( + // Error here means the requested product is not available + catchError((error) => { + // Log the error + console.error(error); + + // Get the parent url + const parentUrl = state.url.split('/').slice(0, -1).join('/'); + + // Navigate to there + this._router.navigateByUrl(parentUrl); + + // Throw an error + return throwError(error); + }) + ); + } +} + +@Injectable({ + providedIn: 'root', +}) +export class PopupsResolver implements Resolve { + /** + * Constructor + */ + constructor(private _popupService: PopupService) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable<{ + pagination: PopupPagination; + popups: Popup[]; + }> { + return this._popupService.getPopups(); + } +} diff --git a/src/app/modules/admin/board/popup/services/popup.service.ts b/src/app/modules/admin/board/popup/services/popup.service.ts new file mode 100644 index 0000000..b228337 --- /dev/null +++ b/src/app/modules/admin/board/popup/services/popup.service.ts @@ -0,0 +1,151 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { + BehaviorSubject, + filter, + map, + Observable, + of, + switchMap, + take, + tap, + throwError, +} from 'rxjs'; + +import { Popup } from '../models/popup'; +import { PopupPagination } from '../models/popup-pagination'; + +@Injectable({ + providedIn: 'root', +}) +export class PopupService { + // Private + private __pagination = new BehaviorSubject( + undefined + ); + private __popup = new BehaviorSubject(undefined); + private __popups = new BehaviorSubject(undefined); + + /** + * Constructor + */ + constructor(private _httpClient: HttpClient) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Getter for pagination + */ + get pagination$(): Observable { + return this.__pagination.asObservable(); + } + + /** + * Getter for popup + */ + get popup$(): Observable { + return this.__popup.asObservable(); + } + + /** + * Getter for popups + */ + get popups$(): Observable { + return this.__popups.asObservable(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Get Popups + * + * + * @param page + * @param size + * @param sort + * @param order + * @param search + */ + getPopups( + page: number = 0, + size: number = 10, + sort: string = 'name', + order: 'asc' | 'desc' | '' = 'asc', + search: string = '' + ): Observable<{ + pagination: PopupPagination; + popups: Popup[]; + }> { + return this._httpClient + .get<{ + pagination: PopupPagination; + popups: Popup[]; + }>('api/apps/board/popup/popups', { + params: { + page: '' + page, + size: '' + size, + sort, + order, + search, + }, + }) + .pipe( + tap((response) => { + this.__pagination.next(response.pagination); + this.__popups.next(response.popups); + }) + ); + } + + /** + * Get product by id + */ + getPopupById(id: string | null): Observable { + return this.__popups.pipe( + take(1), + map((popups) => { + // Find the product + const popup = popups?.find((item) => item.id === id) || undefined; + + // Update the product + this.__popup.next(popup); + + // Return the product + return popup; + }), + switchMap((product) => { + if (!product) { + return throwError('Could not found product with id of ' + id + '!'); + } + + return of(product); + }) + ); + } + + /** + * Create product + */ + createPopup(): Observable { + return this.popups$.pipe( + take(1), + switchMap((popups) => + this._httpClient.post('api/apps/board/popup/product', {}).pipe( + map((newPopup) => { + // Update the popups with the new product + if (!!popups) { + this.__popups.next([newPopup, ...popups]); + } + + // Return the new product + return newPopup; + }) + ) + ) + ); + } +} diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d78cca8..e88cd37 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -39,5 +39,6 @@ "Excel Log": "Excel Download Logs", "Loosing": "Loosing Management", "Notice": "Notice", - "Notice Oneline": "Notice Oneline" + "Notice Oneline": "Notice Oneline", + "Popup": "Pop Up" } diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index 171afcd..ea95cc5 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -45,5 +45,6 @@ "Excel Log": "엑셀다운 로그", "Loosing": "루징관리", "Notice": "공지사항", - "Notice Oneline": "한줄공지" + "Notice Oneline": "한줄공지", + "Popup": "팝업" }