From deb48ab7e8ddb7011230c85cf542705f7cb8fd5e Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 22 Nov 2019 17:25:51 +0900 Subject: [PATCH] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20right=20drawer=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20left=20side=20navi=20=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-side.component.html | 10 +++--- .../components/left-side.component.ts | 16 +-------- .../components/left-sidenav/index.ts | 4 ++- .../message.component.html} | 21 +++++++++--- .../message.component.scss} | 19 +++++++++++ .../message.component.spec.ts} | 7 ++-- .../message.component.ts} | 33 ++++++++++++++++--- .../components/right-drawer.component.html | 2 -- .../components/right-drawer/index.ts | 4 +-- .../src/app/types/right-drawer.type.ts | 5 +-- 10 files changed, 77 insertions(+), 44 deletions(-) rename projects/ucap-webmessenger-app/src/app/layouts/messenger/components/{right-drawer/message-box.component.html => left-sidenav/message.component.html} (88%) rename projects/ucap-webmessenger-app/src/app/layouts/messenger/components/{right-drawer/message-box.component.scss => left-sidenav/message.component.scss} (77%) rename projects/ucap-webmessenger-app/src/app/layouts/messenger/components/{right-drawer/message-box.component.spec.ts => left-sidenav/message.component.spec.ts} (78%) rename projects/ucap-webmessenger-app/src/app/layouts/messenger/components/{right-drawer/message-box.component.ts => left-sidenav/message.component.ts} (91%) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html index 8e9199cf..0d5eea50 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html @@ -89,11 +89,7 @@ -
+
+
+

쪽지

+
+ +
+
@@ -26,13 +37,15 @@
-
+
- + 수신 @@ -64,7 +77,7 @@
- + 발신 @@ -96,7 +109,7 @@
- + 예약 diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss similarity index 77% rename from projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.scss rename to projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss index 4feb381a..1f1bfe69 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.scss @@ -1,3 +1,18 @@ +.current-head { + h3 { + display: inline-flex; + padding-left: 10px; + align-items: center; + color: #ffffff; + } + .btn-box { + height: 100%; + margin-left: auto; + display: inline-flex; + align-items: center; + } +} + .list-search { display: flex; flex-direction: row; @@ -46,3 +61,7 @@ } } } + +.mat-tab-label-active { + opacity: 1; +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.spec.ts similarity index 78% rename from projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.spec.ts rename to projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.spec.ts index 5a6261b4..efe0d5fd 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.spec.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MessageBoxComponent } from './message-box.component'; +import { MessageBoxComponent } from './message.component'; describe('MessageBoxComponent', () => { let component: MessageBoxComponent; @@ -8,9 +8,8 @@ describe('MessageBoxComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ MessageBoxComponent ] - }) - .compileComponents(); + declarations: [MessageBoxComponent] + }).compileComponents(); })); beforeEach(() => { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts similarity index 91% rename from projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.ts rename to projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts index 16cfe86e..56894b48 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts @@ -3,7 +3,10 @@ import { OnInit, OnDestroy, Output, - EventEmitter + EventEmitter, + ViewChild, + Input, + AfterViewChecked } from '@angular/core'; import { Subscription, of } from 'rxjs'; import { Store, select } from '@ngrx/store'; @@ -28,13 +31,21 @@ import { DeviceType } from '@ucap-webmessenger/core'; import { MessageStatusCode } from '@ucap-webmessenger/api'; import { ContentType } from '@ucap-webmessenger/api-message'; import { FormGroup, FormBuilder } from '@angular/forms'; +import { MatTabGroup } from '@angular/material'; @Component({ - selector: 'app-layout-chat-right-drawer-message-box', - templateUrl: './message-box.component.html', - styleUrls: ['./message-box.component.scss'] + selector: 'app-layout-chat-left-sidenav-message', + templateUrl: './message.component.html', + styleUrls: ['./message.component.scss'] }) -export class MessageBoxComponent implements OnInit, OnDestroy { +export class MessageBoxComponent + implements OnInit, OnDestroy, AfterViewChecked { + @Input() + isVisible = false; + + @ViewChild('tabs', { static: false }) tabs: MatTabGroup; + isInitTabs = false; + fgSearch: FormGroup; userInfoList: UserInfo[]; @@ -60,6 +71,7 @@ export class MessageBoxComponent implements OnInit, OnDestroy { currentPage = 0; ContentType = ContentType; + MessageType = MessageType; constructor( private store: Store, @@ -92,6 +104,17 @@ export class MessageBoxComponent implements OnInit, OnDestroy { // 초기 검색은 수신함. this.getRetrieveMessage(MessageType.Receive, this.recieveCurrentPage); + + if (!!this.tabs) { + this.tabs.realignInkBar(); + } + } + + ngAfterViewChecked(): void { + if (!!this.tabs && !this.isInitTabs && this.isVisible) { + this.isInitTabs = true; + this.tabs.realignInkBar(); + } } ngOnDestroy(): void { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html index 3ba4cbd4..f317f3cf 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html @@ -28,7 +28,5 @@ - - diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts index 2c8c66fe..ceb7185d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts @@ -1,11 +1,9 @@ import { FileBoxComponent } from './file-box.component'; import { AlbumBoxComponent } from './album-box.component'; import { RoomUserListComponent } from './room-user-list.component'; -import { MessageBoxComponent } from './message-box.component'; export const RIGHT_DRAWER_COMPONENTS = [ FileBoxComponent, AlbumBoxComponent, - RoomUserListComponent, - MessageBoxComponent + RoomUserListComponent ]; diff --git a/projects/ucap-webmessenger-app/src/app/types/right-drawer.type.ts b/projects/ucap-webmessenger-app/src/app/types/right-drawer.type.ts index b32b9b1d..5954d2f8 100644 --- a/projects/ucap-webmessenger-app/src/app/types/right-drawer.type.ts +++ b/projects/ucap-webmessenger-app/src/app/types/right-drawer.type.ts @@ -4,8 +4,5 @@ export enum RightDrawer { /** 대화방 > 파일함 */ FileBox = 'FILE_BOX', /** 대화방 > 대화참여자목록 */ - RoomUser = 'ROOM_USER', - - /** 쪽지함 */ - Message = 'MESSAGE_BOX' + RoomUser = 'ROOM_USER' }