Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html

@@ -4,7 +4,120 @@
   </div>
   <div class="app-layout-native-title-bar-title">DS Talk</div>
   <div class="app-layout-native-title-bar-spacer"></div>
+  <div class="btn-area">
     <div *ngIf="!!loginRes" class="app-layout-native-title-bar-link">
+      <!--s[추가된 전체 웹링크] weblink-->
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="웹하드"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink webhard">웹하드</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="DSP"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink dsp">DSP</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="SMS"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink sms">SMS</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="화상회의"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink vc">화상회의</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="EP"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink ep">EP</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="S&OM"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink S_OM">S&OM</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="코끼리"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink elephant">코끼리</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="IT서비스"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink it-service">IT</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="개인속보"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink Personal-news">NEWS</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="메일"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink mail">메일</span>
+      </button>
+      <button
+        mat-icon-button
+        *ngFor="let link of weblink"
+        class="button"
+        [matTooltip]="link.title"
+        matTooltip="결제"
+        (click)="onClickWebLink(link)"
+      >
+        <span class="weblink approved">결제</span>
+      </button>
+      <!--E[추가된 전체 웹링크] weblink-->
       <button
         mat-icon-button
         *ngFor="let link of weblink"
@@ -24,7 +137,7 @@
           />
         </svg>
       </button>
-    <span class="stroke-bar"></span>
+
       <button
         mat-icon-button
         *ngFor="let link of weblinkBadgeTypes"
@@ -49,9 +162,6 @@
           />
         </svg>
       </button>
-
-    <span class="stroke-bar"></span>
-
       <button
         *ngIf="updateInfo$ | async as updateInfo"
         mat-icon-button
@@ -77,7 +187,8 @@
           ></path>
         </svg>
       </button>
-
+      <span class="stroke-bar"></span>
+      <!--S[삭제예정] 마이프로필 설정을 이동
       <button
         mat-icon-button
         class="button app-layout-native-title-bar-setting"
@@ -113,7 +224,7 @@
           stroke-width="1.5"
           stroke-linecap="butt"
           stroke-linejoin="round"
-        alt="환경설정"
+           matTooltip="환경설정"
         >
           <circle cx="12" cy="12" r="3"></circle>
           <path
@@ -138,7 +249,7 @@
           stroke-width="1.5"
           stroke-linecap="butt"
           stroke-linejoin="round"
-        alt="로그아웃"
+          matTooltip="로그아웃"
           class="stroke-warn-color"
         >
           <path
@@ -146,14 +257,13 @@
           />
         </svg>
       </button>
-
+      E[삭제예정] 마이프로필 설정을 이동-->
       <ucap-profile-my-profile-widget
         [profileImageRoot]="sessionVerinfo.profileRoot"
         [profileImageFile]="getMyProfileImageWidget()"
         (openProfile)="onClickOpenProfile()"
         class="myprofile"
       ></ucap-profile-my-profile-widget>
-    <span class="stroke-bar"></span>
     </div>
     <div class="app-layout-native-title-bar-actions">
       <button
@@ -248,4 +358,5 @@
         </svg>
       </button>
     </div>
+  </div>
 </mat-toolbar>

projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss

@@ -27,11 +27,15 @@
     .app-layout-native-title-bar-spacer {
       flex: 1 1 auto;
     }
