From 1be22492f27e2f91c5c330dbf920e777901b7ffa Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 22 Nov 2019 14:17:53 +0900 Subject: [PATCH 01/10] =?UTF-8?q?[19=20=ED=98=84=EC=9E=AC=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=B0=A9=EC=9D=80=20=EC=A0=84=EB=8B=AC=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=B6=88=EA=B0=80=EB=8A=A5]=20=ED=98=84=EC=9E=AC?= =?UTF-8?q?=20=EB=8C=80=ED=99=94=EB=B0=A9=EB=8F=84=20=EC=A0=84=EB=8B=AC=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.=20[30=20=EB=8C=80=ED=99=94=20=EC=B0=B8=EC=97=AC?= =?UTF-8?q?=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=98=A4=EB=A5=98]=20=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=A6=8C=EC=8A=A4=20=EC=A0=95=EB=B3=B4=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EC=96=B4=EB=8F=84=20=EA=B3=B5=EA=B0=84=20=ED=99=95=EB=B3=B4.?= =?UTF-8?q?=20=EB=8C=80=ED=99=94=EB=B0=A9=20=ED=8C=8C=EC=9D=BC=20expired?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialogs/chat/create-chat.dialog.component.ts | 13 +++++++------ .../lib/components/message-box/file.component.ts | 2 +- .../lib/components/user-list-item.component.html | 7 +------ .../src/assets/scss/partials/_presence.scss | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts index 0f88ec7f..164b976b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts @@ -451,12 +451,13 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { } getCheckableRoom(roomInfo: RoomInfo) { - if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) { - return !( - this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq) - .length > 0 - ); - } + // // 현재 방도 체크 전달 할수 있도록 수정. (끌어올리기 개념.) + // if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) { + // return !( + // this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq) + // .length > 0 + // ); + // } return true; } getCheckedRoom(roomInfo: RoomInfo) { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts index efc48ca4..1c089d36 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts @@ -42,7 +42,7 @@ export class FileComponent implements OnInit { getExpiredFile() { if ( !!this.eventInfoStatus && - this.eventInfoStatus.validFileBaseSeq < this.message.seq + this.eventInfoStatus.validFileBaseSeq <= this.message.seq ) { return false; } else { 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 73f9137a..82926569 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 @@ -1,12 +1,7 @@
- {{ presence.pcStatus }} - +
Date: Fri, 22 Nov 2019 14:48:02 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83,=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/app.theme.scss | 5 +- .../native/components/top-bar.component.html | 30 ++++++++-- .../native/components/top-bar.component.scss | 55 +++++++++++++++++-- .../components/main.page.component.scss | 26 ++++----- .../src/assets/scss/global/_default.scss | 9 ++- 5 files changed, 97 insertions(+), 28 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/app.theme.scss b/projects/ucap-webmessenger-app/src/app/app.theme.scss index 164de656..de5eae1a 100644 --- a/projects/ucap-webmessenger-app/src/app/app.theme.scss +++ b/projects/ucap-webmessenger-app/src/app/app.theme.scss @@ -109,8 +109,7 @@ $pink-light-theme-warn-palette: mat-palette($mat-red);*/ $pink-light-theme-primary-palette: mat-palette($daesang-grey, 900); $pink-light-theme-accent-palette: mat-palette($daesang); -$pink-light-theme-warn-palette: mat-palette($mat-deep-orange); - +$pink-light-theme-warn-palette: mat-palette($mat-orange); // Create the Material theme object $pink-light-theme: mat-light-theme( @@ -121,7 +120,7 @@ $pink-light-theme: mat-light-theme( // Add ".theme-pink-dark" class to the body to activate this theme. // Class name must start with "theme-" !!! -body.theme-default { +body.theme-default { // Generate the Angular Material theme @include angular-material-theme($pink-light-theme); 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 6ab97a58..ae1a4af5 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 @@ -4,7 +4,29 @@
UCAP M Messenger
+
+ + + + + + + +
+ @@ -24,7 +46,7 @@ + stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" *ngSwitchCase="WindowState.Maximized" alt="창 이전크기"> @@ -32,7 +54,7 @@ + stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" *ngSwitchDefault alt="창크기 최대"> @@ -45,7 +67,7 @@ > + stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" alt="창닫기"> 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 c9c35b35..f84b82d9 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 @@ -9,8 +9,8 @@ display: flex; padding: 0 10px; cursor: pointer; - height: 30px; - color:#ffffff; + height: 50px; + color: #ffffff; //background: rgba(37, 27, 30, 0.9); //border-bottom: 1px solid #d5dadb; @@ -28,7 +28,49 @@ flex: 1 1 auto; } + .app-layout-native-title-bar-link { + align-items: center; + position: relative; + + .stroke-bar { + width: 1px; + height: 20px; + background-color: rgba(256, 256, 256, 0.3); + margin: 0 10px 0 20px; + display: inline-flex; + } + .button { + -webkit-app-region: no-drag; + outline: 0; + cursor: pointer; + border: none; + height: 28px; + min-width: 28px; + max-width: 28px; + padding: 5px; + line-height: 10px; + border-radius: 0; + background: transparent; + transition: background 0.2s linear, color 0.2s linear; + text-align: center; + font-size: 10px; + vertical-align: middle; + margin-left: 10px; + transform: translateY(-2px); + + &.app-layout-native-title-bar-logout, + &.app-layout-native-title-bar-setting { + background-color: #efefef; + border-radius: 50%; + } + &:hover { + opacity: 0.7; + } + } + } + .app-layout-native-title-bar-actions { + align-items: center; position: relative; .button { @@ -47,14 +89,14 @@ text-align: center; font-size: 10px; vertical-align: middle; - margin-left:6px; + margin-left: 6px; transform: translateY(-2px); .mat-icon { //transform: translateY(-2px); width: 16px; height: 16px; - min-height:16px; - min-width:16px; + min-height: 16px; + min-width: 16px; font-size: 16px; } @@ -70,6 +112,7 @@ // } &:hover { + border-radius: 4px; &.app-layout-native-title-bar-close { background: darken(#000000, 10%); color: darken(white, 0); @@ -77,7 +120,7 @@ &.app-layout-native-title-bar-minimize { background: darken(#000000, 10%); - color: darken(white,0); + color: darken(white, 0); } &.app-layout-native-title-bar-maximize { 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 b4ae702a..eec9a211 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,16 +1,16 @@ .main-container { - height:100%; + height: 100%; display: flex; flex-flow: row; - padding-top: 27px; + padding-top: 47px; border-top: none; - .split-area{ + .split-area { overflow: hidden; .left-side { - width: 100%; - height: 100%; - flex: 0 0 auto; - position: relative; + width: 100%; + height: 100%; + flex: 0 0 auto; + position: relative; } } @@ -22,14 +22,14 @@ width: 100%; height: 100%; } - .rightDrawer{ - width:400px; + .rightDrawer { + width: 400px; height: 100%; flex: 0 0 auto; overflow: hidden; - -webkit-box-shadow: -1px 0px 3px 0px rgba(0,0,0,0.3); - -moz-box-shadow: -1px 0px 3px 0px rgba(0,0,0,0.3); - box-shadow: -1px 0px 3px 0px rgba(0,0,0,0.3); + -webkit-box-shadow: -1px 0px 3px 0px rgba(0, 0, 0, 0.3); + -moz-box-shadow: -1px 0px 3px 0px rgba(0, 0, 0, 0.3); + box-shadow: -1px 0px 3px 0px rgba(0, 0, 0, 0.3); } } .right-side { @@ -38,6 +38,6 @@ } } -::ng-deep .mat-drawer-inner-container{ +::ng-deep .mat-drawer-inner-container { overflow: unset !important; } diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 11052f81..30659e5f 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -223,7 +223,12 @@ $daesang-grey: ( .border-accent-color { border: 1px solid mat-color($accent); } - + .border-warn-color { + border: mat-color($warn); + } + .stroke-warn-color { + stroke: mat-color($warn, 900); + } // sass 정의 .mat-toolbar { background-color: mat-color($accent, B100); @@ -239,7 +244,7 @@ $daesang-grey: ( cursor: pointer; } - .policy{ + .policy { background-color: mat-color($accent, B100); } .mat-badge-accent .mat-badge-content { From c67dc1ca9c5881dec75603aa426462488ca98036 Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 22 Nov 2019 15:19:47 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[21=20=EC=A0=84=EB=8B=AC=EB=90=9C=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B0=94=EB=A1=9C=20=EB=B3=B4?= =?UTF-8?q?=EC=97=AC=EC=A7=80=EC=A7=80=20=EC=95=8A=EC=9D=8C]=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=B0=A9=20=EC=84=A0=ED=83=9D=20=EC=A0=84=EB=8B=AC?= =?UTF-8?q?=EC=8B=9C=20=EB=B0=9C=EC=83=9D=ED=95=A0=20=EC=86=8C=EC=A7=80=20?= =?UTF-8?q?=EC=9E=88=EC=9D=8C=20::=20=EB=B9=84=EB=8F=99=EA=B8=B0=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=EB=B0=A9=EC=8B=9D=EC=9D=84=20=EB=8F=99=EA=B8=B0?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/store/messenger/event/effects.ts | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts index 28a134f3..5d91b087 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts @@ -101,6 +101,7 @@ import { InfoResponse as FileInfoResponse, FileType } from '@ucap-webmessenger/protocol-file'; +import { RoomUserData } from '@ucap-webmessenger/protocol-sync'; @Injectable() export class Effects { @@ -393,21 +394,41 @@ export class Effects { () => { return this.actions$.pipe( ofType(forward), - map(action => { + withLatestFrom( + this.store.pipe( + select( + (state: any) => + state.messenger.sync.roomUserShort.entities as Dictionary< + RoomUserData + > + ) + ) + ), + tap(([action, roomUserList]) => { if (!!action.trgtRoomSeq) { this.store.dispatch( - ChatStore.selectedRoom({ roomSeq: action.trgtRoomSeq }) - ); - this.store.dispatch( - send({ + forwardAfterRoomOpen({ senderSeq: action.senderSeq, - req: { - roomSeq: action.trgtRoomSeq, - eventType: action.req.eventType, - sentMessage: action.req.sentMessage - } + req: action.req, + trgtUserSeqs: roomUserList[action.trgtRoomSeq].userInfos.map( + user => user.seq + ) }) ); + + // this.store.dispatch( + // ChatStore.selectedRoom({ roomSeq: action.trgtRoomSeq }) + // ); + // this.store.dispatch( + // send({ + // senderSeq: action.senderSeq, + // req: { + // roomSeq: action.trgtRoomSeq, + // eventType: action.req.eventType, + // sentMessage: action.req.sentMessage + // } + // }) + // ); } else if (!!action.trgtUserSeqs && action.trgtUserSeqs.length > 0) { // 방오픈 후 대화전달. this.store.dispatch(forwardAfterRoomOpen(action)); From 9cd463ccb74bcdb3fb5724a9b7ccb2075db0f76e Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 22 Nov 2019 15:49:39 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-side.component.html | 36 +++++++++++++++++++ .../left-sidenav/group.component.html | 10 ++++-- .../right-drawer/file-box.component.html | 4 +-- .../src/assets/scss/global/_default.scss | 2 +- .../src/lib/components/form.component.html | 6 ++-- 5 files changed, 50 insertions(+), 8 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 92259984..a08fbe2f 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 @@ -85,6 +85,34 @@
+ + + + +
+ + + +
+ + + @@ -157,6 +185,14 @@ id="tabs-3" class="left-side-tabs-contents" style="display: none;" + > + + + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html index fb6e40c6..85578952 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html @@ -92,11 +92,17 @@ 새 그룹 추가 -
+
+
+

