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

electron-builder.json

@@ -38,7 +38,7 @@
   },
   "publish": {
     "provider": "generic",
-    "url": "https://messenger.daesang.com/AppDist/pc"
+    "url": "https://dstalk.daesang.com/AppDist/pc"
   },
   "mac": {
     "target": ["default"],

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html

@@ -201,7 +201,7 @@
             </div>
           </mat-tab>
         </mat-tab-group>
-      </div>
+
       <div *ngIf="isShowSelectedUserList" class="list-chip">
         <mat-chip-list aria-label="User selection">
           <mat-chip
@@ -221,6 +221,7 @@
         {{ 'common.units.persons' | translate }}</span
       >
     </div>
+    </div>
   </mat-card-content>
   <mat-card-actions class="button-farm flex-row">
     <button

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss

@@ -1,4 +1,5 @@
 .dialog-creat-chat {
+  height: 100%;
   & > .mat-card-header {
     .btn-dialog-close {
       font-size: 20px;
@@ -9,10 +10,36 @@
     }
   }
   & > .mat-card-content {
-    height: 568px;
+    //height: 568px;
+    position: relative;
+    .container {
+      height: 100%;
+      .container-frame {
+        height: 530px;
+      }
+    }
+
+    //그룹이름 폼 있는 경우
+    .newgroup-form {
+      height: 70px;
+      + .container {
+        height: calc(100% - 70px);
+        .container-frame {
+          .mat-tab-group {
+            & > .mat-tab-body {
+              height: 380px;
+            }
+          }
+        }
+      }
+    }
   }
   & > .mat-tab-body-wrapper {
     height: calc(100% - 50px);
+    .mat-tag-body {
+      & > .dialog-tab-orglist {
+      }
+    }
   }
 }
 
@@ -34,7 +61,7 @@
 }
 
 .dialog-tab-chatlist {
-  height: 518px;
+  height: 528px;
   width: 100%;
   .chat {
     width: 100%;
@@ -52,7 +79,7 @@
     }
     &-tab {
       width: 100%;
-      height: 380px;
+      height: 100%;
       border-bottom: 1px solid #dddddd;
       position: relative;
       &-tree {
@@ -88,6 +115,7 @@
   border: 1px solid #dddddd;
   overflow: auto;
   background-color: #f9f9f9;
+  margin-top: 10px;
 }
 .mat-chip.mat-standard-chip .mat-chip-remove {
   line-height: 24px;
@@ -116,11 +144,13 @@
   }
 }
 
-:ng-deep .mat-dialog-container {
+:ng-deep .dialog-creat-chat {
-  .mat-tab-body-wrapper {
+  & > .mat-tab-body-wrapper {
     .mat-tab-body {
-      width: 100%;
+      height: 380px;
-      height: 100%;
+      &:nth-child(3) {
+        height: 480px;
+      }
       .mat-tab-body-content {
         width: 100%;
         height: 100%;

projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts

@@ -98,7 +98,7 @@ export const environment: Environment = {
   commonApiModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 443
     },
     urls: commonApiUrls,
@@ -108,7 +108,7 @@ export const environment: Environment = {
   publicApiModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 443
     },
     urls: publicApiUrls
@@ -117,7 +117,7 @@ export const environment: Environment = {
   externalApiModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 443
     },
     urls: externalApiUrls
@@ -126,7 +126,7 @@ export const environment: Environment = {
   messageApiModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 9097
     },
     urls: messageApiUrls
@@ -135,7 +135,7 @@ export const environment: Environment = {
   promptApiModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 9097
     },
     urls: promptUrls
@@ -144,7 +144,7 @@ export const environment: Environment = {
   piModuleConfig: {
     hostConfig: {
       protocol: 'https',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 9097
     },
     urls: piUrls
@@ -153,7 +153,7 @@ export const environment: Environment = {
   protocolModuleConfig: {
     hostConfig: {
       protocol: 'ws',
-      domain: 'messenger.daesang.com',
+      domain: 'dstalk.daesang.com',
       port: 8080
     },
     urls: protocolUrls,