@chat21/chat21-ionic 3.0.78 → 3.0.79-rc.2

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.scss

@@ -1,11 +1,18 @@
 
 ion-header {
-    --ion-background-color: #fff;
-    border-bottom-style: solid;
-    border-color: var(--light-gray);
-    border-bottom-width: thin;
+    border: none;
+    &.mobile{
+        --ion-background-color: #fff;
+        border-bottom-style: solid;
+        border-color: var(--light-gray);
+        border-bottom-width: thin;
+    }
+    
     ion-toolbar{
-        height: 60px;
+        height: var(--header-height);
+        &:not(.mobile){
+            --background: var(--list-bkg-color);
+        }
         .flex-container{
             display: flex;
         }
@@ -27,7 +34,7 @@ ion-header {
         text-align: left;
         padding-inline: unset;
         margin: 0px 10px;
-        height: 40px;
+        // height: 40px;
         width: 100%;
     }
     ion-avatar {
@@ -69,17 +76,27 @@ ion-header {
         }
     }
     .tile-info-with {
-        // position: relative;
-        // display: inline-block;
-        // vertical-align: middle;
-        // margin: -6px 0px 0 6px;
-        position: absolute;
-        margin: auto 0;
-        height: 100%;
-        top: 0;
-        left: 50px;
-        vertical-align: middle;
-        // cursor: pointer;
+        display: flex;
+
+        .tile-username {
+            display: inline-block;
+            font-size: 18px;
+            margin: 0;
+            padding: 0;
+    
+            color: #1f2d3d;
+            font-weight: 400; //600;
+            -webkit-font-smoothing: antialiased;
+            text-rendering: optimizeLegibility;
+            -webkit-text-size-adjust: none;
+            -moz-text-size-adjust: none;
+            -ms-text-size-adjust: none;
+            text-size-adjust: none;
+            -webkit-user-select: text;
+            -moz-user-select: text;
+            -ms-user-select: text;
+            user-select: text;
+        }
     }
     .tile-point {
         width: 10px;
@@ -90,27 +107,7 @@ ion-header {
         margin-right: 5px;
         vertical-align: middle;
     }
-    .tile-username {
-        display: inline-block;
-        font-size: 15px;
-        color: var(--black);
-        margin: 0;
-        padding: 0;
-
-        color: #3c4858;
-        font-family: "Google Sans",sans-serif!important;
-        font-weight: 600;
-        -webkit-font-smoothing: antialiased;
-        text-rendering: optimizeLegibility;
-        -webkit-text-size-adjust: none;
-        -moz-text-size-adjust: none;
-        -ms-text-size-adjust: none;
-        text-size-adjust: none;
-        -webkit-user-select: text;
-        -moz-user-select: text;
-        -ms-user-select: text;
-        user-select: text;
-    }
+    
 
     .tile-last-activity {
         color: var(--light-gray);
@@ -125,6 +122,9 @@ ion-header {
     }
     
     ion-buttons {
+        ion-icon , span{
+            color: var(--basic-blue)
+        }
         button {
             max-width: 30px;
             padding: 0;
@@ -133,42 +133,86 @@ ion-header {
     }
 }
 
+.avatar-and-typing-wpr{
+    display: flex;
+    &.mobile{
+        margin-left: 25px;
+    }
+}
+
 .avatar-container {
-    background-color: #fff;
+    // background-color: #fff;
     color: #fff;
     text-align: center;
-    width: 40px;
-    height: 40px;
-    position: absolute;
-    top: 0;
+    width: 44px;
+    height: 44px;
+    // position: absolute;
+    // top: 0;
+    // left: 20px;
     border-radius: 50%;
     padding: 0px;
-    transform: translateX(-50%);
-    left: 20px;
+    // transform: translateX(-50%);
 
     border-color: #fff;
     border-style: solid;
     border-width: 0px;
     line-height: 40px;
     display: inline-block;
+    cursor: pointer;
 }
+
+.avatar-container-ios {
+    left: 55px;
+    top: 10px;
+}
+
+.info-container{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-left: 12px;
+    width: 80%;
+}
+
 .user-presence {
     position: absolute;
-    bottom: 0;
+    bottom: 3px; //0;
     height: 12px;
     left: 30px;
     width: 100px;
 }
-.user-typing {
-    position: absolute;
-    left: 50px;
-    bottom: -3px;
-    padding: 0;
-    margin: 0;
-    height: 16px;
-    width: 140px;
+.subtitle-info {
+    // position: absolute;
+    // left: 50px;
+    // bottom: -3px;
+    // padding: 0;
+    // margin: 0;
+    display: flex;
+    align-items: center;
+    // height: 16px;
+    // width: 140px;
+    font-size: 12px;
+    .conversation_project{
+        display: inline-flex;
+        align-items: center;
+        line-height: 1.2rem;
+        font-weight: 500;
+        color: #779bbb;
+        font-size: 10px;
+        max-width: 90%;
+        margin-right: 5px;
+        svg {
+            fill:#779bbb;
+            vertical-align: sub;
+        }
+        span{
+            padding-left: 5px
+        }
+    }
 }
 
+
+
 .tile-info-with-ios {
     left: 82px !important;
     top: 10px!important;
@@ -178,11 +222,4 @@ ion-header {
     left: 63px;
 }
 
-.avatar-container-ios {
-    left: 55px;
-    top: 10px;
-}
 
-.resolve-conv-margin-right {
-    margin-right: 52px;
-}

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -1,3 +1,4 @@
+import { TYPE_GROUP } from './../../../../chat21-core/utils/constants';
 import {
   Component,
   OnInit,
@@ -22,7 +23,7 @@ import { ModalController } from '@ionic/angular'
 import { EventsService } from 'src/app/services/events-service'
 import { CreateTicketPage } from 'src/app/pages/create-ticket/create-ticket.page'
 import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service'
-import { TYPE_DIRECT } from 'src/chat21-core/utils/constants'
+import { TYPE_DIRECT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants'
 
 @Component({
   selector: 'app-header-conversation-detail',
@@ -34,24 +35,22 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   @Input() idLoggedUser: string
   @Input() conversationUid: string
   @Input() conv_type: string
-  @Input() isOpenInfoConversation: boolean = true
   @Input() isMobile: boolean
-  @Input() translationMap: Map<string, string>
-  @Output() eventOpenCloseInfoConversation = new EventEmitter<boolean>()
+  @Input() translationsMap: Map<string, string>
   conversationWithFullname: string
   openInfoConversation = true
-  openInfoMessage = true
-
+  
   isDirect = false
-  isTyping = false
   borderColor = '#ffffff'
   fontColor = '#949494'
-  membersConversation = ['SYSTEM']
   platformName: string
   conv_closed: boolean = false;
   IS_ON_IOS_MOBILE_DEVICE: boolean
   private logger: LoggerService = LoggerInstance.getInstance()
 
+  TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP
+  TYPE_GROUP = TYPE_GROUP
+
   constructor(
     public imageRepoService: ImageRepoService,
     private route: ActivatedRoute,
@@ -73,7 +72,6 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
     this.logger.log('[CONVS-DETAIL][HEADER] - (ngOnInit) - conversationAvatar', this.conversationAvatar,)
     this.logger.log('[CONVS-DETAIL][HEADER] - (ngOnInit) -  conv_type', this.conv_type)
     this.listenToConversationHasBeenClosed()
-    this.initialize();
     // this.isOniOSMobileDevice()
   }
 
@@ -91,8 +89,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
     this.logger.log('[CONVS-DETAIL][HEADER] - (ngOnChanges) -  conversationAvatar', this.conversationAvatar)
     if (this.conversationAvatar) {
       this.conversationAvatar.imageurl = this.imageRepoService.getImagePhotoUrl(this.conversationAvatar.uid)
-    } 
-    this.openInfoConversation = this.isOpenInfoConversation
+      this.initialize()
+    }
   }
 
   // ----------------------------------------------------
@@ -102,8 +100,6 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
     this.getPlatformName()
     if ( this.conversationAvatar && this.conversationAvatar.channelType === TYPE_DIRECT ) {
       this.isDirect = true
-    } else if (this.idLoggedUser) {
-      this.membersConversation.push(this.idLoggedUser)
     }
   }
 
@@ -133,18 +129,6 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
     });
   }
 
-
-
-  onOpenCloseInfoConversation() {
-    this.openInfoMessage = false
-    this.openInfoConversation = !this.openInfoConversation
-    this.logger.log(
-      '[CONVS-DETAIL][HEADER] - onOpenCloseInfoConversation - openInfoConversation ',
-      this.openInfoConversation,
-    )
-    this.eventOpenCloseInfoConversation.emit(this.openInfoConversation)
-  }
-
   /** */
   pushPage(event) { }
 

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.scss

@@ -4,6 +4,10 @@
     height: auto;
     padding: 0;
     margin: 0;
+
+    ion-icon{
+        color: var(--basic-blue);
+    }
     .buttons-left {
         position: absolute;
         left: 0;
@@ -165,10 +169,6 @@
     border-radius: 50%;
 }
 
-.send-msg-activated {
-    color: #3880ff !important;
-}
-
 .send-msg-disabled {
     cursor: default;
     opacity: 0.8;

package/src/app/components/conversation-info/info-content/info-content.component.html

@@ -7,7 +7,8 @@
   </app-info-direct>
 
   <app-info-group *ngIf="panelType === 'group-panel' && IS_GROUP_PANEL === true"
-    [groupDetail]="groupDetail">
+    [groupDetail]="groupDetail"
+    [isMobile]="isMobile">
   </app-info-group>
 
   <app-info-support-group *ngIf="panelType === 'support-group-panel'"

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -28,11 +28,12 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 
 export class InfoContentComponent implements OnInit {
   @Input() openInfoConversation: boolean;
-  @Input() translationMap: Map<string, string>;
   // @Input() member: UserModel;
   @Input() loggedUser: UserModel
   @Input() tenant: string
-  @Input() groupDetail: any
+  @Input() groupDetail: any;
+  @Input() isMobile: boolean;
+  @Input() translationMap: Map<string, string>;
 
 
   public member: UserModel;

package/src/app/components/conversation-info/info-direct/info-direct.component.html

@@ -8,15 +8,7 @@
         <div class="image-profile">
           <app-avatar-profile [itemAvatar]='member'></app-avatar-profile>
         </div>
-
-        <div class="user-presence">
-          <app-user-presence 
-            [idUser]='member.uid'
-            [translationMap]='translationMap' 
-            [borderColor]='borderColor'
-            [fontColor]='fontColor'>
-          </app-user-presence>
-        </div>
+        
         <!-- -> {{member |json}} -->
         <div class="info-profile">
           <div class="name">

package/src/app/components/conversation-info/info-direct/info-direct.component.ts

@@ -15,8 +15,6 @@ export class InfoDirectComponent implements OnInit, AfterViewInit, OnChanges {
   @Input() translationMap: Map<string, string>;
   @Input() conversationWith: string;
 
-  borderColor = '#ffffff';
-  fontColor = '#949494';
   advancedAttributes: Array<any> = [];
   private logger: LoggerService = LoggerInstance.getInstance();
 

package/src/app/components/conversation-info/info-group/info-group.component.html

@@ -1,115 +1,51 @@
 <!-- <pre style="font-size: 12px;"> {{ groupDetail | json }} </pre>  -->
 
 <ion-content class="group-profile">
-  <ion-card class="first-card">
-    <div class="chat21-box-profile chat21-box">
-      <div class="chat21-content">
-        <div class="image-profile">
-          <app-avatar-profile [itemAvatar]="groupDetail"></app-avatar-profile>
-        </div>
-
-        <div class="info-profile">
-          <div class="name">
-            <span class="read">{{groupDetail?.name}}</span>
+    <ion-card>
+      <div class="chat21-box-profile chat21-box">
+        <div class="chat21-content">
+          <div class="image-profile">
+            <app-avatar-profile [itemAvatar]="groupDetail"></app-avatar-profile>
           </div>
-        </div>
-        <!-- <div class="member-email">
-          <a [href]="'mailto:' + member.email + '?Subject='">
-            {{member.email}}
-          </a>
-        </div> -->
-      </div>
-
-    </div>
-  </ion-card>
   
-  <ion-list id="fake-members-list" *ngIf="displaySkeletonScreen">
-    <ion-item lines="none" *ngFor="let fake of generateFake(membersObjectLength)" style="margin-left:-3px">
-      <ion-avatar slot="start">
-        <ion-skeleton-text animated style="width: 44px; height: 44px;"></ion-skeleton-text>
-      </ion-avatar>
-      <ion-label>
-        <h3>
-          <ion-skeleton-text animated style="width: 60%;position: relative;top: 2px;height: 16px;"></ion-skeleton-text>
-        </h3>
-      </ion-label>
-    </ion-item>
-  </ion-list>
-
-  <!-- <pre style="font-size: 8px;"> {{member_array | json }} </pre>  <pre style="font-size: 8px;"> {{displaySkeletonScreen}} </pre> -->
-  <ion-list id="members-list" *ngIf="groupDetail?.member_array?.length > 0 && !displaySkeletonScreen">
-    <ion-item lines="none" *ngFor='let member of groupDetail?.member_array'>
-      <ion-avatar  slot="start" style="margin-right: 12px;"> 
-        <app-avatar-profile [itemAvatar]=member></app-avatar-profile>
-        <div class="user-online" [ngStyle]="{ 'background-color':(member?.userOnline)?'#24d066':'#db4437' }"></div>
-      </ion-avatar>
-      <ion-label>
-        <h3>
-          {{ member.fullname }}
-        </h3>
-      </ion-label>
-    </ion-item>
-  </ion-list>
-
-
-
-
-  <div *ngIf="groupDetail" style="display:none">
-    <div *ngFor='let member of groupDetail?.member_array'>
-      <ion-grid>
-        <ion-row class="ion-align-items-center">
-          <ion-col size="3">
-            <div class="member-profile">
-              <!-- (click)="copyLoggedUserUID({member.userid)" -->
-              <!-- <div class="avatar-container" [tooltip]="useruidTooltip" [options]="tooltipOptions" placement="top"
-                content-type="template" > -->
-              <app-avatar-profile [itemAvatar]=member></app-avatar-profile>
-              <!-- </div> -->
-              <!-- <ng-template #useruidTooltip>
-                <span> {{member.userid}}</span>
-              </ng-template> -->
-
-              <div class="user-online" [ngStyle]="{ 'background-color':(member?.userOnline)?'#24d066':'#db4437' }">
-              </div>
+          <div class="info-profile">
+            <div class="name">
+              <span class="read">{{groupDetail?.name}}</span>
             </div>
-
-
-          </ion-col>
-          <ion-col>
-            <ion-label>
-              {{ member.fullname }}
-            </ion-label>
-
-            <!-- <div class="info-group-member-email">
-              <a [href]="'mailto:' + member.email + '?Subject='">
-                {{member.email}}
-              </a>
-            </div> -->
-
-
-          </ion-col>
-        </ion-row>
-      </ion-grid>
-      <!-- </ion-avatar>
-      </ion-item> -->
-      <!-- {{member | json}}
+          </div>
+        </div>
+  
+      </div>
+    </ion-card>
     
-    >>>  {{member?.avatar}} -->
-    </div>
-  </div>
-
-  <!-- <ion-list> 
-
-
-  </ion-list> -->
-
-  <!-- </div> -->
-
-
-  <!-- <app-advanced-info-accordion 
-  [advancedAttributes]="advancedAttributes"
-  [translationMap]="translationMap">
-
-  </app-advanced-info-accordion> -->
-
-</ion-content>
+    <ion-list id="fake-members-list" *ngIf="displaySkeletonScreen">
+      <ion-item lines="none" *ngFor="let fake of generateFake(membersObjectLength)" style="margin-left:-3px">
+        <ion-avatar slot="start">
+          <ion-skeleton-text animated style="width: 44px; height: 44px;"></ion-skeleton-text>
+        </ion-avatar>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 60%;position: relative;top: 2px;height: 16px;"></ion-skeleton-text>
+          </h3>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  
+    <!-- <pre style="font-size: 8px;"> {{member_array | json }} </pre>  <pre style="font-size: 8px;"> {{displaySkeletonScreen}} </pre> -->
+    <ion-list id="members-list" *ngIf="groupDetail?.member_array?.length > 0 && !displaySkeletonScreen">
+      <ion-item lines="none" *ngFor='let member of groupDetail?.member_array'>
+        <ion-avatar  slot="start" style="margin-right: 12px;"> 
+          <app-avatar-profile [itemAvatar]=member></app-avatar-profile>
+          <div class="status-icon-container" [class.mobile]="isMobile" >
+            <svg xmlns="http://www.w3.org/2000/svg" [class.online]="(member?.userOnline)" height="15"  width="15" viewBox="0 0 24 24" fill="#000000"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>
+          </div>
+        </ion-avatar>
+        <ion-label>
+          <h3>
+            {{ member.fullname }}
+          </h3>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  
+  </ion-content>