쪽지

+
+ +
+
@@ -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' } From 4f31f81c2637d066d87bd22d9685a518683563d8 Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 22 Nov 2019 17:35:00 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/left-side.component.scss | 4 ++-- .../layouts/messenger/components/messages.component.ts | 4 ++-- .../src/assets/scss/global/_default.scss | 10 +++++++--- .../src/lib/components/profile.component.scss | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) 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 ae83b903..a1f03445 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 @@ -45,7 +45,7 @@ color: #ffffff; font-size: 11px; text-align: center; - + .myprofile-img { display: block; border-radius: 10px; @@ -66,7 +66,7 @@ .mat-tab-list { .mat-tab-labels { flex-flow: column; - height: 280px; + height: 360px; padding-top: 10px; border-bottom: none; .mat-tab-label { 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 f28c7f5b..446a790c 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 @@ -534,11 +534,11 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { FileViewerDialogResult >(FileViewerDialogComponent, { position: { - top: '30px' + top: '50px' }, maxWidth: '100vw', maxHeight: '100vh', - height: 'calc(100% - 30px)', + height: 'calc(100% - 50px)', width: '100%', hasBackdrop: false, panelClass: 'app-dialog-full', diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 53874b92..7b33d0ee 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -94,7 +94,7 @@ $daesang: ( 400: #26c6da, 500: #00bcd4, /*600: #00acc1,*/ 600: #00b6d5, - 700: #0097a7, + 700: #1ea7b9, 800: #0367a6, 900: #024873, A100: #84ffff, @@ -139,7 +139,7 @@ $daesang-grey: ( A100: #ffffff, A200: #eeeeee, A400: #bdbdbd, - A700: #616161, + A700: #1e2b3a, contrast: ( 50: $dark-primary-text, 100: $dark-primary-text, @@ -256,7 +256,11 @@ $daesang-grey: ( background-color: mat-color($accent, 400); } .mat-chip.mat-standard-chip.mat-chip-selected.mat-primary { - background-color: mat-color($accent, 200); + background-color: mat-color($accent, 700); + cursor: pointer; + .mat-chip-remove { + opacity: 0.6; + } } .global-menu { diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss index d345084b..60953038 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss @@ -28,8 +28,8 @@ .mat-card-header{ justify-content: center; padding-bottom: 40px; - background: #ce395d; - background: linear-gradient(to right, #345385, #ef4c73); + background: #76d9c5; + /*background: linear-gradient(to right, #345385, #ef4c73);*/ color: #ffffff; padding-top: 20px; width:100%; From 916b4cb75a1d4e7edd20494f7071e0a030b901d0 Mon Sep 17 00:00:00 2001 From: khk Date: Mon, 25 Nov 2019 09:05:35 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=ED=85=8C=EB=A7=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/app.theme.scss | 49 ++++++++++++++----- .../src/assets/scss/global/_default.scss | 18 ++++--- .../src/lib/components/form.component.html | 2 +- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/app.theme.scss b/projects/ucap-webmessenger-app/src/app/app.theme.scss index de5eae1a..e729fea0 100644 --- a/projects/ucap-webmessenger-app/src/app/app.theme.scss +++ b/projects/ucap-webmessenger-app/src/app/app.theme.scss @@ -103,28 +103,51 @@ body.theme-pink-dark { // ----------------------------------------------------------------------------------------------------- // Define the primary, accent and warn palettes -/*$pink-light-theme-primary-palette: mat-palette($mat-grey,800); -$pink-light-theme-accent-palette: mat-palette($lg-red, 400); -$pink-light-theme-warn-palette: mat-palette($mat-red);*/ +$lgRed-light-theme-primary-palette: mat-palette($mat-grey,800); +$lgRed-light-theme-accent-palette: mat-palette($lg-red, 400); +$lgRed-light-theme-warn-palette: mat-palette($mat-cyan); -$pink-light-theme-primary-palette: mat-palette($daesang-grey, 900); -$pink-light-theme-accent-palette: mat-palette($daesang); -$pink-light-theme-warn-palette: mat-palette($mat-orange); // Create the Material theme object -$pink-light-theme: mat-light-theme( - $pink-light-theme-primary-palette, - $pink-light-theme-accent-palette, - $pink-light-theme-warn-palette +$lgRed-light-theme: mat-light-theme( + $lgRed-light-theme-primary-palette, + $lgRed-light-theme-accent-palette, + $lgRed-light-theme-warn-palette +); + +// Add ".theme-pink-dark" class to the body to activate this theme. +// Class name must start with "theme-" !!! +body.theme-lgRed{ + // Generate the Angular Material theme + @include angular-material-theme($lgRed-light-theme); + + // Apply the theme to the user components + @include components-theme($lgRed-light-theme); + @include ucap-material-theme($lgRed-light-theme); +} + +// ----------------------------------------------------------------------------------------------------- +//aqua-blue-daesang +// ----------------------------------------------------------------------------------------------------- + +$aquaBlue-light-theme-primary-palette: mat-palette($daesang-grey, 900); +$aquaBlue-theme-accent-palette: mat-palette($aquaBlue-daesang); +$aquaBlue-theme-warn-palette: mat-palette($mat-orange); + +// Create the Material theme object +$aquaBlue-light-theme: mat-light-theme( + $aquaBlue-light-theme-primary-palette, + $aquaBlue-theme-accent-palette, + $aquaBlue-theme-warn-palette ); // Add ".theme-pink-dark" class to the body to activate this theme. // Class name must start with "theme-" !!! body.theme-default { // Generate the Angular Material theme - @include angular-material-theme($pink-light-theme); + @include angular-material-theme($aquaBlue-light-theme); // Apply the theme to the user components - @include components-theme($pink-light-theme); - @include ucap-material-theme($pink-light-theme); + @include components-theme($aquaBlue-light-theme); + @include ucap-material-theme($aquaBlue-light-theme); } diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 7b33d0ee..1eb86a62 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -46,12 +46,12 @@ ol { list-style: none; } $lg-red: ( - 50: #faf3f6, + 50: #fff9fc, 100: #f8bbd0, 200: #f48fb1, - 300: #f06292, - 400: #ef4c73, - /* 400: #ec407a,*/ 500: #ed097e, + /*300: #f06292,*/300:#ef4c73, + 400: #ec407a, + 500: #ed097e, 600: #d81b60, 700: #c2185b, 800: #ad1457, @@ -84,7 +84,7 @@ $lg-red: ( ) ); -$daesang: ( +$aquaBlue-daesang: ( 50: #f9feff, //#e0f7fa, 100: #b2ebf2, @@ -173,6 +173,10 @@ $daesang-grey: ( $gradient-light: mat-color($accent, G100); //basic + .bg-primary-darkest{ + background: mat-color($primary, 900); + color: mat-color($primary, default-contrast); + } .bg-primary-dark { background: mat-color($primary, 900); color: mat-color($primary, default-contrast); @@ -186,7 +190,7 @@ $daesang-grey: ( color: mat-color($primary, default-contrast); } .bg-accent-darkest { - background: mat-color($accent, 900); + background: mat-color($accent, 800); color: mat-color($primary, default-contrast); } .bg-accent-dark { @@ -209,7 +213,7 @@ $daesang-grey: ( color: mat-color($primary); } .text-accent-darkest { - color: mat-color($accent, 900); + color: mat-color($accent, 800); } .text-accent-color { color: mat-color($accent); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html index ea0261db..13aafa20 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html @@ -56,7 +56,7 @@