From c6dcdc6f45d6f62cc8e9b0fac646bd190cbd5877 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 11 Nov 2019 14:31:26 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=ED=95=A8,=20=EC=95=A8?= =?UTF-8?q?=EB=B2=94=ED=95=A8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A7=91=20=EB=B0=8F=20drawer=20=EA=B8=B0=EC=B4=88=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/layouts/messenger/components/index.ts | 6 +- .../components/messages.component.html | 26 +++-- .../components/messages.component.ts | 27 ++++- .../components/right-drawer.component.html | 7 ++ .../components/right-drawer.component.scss | 0 .../components/right-drawer.component.spec.ts | 25 +++++ .../components/right-drawer.component.ts | 18 ++++ .../right-drawer/album-box.component.html | 1 + .../right-drawer/album-box.component.scss | 0 .../right-drawer/album-box.component.spec.ts | 25 +++++ .../right-drawer/album-box.component.ts | 12 +++ .../right-drawer/file-box.component.html | 1 + .../right-drawer/file-box.component.scss | 0 .../right-drawer/file-box.component.spec.ts | 25 +++++ .../right-drawer/file-box.component.ts | 12 +++ .../components/right-drawer/index.ts | 4 + .../components/main.page.component.html | 19 ++-- .../components/main.page.component.ts | 35 ++++++- .../src/app/store/messenger/chat/actions.ts | 10 ++ .../src/app/store/messenger/chat/effects.ts | 4 +- .../src/app/store/messenger/chat/reducers.ts | 17 +++- .../src/app/store/messenger/chat/state.ts | 9 +- .../src/app/store/messenger/event/actions.ts | 33 +++++-- .../src/app/store/messenger/event/effects.ts | 76 +++++++++++++- .../src/app/store/messenger/event/reducers.ts | 34 ++++++- .../src/app/store/messenger/event/state.ts | 98 ++++++++++++++++++- .../src/app/types/index.ts | 1 + .../src/app/types/right-drawer.type.ts | 4 + .../src/lib/types/file.type.ts | 12 +-- 29 files changed, 503 insertions(+), 38 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.spec.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.spec.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.spec.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts create mode 100644 projects/ucap-webmessenger-app/src/app/types/right-drawer.type.ts diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/index.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/index.ts index 53ac688b..17ab1479 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/index.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/index.ts @@ -2,14 +2,18 @@ import { IntroComponent } from './intro.component'; import { LeftSideComponent } from './left-side.component'; import { MessagesComponent } from './messages.component'; import { RightSideComponent } from './right-side.component'; +import { RightDrawerComponent } from './right-drawer.component'; import { LEFT_SIDENAV_COMPONENTS } from './left-sidenav'; +import { RIGHT_DRAWER_COMPONENTS } from './right-drawer'; export const COMPONENTS = [ IntroComponent, LeftSideComponent, MessagesComponent, RightSideComponent, + RightDrawerComponent, - ...LEFT_SIDENAV_COMPONENTS + ...LEFT_SIDENAV_COMPONENTS, + ...RIGHT_DRAWER_COMPONENTS ]; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index 55021b72..0c6e4b26 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -11,15 +11,24 @@ class="responsive-chats-button" > - - + - + c0.5-1.1,0.8-2.3,0.8-3.5c0,0,0,0,0,0V11C20,7.1,16.9,4,13,3.7L12.5,3.8C12.5,3.8,12.5,3.8,12.5,3.8z" + /> @@ -27,7 +36,6 @@ -

album-box works!

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.spec.ts new file mode 100644 index 00000000..e3f18dc0 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AlbumBoxComponent } from './album-box.component'; + +describe('AlbumBoxComponent', () => { + let component: AlbumBoxComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AlbumBoxComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AlbumBoxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts new file mode 100644 index 00000000..e4737472 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-layout-chat-right-drawer-album-box', + templateUrl: './album-box.component.html', + styleUrls: ['./album-box.component.scss'] +}) +export class AlbumBoxComponent implements OnInit { + constructor() {} + + ngOnInit() {} +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html new file mode 100644 index 00000000..e361c50b --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html @@ -0,0 +1 @@ +

file-box works!

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.spec.ts new file mode 100644 index 00000000..2f2d4ef3 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FileBoxComponent } from './file-box.component'; + +describe('FileBoxComponent', () => { + let component: FileBoxComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FileBoxComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FileBoxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts new file mode 100644 index 00000000..dd06f32f --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-layout-chat-right-drawer-file-box', + templateUrl: './file-box.component.html', + styleUrls: ['./file-box.component.scss'] +}) +export class FileBoxComponent implements OnInit { + constructor() {} + + ngOnInit() {} +} 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 new file mode 100644 index 00000000..dc7431d2 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/index.ts @@ -0,0 +1,4 @@ +import { FileBoxComponent } from './file-box.component'; +import { AlbumBoxComponent } from './album-box.component'; + +export const RIGHT_DRAWER_COMPONENTS = [FileBoxComponent, AlbumBoxComponent]; diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index 72e84557..dff20e2b 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -5,12 +5,11 @@ > - +
+ + + +