From 00bc20dd0cdb13de0c8fdcfdce948ab06efe0a2a Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Fri, 22 Jul 2022 03:14:01 +0000 Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=AC=EC=A0=91=EC=86=8D=EC=9E=90?= =?UTF-8?q?=20=EC=AA=BD=EC=A7=80=EC=A0=84=EC=86=A1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mock-api/apps/member/current-user/api.ts | 33 +- .../mock-api/apps/member/current-user/data.ts | 50 +-- .../components/list.component copy.html | 212 ---------- .../components/list.component.html | 381 +++++++++--------- .../current-user/components/list.component.ts | 43 +- .../current-user/models/current-user.ts | 15 +- 6 files changed, 219 insertions(+), 515 deletions(-) delete mode 100644 src/app/modules/admin/member/current-user/components/list.component copy.html diff --git a/src/app/mock-api/apps/member/current-user/api.ts b/src/app/mock-api/apps/member/current-user/api.ts index 591ed35..b43206e 100644 --- a/src/app/mock-api/apps/member/current-user/api.ts +++ b/src/app/mock-api/apps/member/current-user/api.ts @@ -33,7 +33,7 @@ export class MemberCurrentUserMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); @@ -42,7 +42,7 @@ export class MemberCurrentUserMockApi { let currentUsers: any[] | null = cloneDeep(this._currentUsers); // Sort the currentUsers - if (sort === 'id' || sort === 'signinId' || sort === 'nickname') { + if (sort === 'signinId' || sort === 'nickname' || sort === 'level') { currentUsers.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); @@ -139,24 +139,17 @@ export class MemberCurrentUserMockApi { // Generate a new currentUser const newCurrentUser = { 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, + signinId: '', + nickname: '', + currentLocation: '', + gameMoney: 0, + highRank: '', + index: 0, + level: '', + ownCash: 0, + ownComp: 0, + rank: '', + siteAddress: '', }; // Unshift the new currentUser diff --git a/src/app/mock-api/apps/member/current-user/data.ts b/src/app/mock-api/apps/member/current-user/data.ts index 50ae0ac..ca0d8d0 100644 --- a/src/app/mock-api/apps/member/current-user/data.ts +++ b/src/app/mock-api/apps/member/current-user/data.ts @@ -3,54 +3,16 @@ export const currentUsers = [ { id: '2bfa2be5-7688-48d5-b5ac-dc0d9ac97f14', - signinId: 'kgon01', - highRank: '[매장]kgon5', - rank: '회원', - level: 4, + signinId: 'aa100', nickname: 'aa100', currentLocation: '메인', - cash: 0, - comp: 3111, gameMoney: 0, - siteAddress: 'web4nova114.com', - }, - { - id: '77a4383b-b5a5-4943-bc46-04c3431d1566', - signinId: 'kgon02', - highRank: '[매장]kgon5', + highRank: 'kgon5', + index: 1, + level: '4', + ownCash: 67131, + ownComp: 3111, rank: '회원', - level: 4, - nickname: 'aa100', - currentLocation: '메인', - cash: 0, - comp: 3111, - gameMoney: 0, - siteAddress: 'web4nova114.com', - }, - { - id: '8bb0f597-673a-47ca-8c77-2f83219cb9af', - signinId: 'kgon03', - highRank: '[매장]kgon5', - rank: '회원', - level: 4, - nickname: 'aa100', - currentLocation: '메인', - cash: 0, - comp: 3111, - gameMoney: 0, - siteAddress: 'web4nova114.com', - }, - { - id: '0a8bc517-631a-4a93-aacc-000fa2e8294c', - signinId: 'kgon04', - highRank: '[매장]kgon5', - rank: '회원', - level: 4, - nickname: 'aa100', - currentLocation: '메인', - cash: 0, - comp: 3111, - gameMoney: 0, siteAddress: 'web4nova114.com', }, ]; diff --git a/src/app/modules/admin/member/current-user/components/list.component copy.html b/src/app/modules/admin/member/current-user/components/list.component copy.html deleted file mode 100644 index 0e317fa..0000000 --- a/src/app/modules/admin/member/current-user/components/list.component copy.html +++ /dev/null @@ -1,212 +0,0 @@ -
- -
- -
- -
- -
- 현재접속자 & 쪽지전송 -
- -
-
- -
- -
- - -
- -
-
- - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - -
- There are no currentUser! -
- -
-
-
- -
-
- - - 현재 접속자 & 전체회원 쪽지보내기 - - - - -
- - 제목 - - -
-
- - 글쓴이 - - -
-
- - 내용 - - -
-
- - - -
- - -
-
diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index 3a7f57d..84c47c8 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -1,202 +1,185 @@ -
-
-
-
- -
-
- 현재접속자 & 쪽지전송 -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
번호 - - - {{ idx + 1 }} - - 상위 - - {{ user.highRank }} - - 등급 - {{ user.rank }} - 레벨 - {{ user.level }} - 아이디 - {{ user.signinId }} - 닉네임 - {{ user.nickname }} - 현재위치 - {{ user.currentLocation }} - 캐쉬 - {{ user.cash }} - 게임중머니 - {{ user.gameMoney }} - 카지노->캐쉬 - - 콤프 - {{ user.comp }} - 사이트 - {{ user.siteAddress }} - 쪽지보내기 - - 배팅내역 - - 로그아웃 - -
-
-
- -
-
- 현재 접속자 & 전체회원 쪽지보내기 -
-
- - - - -
- - 제목 - - -
-
- - 글쓴이 - - -
-
- - 내용 - - -
-
- - - -
- - -
-
-
+
+ +
+ +
+ +
+ +
+ 현재접속자&쪽지전송 +
+
+
+ + +
+ +
+ + +
+ +
+
번호
+
상부
+
+ 아이디 +
+ 닉네임 +
+ 현재위치 +
+
+ 등급 +
+ 레벨 +
+ + + + + + +
+ + + +
+
{{ currentUser.index }}
+
{{ currentUser.highRank }}
+ + +
+
+ {{ currentUser.signinId }} +
+
+ {{ currentUser.nickname }} +
+ {{ currentUser.currentLocation }} +
+ + +
+ {{ currentUser.rank }} +
+ {{ currentUser.level }} +
+ + + + + + +
+ + +
+ + + + + + +
+ There are no current user! +
+ +
+
+ +
+
+
+ 현재 접속자 & 전체회원 쪽지보내기 +
+
+ + +
+ + 제목 + + +
+
+ + 글쓴이 + + +
+
+ + 내용 + + +
+
+ + + +
+ +
diff --git a/src/app/modules/admin/member/current-user/components/list.component.ts b/src/app/modules/admin/member/current-user/components/list.component.ts index 20e43ee..be34900 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.ts +++ b/src/app/modules/admin/member/current-user/components/list.component.ts @@ -42,18 +42,22 @@ import { Router } from '@angular/router'; /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + /* CB 관리 요율 상부 아이디 */ + grid-template-columns: 20px 40px 40px 100px auto; @screen sm { - grid-template-columns: 60px auto 60px 72px; + /* CB 관리 요율 상부 아이디 등급 */ + grid-template-columns: 20px 40px 40px 100px auto 40px 140px 140px; } @screen md { - grid-template-columns: 60px 60px auto 112px 72px; + /* CB 관리 요율 상부 아이디 등급 예금주 보유금 게임중머니 총입출 */ + grid-template-columns: 20px 40px 40px 100px auto 40px 140px 140px; } @screen lg { - grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + /* 번호 상부 아이디 등급 보유금 게임중머니 사이트 쪽지 배팅 로그아웃 */ + grid-template-columns: 20px 100px auto 40px 140px 140px 140px 140px 140px 140px; } } `, @@ -69,26 +73,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { currentUsers$!: Observable; users$!: Observable; - currentUserDataSource: MatTableDataSource = new MatTableDataSource(); - currentUserTableColumns: string[] = [ - 'id', - 'highRank', - 'rank', - 'level', - 'signinId', - 'nickname', - 'currentLocation', - 'cash', - 'gameMoney', - 'casinoMoney', - 'comp', - 'siteAddress', - 'sendMessageBtn', - 'betHistoryBtn', - 'forceSignOutBtn', - ]; - - data: any; isLoading = false; searchInputControl = new FormControl(); selectedCurrentUser?: CurrentUser; @@ -127,14 +111,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { }); // Get the products - this._currentUserService.currentUsers$ - .pipe(takeUntil(this._unsubscribeAll)) - .subscribe((currentUsers: any | undefined) => { - this.currentUserDataSource = currentUsers; - // Mark for check - this._changeDetectorRef.markForCheck(); - }); - /* this.currentUsers$ = this._currentUserService.currentUsers$; */ + this.currentUsers$ = this._currentUserService.currentUsers$; } /** @@ -144,7 +121,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { if (this._sort && this._paginator) { // Set the initial sort this._sort.sort({ - id: 'name', + id: 'signinId', start: 'asc', disableClear: true, }); diff --git a/src/app/modules/admin/member/current-user/models/current-user.ts b/src/app/modules/admin/member/current-user/models/current-user.ts index 75d62cb..be2ab03 100644 --- a/src/app/modules/admin/member/current-user/models/current-user.ts +++ b/src/app/modules/admin/member/current-user/models/current-user.ts @@ -1,13 +1,14 @@ export interface CurrentUser { - id?: string; - index?: number; + id: string; + signinId?: string; nickname?: string; - highRank?: string; - rank?: string; - level?: string; currentLocation?: string; - cash?: number; gameMoney?: number; - comp?: number; + highRank?: string; + index?: number; + level?: string; + ownCash?: number; + ownComp?: number; + rank?: string; siteAddress?: string; }