From 98ec6087799da37a393b8cf88dd911c03525c82d Mon Sep 17 00:00:00 2001 From: Richard Park Date: Tue, 29 Oct 2019 09:06:19 +0900 Subject: [PATCH 1/5] logo added --- .../native/components/top-bar.component.html | 3 +++ .../native/components/top-bar.component.scss | 15 +++++++++++---- .../src/assets/images/logo/ico_64x64.png | Bin 0 -> 3170 bytes 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/assets/images/logo/ico_64x64.png diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index fe1fbbb9..1780ab4a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -1,4 +1,7 @@ +
UCAP M Messenger
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index 68e8fe40..89b2e3b9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -13,6 +13,17 @@ cursor: pointer; background: white; height: 30px; + border-bottom: 1px solid #d5dadb; + + .app-layout-native-title-bar-logo { + width: 16px; + height: 16px; + } + + .app-layout-native-title-bar-title { + padding-left: 8px; + font-size: 12px; + } .app-layout-native-title-bar-spacer { flex: 1 1 auto; @@ -73,9 +84,5 @@ } } } - - .app-layout-native-title-bar-title { - font-size: 12px; - } } } diff --git a/projects/ucap-webmessenger-app/src/assets/images/logo/ico_64x64.png b/projects/ucap-webmessenger-app/src/assets/images/logo/ico_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..adbc1dd4f3a8d392d5bef410f26d22b5c9bbc9ff GIT binary patch literal 3170 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 IM6N<$g0NBY1^@s6 literal 0 HcmV?d00001 From 98fe3085beb9bf0db0336096627ec1d888f25247 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Tue, 29 Oct 2019 09:07:06 +0900 Subject: [PATCH 2/5] image viewer added --- .../layouts/common/common.layout.module.ts | 26 ++++++++++++++ .../app/layouts/common/components/index.ts | 1 + .../image-viewer.dialog.component.html | 0 .../image-viewer.dialog.component.scss | 0 .../image-viewer.dialog.component.spec.ts | 27 +++++++++++++++ .../dialogs/image-viewer.dialog.component.ts | 34 +++++++++++++++++++ .../src/app/layouts/common/dialogs/index.ts | 3 ++ .../components/messages.component.ts | 19 ++++++++++- .../messenger/messenger.layout.module.ts | 8 +++-- .../components/user-list-item.component.html | 19 ----------- 10 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/common.layout.module.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/components/index.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.html create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.scss create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.spec.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.ts create mode 100644 projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/index.ts diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/common.layout.module.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/common.layout.module.ts new file mode 100644 index 00000000..8e0d7fcf --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/common.layout.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { FlexLayoutModule } from '@angular/flex-layout'; + +import { MatIconModule } from '@angular/material/icon'; +import { MatToolbarModule } from '@angular/material/toolbar'; + +import { UCapUiModule } from '@ucap-webmessenger/ui'; + +import { COMPONENTS } from './components'; +import { DIALOGS } from './dialogs'; + +@NgModule({ + imports: [ + CommonModule, + FlexLayoutModule, + MatIconModule, + MatToolbarModule, + UCapUiModule + ], + exports: [...COMPONENTS, ...DIALOGS], + declarations: [...COMPONENTS, ...DIALOGS], + entryComponents: [...DIALOGS] +}) +export class AppCommonLayoutModule {} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/components/index.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/components/index.ts new file mode 100644 index 00000000..98bcc9bb --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/components/index.ts @@ -0,0 +1 @@ +export const COMPONENTS = []; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.html new file mode 100644 index 00000000..e69de29b diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.spec.ts new file mode 100644 index 00000000..6d3c789c --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.spec.ts @@ -0,0 +1,27 @@ +/* tslint:disable:no-unused-variable */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; + +import { ImageViewerDialogComponent } from './image-viewer.dialog.component'; + +describe('ImageViewerDialogComponent', () => { + let component: ImageViewerDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ImageViewerDialogComponent] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ImageViewerDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.ts new file mode 100644 index 00000000..dfa13ae4 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/image-viewer.dialog.component.ts @@ -0,0 +1,34 @@ +import { + Component, + OnInit, + OnDestroy, + Inject, + EventEmitter +} from '@angular/core'; + +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { NGXLogger } from 'ngx-logger'; + +export interface ImageViewerDialogData {} + +export interface ImageViewerDialogResult {} + +@Component({ + selector: 'app-layout-common-image-viewer', + templateUrl: './image-viewer.dialog.component.html', + styleUrls: ['./image-viewer.dialog.component.scss'] +}) +export class ImageViewerDialogComponent implements OnInit, OnDestroy { + constructor( + public dialogRef: MatDialogRef< + ImageViewerDialogData, + ImageViewerDialogResult + >, + @Inject(MAT_DIALOG_DATA) public data: ImageViewerDialogData, + private logger: NGXLogger + ) {} + + ngOnInit() {} + + ngOnDestroy(): void {} +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/index.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/index.ts new file mode 100644 index 00000000..d67d8652 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/index.ts @@ -0,0 +1,3 @@ +import { ImageViewerDialogComponent } from './image-viewer.dialog.component'; + +export const DIALOGS = [ImageViewerDialogComponent]; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 3ca24a96..77ae5ad9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -50,6 +50,11 @@ import { CreateChatDialogData, CreateChatDialogResult } from '../dialogs/chat/create-chat.dialog.component'; +import { + ImageViewerDialogComponent, + ImageViewerDialogData, + ImageViewerDialogResult +} from '@app/layouts/common/dialogs/image-viewer.dialog.component'; @Component({ selector: 'app-layout-messenger-messages', @@ -215,8 +220,20 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked { ); } - onImageViewer(value: FileInfo) { + async onImageViewer(value: FileInfo) { this.logger.debug('imageViewer', value); + const result = await this.dialogService.open< + ImageViewerDialogComponent, + ImageViewerDialogData, + ImageViewerDialogResult + >(ImageViewerDialogComponent, { + position: { + top: '10px' + }, + width: '100%', + height: '98%', + data: {} + }); } /** File Save, Save As */ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts index e35dff82..88ce86d8 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts @@ -2,6 +2,7 @@ import { MatListModule } from '@angular/material/list'; import { MatChipsModule } from '@angular/material/chips'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ReactiveFormsModule } from '@angular/forms'; import { FlexLayoutModule } from '@angular/flex-layout'; @@ -32,9 +33,10 @@ import { UCapUiProfileModule } from '@ucap-webmessenger/ui-profile'; import { UCapUiGroupModule } from '@ucap-webmessenger/ui-group'; import { UCapUiOrganizationModule } from '@ucap-webmessenger/ui-organization'; +import { AppCommonLayoutModule } from '@app/layouts/common/common.layout.module'; + import { COMPONENTS } from './components'; import { DIALOGS } from './dialogs'; -import { ReactiveFormsModule } from '@angular/forms'; @NgModule({ imports: [ @@ -66,7 +68,9 @@ import { ReactiveFormsModule } from '@angular/forms'; UCapUiRoomModule, UCapUiProfileModule, UCapUiGroupModule, - UCapUiOrganizationModule + UCapUiOrganizationModule, + + AppCommonLayoutModule ], exports: [...COMPONENTS, ...DIALOGS], declarations: [...COMPONENTS, ...DIALOGS], diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html index ba574184..45480112 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html @@ -9,18 +9,6 @@
- - -
From 49e9704bfb307d0bd3f4e2bf8b3af31db01e7765 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Tue, 29 Oct 2019 09:21:54 +0900 Subject: [PATCH 3/5] layout is modified --- .../pages/messenger/components/main.page.component.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss index 4f7e98ab..953aa782 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss @@ -1,7 +1,8 @@ .container { height: 100%; - display:flex; + display: flex; flex-flow: row; + padding-top: 30px; .left-side { width: 380px; @@ -9,8 +10,8 @@ flex: 0 0 auto; } .contents { - flex:1 1 auto; - min-width:400px; + flex: 1 1 auto; + min-width: 400px; height: 100%; .messages { From c1f1d6f012cf501c29c3b69c5cd7f666c4a3ca9f Mon Sep 17 00:00:00 2001 From: Richard Park Date: Tue, 29 Oct 2019 09:28:43 +0900 Subject: [PATCH 4/5] layout is modified --- .../app/layouts/messenger/components/left-side.component.html | 2 +- .../app/layouts/messenger/components/left-side.component.scss | 2 +- .../src/app/layouts/native/components/top-bar.component.scss | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) 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 d9dd91b3..c8d3929f 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 @@ -5,7 +5,7 @@ chat
--> - + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss index 8fab5dc4..7a51d48b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss @@ -32,7 +32,7 @@ border-right: 1px solid #dddddd; .mat-tab-list { .mat-tab-labels { - padding-top: 30px; + padding-top: 0px; flex-flow: column; height: 280px; .mat-tab-label { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index 89b2e3b9..47330b04 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -7,6 +7,8 @@ right: 0; top: 0; display: flex; + padding-left: 5px; + padding-right: 0px; // align-items: center; // justify-content: center; // flex-direction: row-reverse; From 2e63f25685e87188093bb826401ab01ecd198e2a Mon Sep 17 00:00:00 2001 From: Richard Park Date: Tue, 29 Oct 2019 09:47:48 +0900 Subject: [PATCH 5/5] floating label of search room is disabled --- .../messenger/components/left-sidenav/chat.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html index 9a94a635..fc3820e2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html @@ -1,5 +1,5 @@
- +