From 2a385a7b7b2dd24cb5b9d177a09234e1944e34fc Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 13 Feb 2020 19:44:11 +0900 Subject: [PATCH 1/3] version update to 0.0.21 --- package.json | 2 +- .../src/app/app-translate.module.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0df2281f..237f6581 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucap-webmessenger", - "version": "0.0.20", + "version": "0.0.21", "author": { "name": "LG CNS", "email": "lgucap@lgcns.com" diff --git a/projects/ucap-webmessenger-app/src/app/app-translate.module.ts b/projects/ucap-webmessenger-app/src/app/app-translate.module.ts index 9034d687..b5e5d83d 100644 --- a/projects/ucap-webmessenger-app/src/app/app-translate.module.ts +++ b/projects/ucap-webmessenger-app/src/app/app-translate.module.ts @@ -19,8 +19,15 @@ export function createTranslateLoader(nativeService: NativeService) { break; case NativeType.Electron: prefix = environment.production - ? '/dist/ucap-webmessenger-app/assets/i18n/' + ? // normal + '/dist/ucap-webmessenger-app/assets/i18n/' : '/projects/ucap-webmessenger-app/src/assets/i18n/'; + // installer > aws + // ? '/dist/ucap-webmessenger-app/assets/i18n/' + // : '/dist/ucap-webmessenger-app/assets/i18n/'; + // vscode > prod + // ? '/projects/ucap-webmessenger-app/src/assets/i18n/' + // : '/projects/ucap-webmessenger-app/src/assets/i18n/'; break; From 771b88b1b308afabff0a79271ff246907268244e Mon Sep 17 00:00:00 2001 From: khk Date: Thu, 13 Feb 2020 20:03:24 +0900 Subject: [PATCH 2/3] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(6?= =?UTF-8?q?=EC=B0=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-nav.component.scss | 15 --- .../left-sidenav/message.component.html | 4 +- .../left-sidenav/message.component.scss | 15 --- .../components/right-drawer.component.scss | 4 +- .../right-drawer/album-box.component.html | 118 +++++++++--------- .../right-drawer/album-box.component.scss | 1 + .../right-drawer/file-box.component.html | 1 + .../right-drawer/file-box.component.scss | 10 -- .../right-drawer/notice.component.scss | 2 +- .../native/components/top-bar.component.html | 12 +- .../native/components/top-bar.component.scss | 44 +++---- .../components/main.page.component.scss | 14 +-- .../src/assets/scss/global/_default.scss | 84 +++++++++++-- .../lib/components/message-box.component.scss | 19 --- .../message-box/schedule.component.scss | 4 - .../video-conference.component.scss | 4 - .../src/lib/components/search.component.scss | 8 +- .../src/lib/components/write.component.html | 55 ++------ .../src/lib/components/write.component.scss | 39 +++--- .../src/lib/components/profile.component.html | 4 +- .../src/lib/components/profile.component.scss | 13 +- 21 files changed, 212 insertions(+), 258 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss index 1fdb3d35..643be540 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss @@ -75,18 +75,3 @@ } } } - -// perfect-scrollbar right로 2px이동 -::ng-deep .ps__rail-y { - & > .ps__thumb-y { - margin-right: -2px; - } -} - -::ng-deep .cdk-virtual-scroll-orientation-vertical { - .cdk-virtual-scroll-content-wrapper { - width: 100%; - height: 100%; - contain: unset; - } -} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html index d83cb5cb..9c8f536e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html @@ -44,7 +44,7 @@ animationDuration="0ms" [selectedIndex]="0" (selectedIndexChange)="onSelectedIndexChange($event)" - class="message-tab" + class="message-tab tab_num3" > @@ -161,7 +161,7 @@ -
+
@@ -101,71 +102,70 @@
-
-
-
- -
- - - - +
+
+
- -
-
- - - - - - - -
-
-
+
+ + + + +
+
+
+ +
+
+ + + + + + + +
+
+
-
+
- +
-->
-
+
{{ attachment.name }} + >{{ attachment.name }}
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss index b23f81b3..cf69c853 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss @@ -128,25 +128,30 @@ margin-top: 10px; } } -.attach-file { - display: flex; - flex-flow: row; - flex: 1 1 auto; - .mat-list-item-content { - padding: 0 !important; + +.attach-file-list { + width: 100%; + .attach-file { + display: flex; + flex-flow: row; + flex: 1 1 auto; + width: 100%; + margin: 0 -16px; + align-items: center; + font-size: 0.9em; + border-bottom: 1px dotted #dddddd; + span { + margin-right: 6px; + flex: 0 0 auto; + } .file-name { display: flex; - width: 100%; - align-items: center; - font-size: 0.9em; - border-bottom: 1px dotted #dddddd; - span { - margin-right: 6px; - } - button { - width: 24px; - margin-left: auto; - } + flex: 1 1 auto; + } + button { + flex: 0 0 auto; + width: 24px; + margin-left: auto; } } } diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index 3f2d8d03..7517f517 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -12,7 +12,7 @@ Date: Thu, 13 Feb 2020 20:10:52 +0900 Subject: [PATCH 3/3] bugfix --- .../src/lib/components/list-item.component.ts | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts index 7a8c0f4f..232bafd4 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts @@ -89,11 +89,13 @@ export class ListItemComponent implements OnInit { this.defaultPath = 'assets/images/img_groupphoto_80.png'; break; case RoomType.Mytalk: - const me = this.roomUserInfo.filter( - v => v.seq === this.loginRes.userSeq - ); - if (!!me && me.length > 0) { - this.imagePath = me[0].profileImageFile; + if (!!this.roomUserInfo && !!this.loginRes) { + const me = this.roomUserInfo.filter( + v => v.seq === this.loginRes.userSeq + ); + if (!!me && me.length > 0) { + this.imagePath = me[0].profileImageFile; + } } break; case RoomType.Single: @@ -101,11 +103,13 @@ export class ListItemComponent implements OnInit { case RoomType.Allim: case RoomType.Allim_Elephant: case RoomType.Allim_TMS: - const others = this.roomUserInfo.filter( - v => v.seq !== this.loginRes.userSeq - ); - if (!!others && others.length > 0) { - this.imagePath = others[0].profileImageFile; + if (!!this.roomUserInfo && !!this.loginRes) { + const others = this.roomUserInfo.filter( + v => v.seq !== this.loginRes.userSeq + ); + if (!!others && others.length > 0) { + this.imagePath = others[0].profileImageFile; + } } break; } @@ -113,13 +117,15 @@ export class ListItemComponent implements OnInit { get _roomUserInfos() { if (this.roomInfo.roomType === RoomType.Single) { - return this.roomUserInfo.filter(roomUserInfo => { - return this.loginRes.userSeq !== roomUserInfo.seq; - }); + return this.roomUserInfo.filter( + roomUserInfo => + !!this.loginRes && this.loginRes.userSeq !== roomUserInfo.seq + ); } else { return this.roomUserInfo .filter(roomUserInfo => { return ( + !!this.loginRes && this.loginRes.userSeq !== roomUserInfo.seq && roomUserInfo.isJoinRoom );