From c5d336a29771ae2dd8ca04dd68310e6725950960 Mon Sep 17 00:00:00 2001
From: khk <kanghk@biztechpartners.co.kr>
Date: Mon, 18 Nov 2019 09:15:20 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/left-side.component.html       |  2 +-
 .../components/left-side.component.scss       | 13 ++++--
 .../left-sidenav/organization.component.html  |  1 +
 .../left-sidenav/organization.component.scss  | 10 +++++
 .../chat/create-chat.dialog.component.scss    |  5 +++
 .../components/main.page.component.html       |  2 +
 .../components/main.page.component.scss       | 19 ++++++--
 .../src/assets/scss/global/_default.scss      | 43 ++++++++++++++++++-
 .../message-box/image.component.scss          |  4 ++
 .../src/lib/components/tree.component.html    |  8 ++--
 .../src/lib/components/tree.component.scss    | 34 ++++++++++++++-
 .../lib/components/list-item.component.scss   |  2 +-
 12 files changed, 128 insertions(+), 15 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 f5bb42f0..00b04f72 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
@@ -119,7 +119,7 @@
   </mat-tab-group>
 
   <div class="left-side-tabs-body">
-    <div #tabs id="tabs-0" style="display: block;">
+    <div #tabs id="tabs-0">
       <app-layout-chat-left-sidenav-group
         class="left-group-side"
         (newGroupAndMember)="onClickNewGroupAndMember()"
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 a6a2aa9a..5cc2c786 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
@@ -5,16 +5,22 @@
 
 ::ng-deep .mat-tab-body-wrapper,
 ::ng-deep .mat-tab-body {
-  height: 0%;
-  width: 0%;
+  height: 100%;
+  width: 100%;
 }
 ::ng-deep .mat-tab-header {
   border-bottom: none !important;
 }
 
 .left-side-tabs-body {
+  position: relative;
   height: 100%;
-  width: 100%;
+  width: calc(100% - 70px);
+  div[id^=tabs] {
+    height:100%;
+    width:100%;
+    position: relative;
+  }
 }
 
 .container {
@@ -41,6 +47,7 @@
         height: 280px;
         padding-top: 10px;
         .mat-tab-label {
+          width:100%;
           height: 80px;
           padding: 0 16px;
         }
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
index 7bb113a8..4f81684f 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
@@ -17,6 +17,7 @@
         [oraganizationList]="departmentInfoList$ | async"
         [loginRes]="loginRes"
         (selected)="onSelectedOrganization($event)"
+        class="tab-tree-frame"
       ></ucap-organization-tree>
     </perfect-scrollbar>
   </div>
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss
index 032dc9bf..11cfc5e5 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss
@@ -154,3 +154,13 @@
     }
   }
 }
+::ng-deep .oraganization-tab{
+ .oraganization-tab-tree,
+ .select-list{
+  .ps{
+    .ps-content{
+      height:100%;
+    }
+  }
+}
+}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss
index 2452c863..361aa4e1 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss
@@ -15,6 +15,10 @@
       height:100% !important;
       border-right: 1px solid #dddddd;
       overflow: auto;
