diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index ca868c3..6321a64 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -469,6 +469,13 @@ export const appRoutes: Route[] = [ (m: any) => m.PopupModule ), }, + { + path: 'message', + loadChildren: () => + import('app/modules/admin/board/message/message.module').then( + (m: any) => m.MessageModule + ), + }, ], }, ], diff --git a/src/app/mock-api/apps/board/message/api.ts b/src/app/mock-api/apps/board/message/api.ts new file mode 100644 index 0000000..9419efe --- /dev/null +++ b/src/app/mock-api/apps/board/message/api.ts @@ -0,0 +1,217 @@ +import { Injectable } from '@angular/core'; +import { assign, cloneDeep } from 'lodash-es'; +import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; +import { messages as messagesData } from './data'; + +@Injectable({ + providedIn: 'root', +}) +export class BoardMessageMockApi { + private _messages: any[] = messagesData; + + /** + * Constructor + */ + constructor(private _fuseMockApiService: FuseMockApiService) { + // Register Mock API handlers + this.registerHandlers(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Register Mock API handlers + */ + registerHandlers(): void { + // ----------------------------------------------------------------------------------------------------- + // @ Messages - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/board/message/messages', 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 messages + let messages: any[] | null = cloneDeep(this._messages); + + // Sort the messages + if (sort === 'sku' || sort === 'name' || sort === 'active') { + messages.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 { + messages.sort((a, b) => + order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] + ); + } + + // If search exists... + if (search) { + // Filter the messages + messages = messages.filter( + (contact: any) => + contact.name && + contact.name.toLowerCase().includes(search.toLowerCase()) + ); + } + + // Paginate - Start + const messagesLength = messages.length; + + // Calculate pagination details + const begin = page * size; + const end = Math.min(size * (page + 1), messagesLength); + const lastPage = Math.max(Math.ceil(messagesLength / size), 1); + + // Prepare the pagination object + let pagination = {}; + + // If the requested page number is bigger than + // the last possible page number, return null for + // messages but also send the last possible page so + // the app can navigate to there + if (page > lastPage) { + messages = null; + pagination = { + lastPage, + }; + } else { + // Paginate the results by size + messages = messages.slice(begin, end); + + // Prepare the pagination mock-api + pagination = { + length: messagesLength, + size: size, + page: page, + lastPage: lastPage, + startIndex: begin, + endIndex: end - 1, + }; + } + + // Return the response + return [ + 200, + { + messages, + pagination, + }, + ]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Message - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/board/message/message') + .reply(({ request }) => { + // Get the id from the params + const id = request.params.get('id'); + + // Clone the messages + const messages = cloneDeep(this._messages); + + // Find the message + const message = messages.find((item: any) => item.id === id); + + // Return the response + return [200, message]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Message - POST + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPost('api/apps/board/message/message') + .reply(() => { + // Generate a new message + const newMessage = { + 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 message + this._messages.unshift(newMessage); + + // Return the response + return [200, newMessage]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Message - PATCH + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPatch('api/apps/board/message/message') + .reply(({ request }) => { + // Get the id and message + const id = request.body.id; + const message = cloneDeep(request.body.message); + + // Prepare the updated message + let updatedMessage = null; + + // Find the message and update it + this._messages.forEach((item, index, messages) => { + if (item.id === id) { + // Update the message + messages[index] = assign({}, messages[index], message); + + // Store the updated Message + updatedMessage = messages[index]; + } + }); + + // Return the response + return [200, updatedMessage]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ Message - DELETE + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onDelete('api/apps/board/message/message') + .reply(({ request }) => { + // Get the id + const id = request.params.get('id'); + + // Find the message and delete it + this._messages.forEach((item, index) => { + if (item.id === id) { + this._messages.splice(index, 1); + } + }); + + // Return the response + return [200, true]; + }); + } +} diff --git a/src/app/mock-api/apps/board/message/data.ts b/src/app/mock-api/apps/board/message/data.ts new file mode 100644 index 0000000..3b42aaa --- /dev/null +++ b/src/app/mock-api/apps/board/message/data.ts @@ -0,0 +1,33 @@ +/* eslint-disable */ + +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: '', + }, +]; diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index 3f0f8fd..7104526 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -385,6 +385,13 @@ export const defaultNavigation: FuseNavigationItem[] = [ icon: 'heroicons_outline:academic-cap', link: '/board/popup', }, + { + id: 'board.message', + title: 'Message', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/board/message', + }, ], }, ]; diff --git a/src/app/mock-api/index.ts b/src/app/mock-api/index.ts index 0d2a72a..43fd0c6 100644 --- a/src/app/mock-api/index.ts +++ b/src/app/mock-api/index.ts @@ -58,6 +58,7 @@ import { ReportLoosingMockApi } from './apps/report/loosing/api'; import { BoardNoticeMockApi } from './apps/board/notice/api'; import { BoardNoticeOnelineMockApi } from './apps/board/notice-oneline/api'; import { BoardPopupMockApi } from './apps/board/popup/api'; +import { BoardMessageMockApi } from './apps/board/message/api'; export const mockApiServices = [ AcademyMockApi, @@ -120,4 +121,5 @@ export const mockApiServices = [ BoardNoticeMockApi, BoardNoticeOnelineMockApi, BoardPopupMockApi, + BoardMessageMockApi, ]; diff --git a/src/app/modules/admin/board/message/components/index.ts b/src/app/modules/admin/board/message/components/index.ts new file mode 100644 index 0000000..04759eb --- /dev/null +++ b/src/app/modules/admin/board/message/components/index.ts @@ -0,0 +1,3 @@ +import { ListComponent } from './list.component'; + +export const COMPONENTS = [ListComponent]; diff --git a/src/app/modules/admin/board/message/components/list.component.html b/src/app/modules/admin/board/message/components/list.component.html new file mode 100644 index 0000000..d9c77c4 --- /dev/null +++ b/src/app/modules/admin/board/message/components/list.component.html @@ -0,0 +1,355 @@ +
+ +
+ +
+ +
+ +
쪽지함
+ +
+ + + + + + + 40 + 60 + 80 + 100 + + + + + LV.1 + LV.2 + LV.3 + LV.4 + + + + + 정상 + 대기 + 탈퇴 + 휴면 + 블랙 + 정지 + + + + + 카지노제한 + 슬롯제한 + + + + + 계좌입금 + + + + + 카지노콤프 + 슬롯콤프 + 배팅콤프 + 첫충콤프 + + + + + + + + + + + + +
+
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + +
+ There are no messages! +
+ +
+
+
diff --git a/src/app/modules/admin/board/message/components/list.component.ts b/src/app/modules/admin/board/message/components/list.component.ts new file mode 100644 index 0000000..469b933 --- /dev/null +++ b/src/app/modules/admin/board/message/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 { Message } from '../models/message'; +import { MessagePagination } from '../models/message-pagination'; +import { MessageService } from '../services/message.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'message-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; + + messages$!: Observable; + users$!: Observable; + + isLoading = false; + searchInputControl = new FormControl(); + selectedMessage?: Message; + pagination?: MessagePagination; + + private _unsubscribeAll: Subject = new Subject(); + + /** + * Constructor + */ + constructor( + private _changeDetectorRef: ChangeDetectorRef, + private _fuseConfirmationService: FuseConfirmationService, + private _formBuilder: FormBuilder, + private _messageService: MessageService, + private router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Get the pagination + this._messageService.pagination$ + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe((pagination: MessagePagination | undefined) => { + // Update the pagination + this.pagination = pagination; + + // Mark for check + this._changeDetectorRef.markForCheck(); + }); + + // Get the products + this.messages$ = this._messageService.messages$; + } + + /** + * 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 message 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._messageService.getMessages( + 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/message/message.module.ts b/src/app/modules/admin/board/message/message.module.ts new file mode 100644 index 0000000..a8bc743 --- /dev/null +++ b/src/app/modules/admin/board/message/message.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 { messageRoutes } from './message.routing'; + +@NgModule({ + declarations: [COMPONENTS], + imports: [ + TranslocoModule, + SharedModule, + RouterModule.forChild(messageRoutes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatPaginatorModule, + MatProgressBarModule, + MatRippleModule, + MatSortModule, + MatSelectModule, + MatTooltipModule, + MatGridListModule, + MatSlideToggleModule, + MatRadioModule, + MatCheckboxModule, + ], +}) +export class MessageModule {} diff --git a/src/app/modules/admin/board/message/message.routing.ts b/src/app/modules/admin/board/message/message.routing.ts new file mode 100644 index 0000000..f558ba9 --- /dev/null +++ b/src/app/modules/admin/board/message/message.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 { MessagesResolver } from './resolvers/message.resolver'; +import { UserResolver } from '../../member/user/resolvers/user.resolver'; + +export const messageRoutes: Route[] = [ + { + path: '', + component: ListComponent, + resolve: { + messages: MessagesResolver, + }, + }, + { + path: ':id', + component: ViewComponent, + resolve: { + users: UserResolver, + }, + }, +]; diff --git a/src/app/modules/admin/board/message/models/message-pagination.ts b/src/app/modules/admin/board/message/models/message-pagination.ts new file mode 100644 index 0000000..f21b49c --- /dev/null +++ b/src/app/modules/admin/board/message/models/message-pagination.ts @@ -0,0 +1,8 @@ +export interface MessagePagination { + length: number; + size: number; + page: number; + lastPage: number; + startIndex: number; + endIndex: number; +} diff --git a/src/app/modules/admin/board/message/models/message.ts b/src/app/modules/admin/board/message/models/message.ts new file mode 100644 index 0000000..9f760c9 --- /dev/null +++ b/src/app/modules/admin/board/message/models/message.ts @@ -0,0 +1,29 @@ +export interface Message { + 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/message/resolvers/message.resolver.ts b/src/app/modules/admin/board/message/resolvers/message.resolver.ts new file mode 100644 index 0000000..c0a9054 --- /dev/null +++ b/src/app/modules/admin/board/message/resolvers/message.resolver.ts @@ -0,0 +1,87 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { catchError, Observable, throwError } from 'rxjs'; + +import { Message } from '../models/message'; +import { MessagePagination } from '../models/message-pagination'; +import { MessageService } from '../services/message.service'; + +@Injectable({ + providedIn: 'root', +}) +export class MessageResolver implements Resolve { + /** + * Constructor + */ + constructor( + private _messageService: MessageService, + private _router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + return this._messageService.getMessageById(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 MessagesResolver implements Resolve { + /** + * Constructor + */ + constructor(private _messageService: MessageService) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable<{ + pagination: MessagePagination; + messages: Message[]; + }> { + return this._messageService.getMessages(); + } +} diff --git a/src/app/modules/admin/board/message/services/message.service.ts b/src/app/modules/admin/board/message/services/message.service.ts new file mode 100644 index 0000000..7fb7d3e --- /dev/null +++ b/src/app/modules/admin/board/message/services/message.service.ts @@ -0,0 +1,153 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { + BehaviorSubject, + filter, + map, + Observable, + of, + switchMap, + take, + tap, + throwError, +} from 'rxjs'; + +import { Message } from '../models/message'; +import { MessagePagination } from '../models/message-pagination'; + +@Injectable({ + providedIn: 'root', +}) +export class MessageService { + // Private + private __pagination = new BehaviorSubject( + undefined + ); + private __message = new BehaviorSubject(undefined); + private __messages = new BehaviorSubject(undefined); + + /** + * Constructor + */ + constructor(private _httpClient: HttpClient) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Getter for pagination + */ + get pagination$(): Observable { + return this.__pagination.asObservable(); + } + + /** + * Getter for message + */ + get message$(): Observable { + return this.__message.asObservable(); + } + + /** + * Getter for messages + */ + get messages$(): Observable { + return this.__messages.asObservable(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Get Messages + * + * + * @param page + * @param size + * @param sort + * @param order + * @param search + */ + getMessages( + page: number = 0, + size: number = 10, + sort: string = 'name', + order: 'asc' | 'desc' | '' = 'asc', + search: string = '' + ): Observable<{ + pagination: MessagePagination; + messages: Message[]; + }> { + return this._httpClient + .get<{ + pagination: MessagePagination; + messages: Message[]; + }>('api/apps/board/message/messages', { + params: { + page: '' + page, + size: '' + size, + sort, + order, + search, + }, + }) + .pipe( + tap((response) => { + this.__pagination.next(response.pagination); + this.__messages.next(response.messages); + }) + ); + } + + /** + * Get product by id + */ + getMessageById(id: string | null): Observable { + return this.__messages.pipe( + take(1), + map((messages) => { + // Find the product + const message = messages?.find((item) => item.id === id) || undefined; + + // Update the product + this.__message.next(message); + + // Return the product + return message; + }), + switchMap((product) => { + if (!product) { + return throwError('Could not found product with id of ' + id + '!'); + } + + return of(product); + }) + ); + } + + /** + * Create product + */ + createMessage(): Observable { + return this.messages$.pipe( + take(1), + switchMap((messages) => + this._httpClient + .post('api/apps/board/message/product', {}) + .pipe( + map((newMessage) => { + // Update the messages with the new product + if (!!messages) { + this.__messages.next([newMessage, ...messages]); + } + + // Return the new product + return newMessage; + }) + ) + ) + ); + } +} 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 3b0681f..4918cb5 100644 --- a/src/app/modules/admin/board/notice/components/list.component.html +++ b/src/app/modules/admin/board/notice/components/list.component.html @@ -15,19 +15,19 @@