From 6199b398b1b10172b7c479ba15ec077edcb1b9b6 Mon Sep 17 00:00:00 2001 From: khk Date: Thu, 6 Feb 2020 09:57:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/create-chat.dialog.component.html | 2 +- .../src/lib/components/profile.component.html | 8 ++--- .../src/lib/components/profile.component.scss | 30 ++++++++++++++----- .../src/assets/scss/partials/_dialogs.scss | 25 +--------------- 4 files changed, 29 insertions(+), 36 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index b62a3312..c3243101 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -1,4 +1,4 @@ - + {{ data.title }} +
  • {{ 'profile.fieldCompany' | translate }}
    @@ -384,8 +388,4 @@ - - 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 c8796a5d..dcf3232c 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 @@ -1,3 +1,16 @@ +$desktop-l-width: 1440px; +$tablet-l-width: 1024px; +$tablet-s-width: 768px; +$mob-l-width: 640px; +$login-max-height: 800px; +// 태블릿 + +@mixin tab { + @media screen and (max-width: #{$tablet-l-width}) { + @content; + } +} + @mixin ellipsis($row) { overflow: hidden; text-overflow: ellipsis; @@ -22,7 +35,7 @@ display: flex; flex-flow: row; flex: 0 0 auto; - width: 700px; + width: 100%; height: 450px; position: relative; padding: 0; @@ -30,7 +43,7 @@ position: relative; justify-content: flex-start; flex-flow: column; - width: 260px; + width: 38%; height: 100%; background: #64cddf; color: #ffffff; @@ -150,9 +163,9 @@ } .mat-card-content { position: relative; - width: 440px; + width: 62%; height: 100%; - padding: 10px 0; + padding-bottom: 10px; margin-left: 30px; ul { display: flex; @@ -260,10 +273,13 @@ justify-content: center; align-self: center; margin-left: 8px; + display: inline-flex; + @media screen and (max-width: #{$tablet-s-width}) { + display: none; + } } } - .btn-dialog-close { - -} \ No newline at end of file + margin-left: auto; +} diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss index 494657e2..07689783 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss @@ -1,24 +1 @@ -/*.dialog-org { - .oraganization-tab { - width: 100%; - height:380px; - border-bottom: 1px solid #dddddd; - .oraganization-tab-tree { - display: inline-flex; - width: 50%; - height:100%; - border-right: 1px solid #dddddd; - overflow: auto; - } - .select-list { - display: inline-flex; - flex-direction: column; - width: 50%; - height:100%; - overflow: auto; - .search-list { - overflow: auto; - } - } - } -}*/ \ No newline at end of file +$tablet-s-width: 768px; From 7e6099a777904ddaa80048c159fff8216f5498d3 Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 6 Feb 2020 10:24:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?215,=20216,=20218?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-sidenav/chat.component.ts | 6 ++-- .../left-sidenav/organization.component.ts | 4 +++ .../chat/create-chat.dialog.component.html | 13 +++++--- .../components/user-list-item.component.html | 1 + .../components/user-list-item.component.ts | 30 +++++++++---------- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts index 53cdeb55..59012b13 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts @@ -137,7 +137,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { for (const ru of roomUserShort) { for (const u of ru.userInfos) { if (u.seq !== this.loginRes.userSeq) { - if (!!u.name && '' !== u.name.trim()) { + if (!!u.name && '' !== u.name.trim() && u.isJoinRoom) { recommendedWordList.push(u.name); } } @@ -285,7 +285,9 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { value => roomInfo.roomSeq === value.roomSeq ); if (-1 < i) { - return this.roomUserShortList[i].userInfos; + return this.roomUserShortList[i].userInfos.filter( + user => user.isJoinRoom + ); } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index b5a979a2..2a2b75c8 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -608,6 +608,10 @@ export class OrganizationComponent event.preventDefault(); event.stopPropagation(); + if (userInfo.seq === this.loginRes.userSeq) { + return; + } + this.orgUserContextMenuPosition.x = event.clientX + 'px'; this.orgUserContextMenuPosition.y = event.clientY + 'px'; this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse'); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index c3243101..aebb11ec 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -59,7 +59,9 @@ --> - +
    @@ -88,6 +90,7 @@ device_hub--> - +
    - +