+      .tab-tree-frame{
+        width:100%;
+        height:100%;
+      }
     }
     .select-list {
       display: inline-flex;
@@ -66,6 +70,7 @@
 }
 ::ng-deep .mat-dialog-container .mat-tab-body-wrapper {
   height: 380px;
+  width:100%;
 }
 .list-panel{
   overflow: auto;
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 29a0e328..0572dc09 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
@@ -12,6 +12,7 @@
       [size]="leftSideComponentWidth"
       minSize="300"
       maxSize="500"
+      class="split-area"
     >
       <div class="left-side">
         <app-layout-messenger-left-side
@@ -41,6 +42,7 @@
           mode="side"
           position="end"
           (openedChange)="onOpenedChange($event)"
+          class="rightDrawer"
         >
           <app-layout-messenger-right-drawer
             [selectedRightDrawer]="selectedRightDrawer$ | async"
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 e8ec4058..8fe04e4d 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,29 +1,42 @@
 .container {
-  height: 100%;
+  height:100%;
   display: flex;
   flex-flow: row;
   padding-top: 30px;
   border: 3px solid #4f4f4f;
   border-top: none;
 
-  .left-side {
+  .split-area{
+    overflow: hidden;
+    .left-side {
     width: 100%;
     height: 100%;
     flex: 0 0 auto;
     position: relative;
+    }
   }
+
   .contents {
     flex: 1 1 auto;
     min-width: 400px;
     height: 100%;
-
     .messages {
       width: 100%;
       height: 100%;
     }
+    .rightDrawer{
+      width:420px;
+      height: 100%;
+      flex: 0 0 auto;
+      overflow: hidden;
+    }
   }
   .right-side {
     height: 100%;
     flex: 0 0 auto;
   }
 }
+
+::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 02c3722d..4c678903 100644
--- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
+++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
@@ -46,7 +46,7 @@ ol {
   list-style: none;
 }
 $lg-red: (
-  50: #ffffff,
+  50: #faf3f6,
   100: #f8bbd0,
   200: #f48fb1,
   300: #f06292,
@@ -78,6 +78,39 @@ $lg-red: (
   )
 );
 
+$daesang: (
+  50: #e0f7fa,
+  100: #b2ebf2,
+  200: #80deea,
+  300: #4dd0e1,
+  400: #26c6da,
+  500: #00bcd4,
+  /*600: #00acc1,*/ 600: #00b6d5,
+  700: #0097a7,
+  800: #00838f,
+  900: #006064,
+  A100: #84ffff,
+  A200: #18ffff,
+  A400: #00e5ff,
+  A700: #00b8d4,
+  contrast: (
+    50: $dark-primary-text,
+    100: $dark-primary-text,
+    200: $dark-primary-text,
+    300: $dark-primary-text,
+    400: $dark-primary-text,
+    500: $light-primary-text,
+    600: $light-primary-text,
+    700: $light-primary-text,
+    800: $light-primary-text,
+    900: $light-primary-text,
+    A100: $dark-primary-text,
+    A200: $dark-primary-text,
+    A400: $dark-primary-text,
+    A700: $dark-primary-text,
+  )
+);
+
 @mixin ucap-material-theme($theme) {
   @include ucap-core-theme($theme);
 }
@@ -101,10 +134,18 @@ $lg-red: (
     background: mat-color($primary);
     color: mat-color($primary, default-contrast);
   }
+  .bg-accent-darkest {
+    background: mat-color($accent, 900);
+    color: mat-color($primary, default-contrast);
+  }
   .bg-accent-dark {
     background: mat-color($accent, 600);
     color: mat-color($primary, default-contrast);
   }
+  .bg-accent-brightest {
+    background: mat-color($accent, 50);
+    color: mat-color($primary, $dark-primary-text);
+  }
   .bg-accent-light {
     background: mat-color($accent, 300) !important;
     color: mat-color($primary, default-contrast);
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.scss
index 98793e11..b8b6c028 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/image.component.scss
@@ -1,3 +1,7 @@
 .bubble-main{
   padding:10px;
+  img{
+    height:140px;
+    width:auto;
+  }
 }
\ No newline at end of file
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html
index e7a5e0f6..6f61920c 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html
@@ -1,4 +1,4 @@
-<cdk-virtual-scroll-viewport #cvsvOrganization itemSize="48" fxFlexFill>
+<cdk-virtual-scroll-viewport #cvsvOrganization itemSize="40" fxFlexFill>
   <ng-container
     *cdkVirtualFor="let node of dataSource.expandedData$"
   ></ng-container>
@@ -9,9 +9,9 @@
     class="organization-tree"
   >
     <!-- This is the tree node template for leaf nodes -->
-    <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding>
+    <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  class="mat-tree-last-node">
       <li>
-        <div class="mat-tree-node" (click)="onClickNode(node)">
+        <div (click)="onClickNode(node)">
           {{ node.name }}
         </div>
       </li>
@@ -23,7 +23,7 @@
       class="tree-node-frame"
     >
       <li>
-        <div class="mat-tree-node" (click)="onClickNode(node)" class="path">
+        <div  (click)="onClickNode(node)" class="path">
           <span class="horizontal-line"></span>
           <button
             mat-icon-button
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
index 1f74f884..601cd534 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
@@ -6,14 +6,13 @@
     margin-top: 0;
     margin-bottom: 0;
     list-style-type: none;
-    margin-left: 10px;
   }
   .organization-tree-node-invisible {
     display: none;
   }
 }
 
-.tree-node-frame {
+/*.tree-node-frame {
   li {
     .path {
       .horizontal-line {
@@ -33,6 +32,37 @@
       box-shadow: 0 1px 4px rgba(32, 33, 36, 0.1);
     }
   }
+}*/
+.organization-tree{
+  .tree-node-frame {
+    height:40px;
+    min-height:40px;
+    li{
+      display:flex;
+      align-items: center;
+      cursor:pointer;
+      width:100%;
+    }
+  }
+  .mat-tree-last-node{
+    height:30px;
+    min-height:30px;
+    font-size: 13px;
+    li{
+      display:flex;
+      align-items: center;
+      width:100%;
+      height:100%;
+      padding-left:10px;
+      cursor:pointer;
+      &:hover {
+        background-color: #f4f4f4;
+        border: 1px solid #cccccc;
+        border-radius: 4px;
+        box-shadow: 0 1px 4px rgba(32, 33, 36, 0.1);
+      }
+    }
+  }
 }
 
 ul .tree-node-frame li .path > .horizontal-line {
diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss
index ec84f926..302b435c 100644
--- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss
+++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss
@@ -107,7 +107,7 @@ $thumbnail-msize: 40px;
     display: flex;
     margin: 0;
     padding: 0;
-    width: calc(100% - 60px);
+
     .detail {
       flex-direction: column;
       width: calc(100% - 80px);