-
+    .btn-area {
+      display: flex;
+      margin-left: auto;
+      flex-flow: row;
+      justify-items: center;
       .app-layout-native-title-bar-link {
         align-items: center;
         position: relative;
-
+        display: flex;
         .stroke-bar {
           width: 1px;
           height: 20px;
@@ -44,19 +48,49 @@
           outline: 0;
           cursor: pointer;
           border: none;
-        height: 28px;
+          height: 30px;
-        min-width: 28px;
+          min-width: 30px;
-        max-width: 28px;
+          max-width: 30px;
-        padding: 5px;
+          padding: 3px;
           line-height: 10px;
-        border-radius: 0;
+          background-color: #ffffff;
-        background: transparent;
+          border-radius: 50%;
           transition: background 0.2s linear, color 0.2s linear;
           text-align: center;
           font-size: 10px;
           vertical-align: middle;
-        margin-left: 10px;
+          margin-left: 14px;
-        transform: translateY(-2px);
+          .weblink {
+            display: inline-flex;
+            line-height: 24px;
+            font-size: 12px;
+            font-weight: bold;
+            text-align: center;
+            width: 24px;
+            height: 24px;
+            background-repeat: no-repeat;
+            background-position: 50% 50%;
+            text-indent: -1000000px;
+            justify-content: center;
+            &.dsp {
+              text-indent: 0;
+            }
+            &.sms {
+              text-indent: 0;
+              letter-spacing: -1px;
+            }
+            &.ep,
+            &.it-service {
+              text-indent: 0;
+              font-size: 13px;
+            }
+            &.S_OM,
+            &.Personal-news {
+              text-indent: 0;
+              font-size: 11px;
+              letter-spacing: -1px;
+            }
+          }
 
           &.app-layout-native-title-bar-logout,
           &.app-layout-native-title-bar-setting {
@@ -72,7 +106,6 @@
       .app-layout-native-title-bar-actions {
         align-items: center;
         position: relative;
-
         .button {
           -webkit-app-region: no-drag;
           outline: 0;
@@ -131,4 +164,25 @@
         }
       }
     }
+  }
 }
+@mixin weblink($color) {
+  $color: rgba($color, 0.999);
+  .webhard {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M4.5,4.3L1.7,10v5c0,0.9,0.7,1.7,1.7,1.7h13.3c0.9,0,1.7-0.7,1.7-1.7v-5l-2.9-5.7c-0.3-0.6-0.9-0.9-1.5-0.9H6 C5.4,3.3,4.8,3.7,4.5,4.3z'/%3E%3Cline class='st0' x1='5' y1='13.3' x2='5' y2='13.3'/%3E%3Cline class='st0' x1='8.3' y1='13.3' x2='8.3' y2='13.3'/%3E%3C/svg%3E");
+  }
+  .vc {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-video'%3E%3Cpolygon points='23 7 16 12 23 17 23 7'%3E%3C/polygon%3E%3Crect x='1' y='5' width='15' height='14' rx='2' ry='2'%3E%3C/rect%3E%3C/svg%3E");
+  }
+  .elephant {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='#{$color}' stroke='none' xml:space='preserve'%3E%3Cpath d='M19.1,5c-1,0-2,0.4-2.7,1.1c-1.2-1-2.9-1.5-4.7-1.5c-1.7,0-3.3,0.5-4.5,1.4C6.6,5.3,5.7,5,4.8,5C2.6,5,0.9,6.7,0.9,8.8 c0,1.1,1.1,4.6,2.7,5.7c0.3,0.2,0.7,0.3,1.1,0.3c0.2,0,0.4,0,0.6-0.1c0.5-0.2,0.9-0.4,1.3-0.6c0.6,0.6,1.3,1,2.1,1.4l0.8,1.2 c0.3,0.5,0.5,1.1,0.6,1.7H9.2c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2h0.4c2.5,0,4.6-1.7,5.2-4.1l0.4-1.4c0.7-0.4,1.4-0.8,1.9-1.3 c0.4,0.3,0.9,0.5,1.5,0.8c0.2,0.1,0.4,0.1,0.6,0.1c0.4,0,0.7-0.1,1.1-0.3c1.6-1.1,2.7-4.6,2.7-5.7C22.9,6.7,21.2,5,19.1,5z M5,14.1 c-0.3,0.1-0.7,0.1-1-0.2C2.7,13,1.7,9.8,1.7,8.8c0-1.7,1.4-3.1,3.1-3.1c0.7,0,1.4,0.3,2,0.7C6.4,6.8,6.1,7.1,5.8,7.5 C5.5,7.3,5.1,7.2,4.8,7.2c-1.2,0-2.1,1-2.1,2.1c0,0.6,0.6,2.5,1.5,3.1c0.2,0.1,0.4,0.2,0.6,0.2c0.1,0,0.3,0,0.4-0.1 c0.1,0,0.2-0.1,0.3-0.1c0.2,0.4,0.4,0.8,0.7,1.1C5.8,13.8,5.4,13.9,5,14.1z M5.1,11.8c-0.1,0-0.2,0.1-0.3,0.1 c-0.1,0-0.2,0.1-0.4-0.1c-0.6-0.4-1.2-2-1.2-2.5c0-0.8,0.6-1.4,1.4-1.4C5,7.9,5.2,8,5.4,8.1c-0.3,0.7-0.5,1.4-0.5,2.2 C4.9,10.8,5,11.3,5.1,11.8z M14.7,14.8c-0.1,0-0.2,0.1-0.2,0.2l-0.4,1.6c-0.5,2.1-2.4,3.5-4.5,3.5H9.2c-0.3,0-0.5-0.2-0.5-0.5 c0-0.3,0.2-0.5,0.5-0.5h1.1c0.3,0,0.5-0.2,0.5-0.5c0-0.8-0.2-1.6-0.7-2.3L9.3,15c0-0.1-0.1-0.1-0.2-0.1c-0.8-0.3-1.5-0.8-2.1-1.3 c0,0,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.4-0.4-0.7-0.9-0.9-1.4c0,0,0-0.1,0-0.1c-0.2-0.5-0.3-1-0.3-1.5c0-2.8,2.7-5,6.1-5 s6.1,2.3,6.1,5C17.9,12.2,16.7,13.9,14.7,14.8z M18.2,8.3c0.3-0.2,0.6-0.4,0.9-0.4c0.8,0,1.4,0.6,1.4,1.4c0,0.5-0.5,2.1-1.2,2.5 C19.2,12,19.1,12,19,11.9c-0.2-0.1-0.4-0.2-0.6-0.3c0.1-0.4,0.2-0.9,0.2-1.3C18.6,9.6,18.5,8.9,18.2,8.3z M19.8,13.9 c-0.3,0.2-0.7,0.3-1,0.2c-0.5-0.2-0.9-0.4-1.3-0.7c0.3-0.3,0.5-0.7,0.7-1.1c0.2,0.1,0.4,0.2,0.6,0.3c0.1,0.1,0.3,0.1,0.4,0.1 c0.2,0,0.4-0.1,0.6-0.2c0.9-0.6,1.5-2.5,1.5-3.1c0-1.2-1-2.1-2.1-2.1c-0.5,0-0.9,0.2-1.3,0.4c-0.2-0.4-0.5-0.7-0.9-1.1 c0.6-0.6,1.3-0.9,2.1-0.9c1.7,0,3.1,1.4,3.1,3.1C22.2,9.8,21.1,13,19.8,13.9z'/%3E%3Cpath d='M11.5,16.5h1c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5S11.2,16.5,11.5,16.5z'/%3E%3Cpath d='M13,17.6H11c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5H13c0.3,0,0.5-0.2,0.5-0.5S13.3,17.6,13,17.6z'/%3E%3Cpath d='M17,12.4c0,0.5-0.4,0.8-0.8,0.8c-0.5,0-0.8-0.4-0.8-0.8s0.4-0.8,0.8-0.8C16.7,11.6,17,12,17,12.4z'/%3E%3Cpath d='M8.5,12.4c0,0.5-0.4,0.8-0.8,0.8c-0.5,0-0.8-0.4-0.8-0.8s0.4-0.8,0.8-0.8C8.1,11.6,8.5,12,8.5,12.4z'/%3E%3C/svg%3E");
+  }
+  .mail {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E");
+  }
+  .approved {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='#{$color}' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' %3E%3Cpath d='M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z'%3E%3C/path%3E%3Cline x1='16' y1='8' x2='2' y2='22'%3E%3C/line%3E%3Cline x1='17.5' y1='15' x2='9' y2='15'%3E%3C/line%3E%3C/svg%3E");
+  }
+}
+
+@include weblink(#425888);

projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.html

@@ -10,6 +10,7 @@
   </span>
   <div class="btn-setting">
     <span class="presence pcOff"></span>
+    <button>
       <svg
         xmlns="http://www.w3.org/2000/svg"
         width="18"
@@ -23,5 +24,6 @@
       >
         <path d="M6 9l6 6 6-6" />
       </svg>
+    </button>
   </div>
 </div>

projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.scss

@@ -3,7 +3,6 @@
   flex-flow: row;
   width: 60px;
   height: 30px;
-  bottom: 10px;
   color: #ffffff;
   font-size: 11px;
   justify-items: flex-end;
@@ -28,6 +27,7 @@
   }
   .btn-setting {
     position: absolute;
+    height: 100%;
     bottom: 0;
     display: inline-flex;
     justify-items: flex-end;
@@ -36,14 +36,23 @@
       display: inline-block;
       bottom: 0;
       width: 10px;
-      height: 11px;
+      height: 10px;
       border: 1px solid #ffffff;
       align-self: flex-end;
     }
+    button {
+      cursor: pointer;
+      width: 20px;
+      height: 100%;
+      align-items: center;
+      background: none;
+      border: none;
       svg {
+        stroke: #ffffff;
         &.on {
           transform: rotate(180deg);
         }
       }
     }
+  }
 }