@chat21/chat21-ionic 3.0.82-rc.6 → 3.0.82

package/src/app/components/sidebar-user-details/sidebar-user-details.component.ts

@@ -41,7 +41,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
 
   isVisiblePAY: boolean;
   public_Key: any
-  USER_PHOTO_PROFILE_EXIST: boolean = false;
+  USER_PHOTO_PROFILE_EXIST: boolean;
   version: string
   company_name: string = 'Tiledesk'
   DASHBOARD_URL: string;
@@ -78,8 +78,6 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
     // this.listenOpenUserSidebarEvent();
   }
 
-  ngOnChanges() {  }
-
   subcribeToAuthStateChanged() {
     this.messagingAuthService.BSAuthStateChanged.subscribe((state) => {
       this.logger.log('[SIDEBAR-USER-DETAILS] BSAuthStateChanged ', state)
@@ -90,8 +88,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
           const currentUser = JSON.parse(storedCurrentUser);
           this.logger.log('[SIDEBAR-USER-DETAILS] - subcribeToAuthStateChanged - currentUser ', currentUser)
           if (currentUser) {
-            this.user = currentUser
-            this.createUserAvatar(this.user);
+            this.user = currentUser;
             this.getCurrentChatLangAndTranslateLabels(this.user);
             this.photo_profile_URL = this.imageRepoService.getImagePhotoUrl(this.user.uid)
             this.logger.log('[SIDEBAR-USER-DETAILS] photo_profile_URL ', this.photo_profile_URL);
@@ -106,7 +103,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
 
   checkIfExistPhotoProfile(imageUrl) {
     this.verifyImageURL(imageUrl, (imageExists) => {
-      
+
       if (imageExists === true) {
         this.USER_PHOTO_PROFILE_EXIST = true;
         this.logger.log('[SIDEBAR-USER-DETAILS] photo_profile_URL IMAGE EXIST ', imageExists)
@@ -130,23 +127,6 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
     };
   }
 
-  createUserAvatar(currentUser) {
-    this.logger.log('[SIDEBAR] - createProjectUserAvatar ', currentUser)
-    let fullname = ''
-    if (currentUser && currentUser.firstname && currentUser.lastname) {
-      fullname = currentUser.firstname + ' ' + currentUser.lastname
-      currentUser['fullname_initial'] = avatarPlaceholder(fullname)
-      currentUser['fillColour'] = getColorBck(fullname)
-    } else if (currentUser && currentUser.firstname) {
-      fullname = currentUser.firstname
-      currentUser['fullname_initial'] = avatarPlaceholder(fullname)
-      currentUser['fillColour'] = getColorBck(fullname)
-    } else {
-      currentUser['fullname_initial'] = 'N/A'
-      currentUser['fillColour'] = 'rgb(98, 100, 167)'
-    }
-  }
-
   // listenOpenUserSidebarEvent() {
   //   this.events.subscribe('userdetailsidebar:opened', (openUserDetailsSidebar) => {
   //     this.logger.log('[SIDEBAR-USER-DETAILS] - listenOpenUserSidebarEvent - openUserDetailsSidebar', openUserDetailsSidebar);
@@ -376,6 +356,13 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
     });
   }
 
+
+  ngOnChanges() {  }
+
+
+
+
+
   changeAvailabilityStateInUserDetailsSidebar(selectedStatusID) {
     this.logger.log('[SIDEBAR-USER-DETAILS] - changeAvailabilityState projectid', this.project._id, ' available 1: ', selectedStatusID);
     

package/src/app/components/utils/user-presence/user-presence.component.html

@@ -1,7 +1,2 @@
-<div id="presence-container">
-    <div class="status-icon-container" [class.mobile]="isMobile">
-        <svg xmlns="http://www.w3.org/2000/svg" [class.online]="online" 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>
-    <!-- <div class="status-icon" [class.online]="online" [style.border-color]="borderColor"></div> -->
-    <div class="online-point">{{status}}</div>
-</div>
+<div class="status-icon" [class.online]="online" [style.border-color]="borderColor"></div>
+<div class="online-point" [style.color]="fontColor">{{status}}</div>

package/src/app/components/utils/user-presence/user-presence.component.scss

@@ -1,41 +1,24 @@
-#presence-container{
-    display: flex;
-}
-
-.status-icon-container{
-    position: fixed;
-    top: 22px;
-    left: 30px;
-    background-color: white;
-    height: 17px;
-    width: 17px;
+.status-icon {
+    position: absolute;
+    width: 14px;
+    height: 14px;
+    top: 0px;
+    left: 0;
+    border: 2px solid #ffffff;
     border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    &.mobile{
-        top: 36px;
-        left: 50px;
-    }
-
-    svg{
-        fill: #f44336;
-
-        &.online{
-            fill: #4caf50;
-        }
+    background-color: #f44336;
+    &.online {
+        background-color: #4caf50;
     }
     
 }
-
 .online-point {
-    display: inline-flex;
-    align-items: center;
-    line-height: 1.2rem;
-    font-weight: 500;
-    color: #779bbb;
-    font-size: 10px;
-    max-width: 90%;
-    margin-right: 5px;
+    position: absolute;
+    display: inline-block;
+    top: 0;
+    left: 20px;
+    color: rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    line-height: 14px;
+    text-align: left;
 }

package/src/app/components/utils/user-presence/user-presence.component.ts

@@ -17,10 +17,11 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 
 export class UserPresenceComponent implements OnInit, OnDestroy {
-  
   @Input() idUser: string;
-  @Input() isMobile: boolean;
   @Input() translationMap: Map<string, string>;
+  @Input() fontColor: string;
+  @Input() borderColor: string;
+
 
   public online = true;
   public status = '';
@@ -46,6 +47,9 @@ export class UserPresenceComponent implements OnInit, OnDestroy {
 
   /** */
   initialize() {
+    if (this.translationMap) {
+      this.status = this.translationMap.get('LABEL_ACTIVE_NOW');
+    }
     this.logger.log('[USER-PRESENCE-COMP] - initialize - this.translationMap', this.translationMap);
     this.logger.log('[USER-PRESENCE-COMP] - initialize - this.status', this.status);
     this.logger.log('[USER-PRESENCE-COMP] - initialize - idUser ->', this.idUser);
@@ -118,11 +122,11 @@ export class UserPresenceComponent implements OnInit, OnDestroy {
     this.logger.log('[USER-PRESENCE-COMP] userIsOnLine - userId: ', userId, ' - isOnline: ', isOnline);
     this.online = isOnline;
     if (isOnline) {
-      this.status = this.translationMap.get('LABEL_ONLINE');
+      this.status = this.translationMap.get('LABEL_AVAILABLE');
     } else {
-      this.status = this.translationMap.get('LABEL_OFFLINE');
+      this.status = this.translationMap.get('LABEL_NOT_AVAILABLE');
       if (this.lastConnectionDate && this.lastConnectionDate.trim() !== '') {
-        this.status = this.status + ' (' + this.lastConnectionDate + ')'
+        this.status = this.lastConnectionDate;
       }
     }
   }
@@ -137,7 +141,7 @@ export class UserPresenceComponent implements OnInit, OnDestroy {
       this.logger.log('[USER-PRESENCE-COMP] userLastConnection - lastConnectionDate', lastConnectionDate);
       this.lastConnectionDate = lastConnectionDate;
       if (this.online === false) {
-        this.status = this.translationMap.get('LABEL_OFFLINE') + ' (' + this.lastConnectionDate + ')'
+        this.status = this.lastConnectionDate;
       }
     }
   }

package/src/app/pages/contacts-directory/contacts-directory.page.html

@@ -1,5 +1,5 @@
 <ion-header>
-  <ion-toolbar [class.mobile]="isMobile">
+  <ion-toolbar>
     <ion-title>{{ 'LABEL_NEW_CHAT' | translate }}</ion-title>
 
     <ion-buttons slot="end">

package/src/app/pages/contacts-directory/contacts-directory.page.scss

@@ -1,47 +0,0 @@
-ion-toolbar {
-    height: var(--header-height);   
-    &:not(.mobile){
-        --background: var(--list-bkg-color);
-        border: none;
-    }
-    &.mobile{
-        border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-    }
-
-    ion-button{
-        --color: var(--basic-blue);
-    }
-}
-
-ion-content {
-    // overwrite inline styles
-    --offset-bottom: auto!important;
-    --overflow: hidden;
-    overflow: scroll;
-
-    /* For Firefox */
-    @-moz-document url-prefix() {
-      scrollbar-width: none;
-    }
-
-    &:not(.mobile){
-      background: var(--list-bkg-color);
-    }
-  
-    &::-webkit-scrollbar {
-      width: 6px;
-      height: 8px;
-      display: none;
-    }
-  
-    &::-webkit-scrollbar-track {
-      background: #f9f9f9;
-    }
-    &::-webkit-scrollbar-thumb {
-         background-color: #b9b9b9;
-          border-radius: 0px;
-    }
-    &::-webkit-scrollbar-thumb:hover {
-        background-color: #727272;
-    }
-}

package/src/app/pages/contacts-directory/contacts-directory.page.ts

@@ -17,9 +17,7 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
   styleUrls: ['./contacts-directory.page.scss'],
 })
 export class ContactsDirectoryPage implements OnInit {
-  
   @Input() token: string;
-  @Input() isMobile: boolean;
   // @Input() user: string;
 
   public contacts: Array<UserModel>;

package/src/app/pages/conversation-detail/conversation-detail.module.ts

@@ -21,6 +21,10 @@ import { ConversationDetailPage } from './conversation-detail.page';
 // tslint:disable-next-line: max-line-length
 import { HeaderConversationDetailComponent } from '../../components/conversation-detail/header-conversation-detail/header-conversation-detail.component';
 import { MessageTextAreaComponent } from '../../components/conversation-detail/message-text-area/message-text-area.component';
+import { BubbleDayMessageComponent } from '../../components/conversation-detail/bubble-day-message/bubble-day-message.component';
+import { BubbleSystemMessageComponent } from '../../components/conversation-detail/bubble-system-message/bubble-system-message.component';
+import { BubbleMyMessageComponent } from '../../components/conversation-detail/bubble-my-message/bubble-my-message.component';
+import { BubbleOthersMessageComponent } from '../../components/conversation-detail/bubble-others-message/bubble-others-message.component';
 // import { InfoContentComponent } from '../../components/conversation-info/info-content/info-content.component';
 // import { InfoDirectComponent } from '../../components/conversation-info/info-direct/info-direct.component';
 import { InfoContentComponent } from 'src/app/components/conversation-info/info-content/info-content.component';
@@ -61,6 +65,10 @@ import { PickerModule } from '@ctrl/ngx-emoji-mart';
     HeaderConversationDetailComponent,
     MessageTextAreaComponent,
     CannedResponseComponent,
+    // BubbleDayMessageComponent,
+    // BubbleSystemMessageComponent,
+    // BubbleMyMessageComponent,
+    // BubbleOthersMessageComponent,
     // InfoContentComponent,
     // InfoSupportGroupComponent,
     // InfoDirectComponent,

package/src/app/pages/conversation-detail/conversation-detail.page.html

@@ -1,29 +1,23 @@
 <span *ngIf="conversationWith && loggedUser; then showConversation else showPlaceholder"></span>
 <ng-template #showPlaceholder>
-
-  <ion-header no-border class="ion-no-border" [class.mobile]="isMobile">
-    <ion-toolbar [class.mobile]="isMobile">
-
-    </ion-toolbar>
-  </ion-header>
   <!-- class="splash-page" -->
-  <ion-content padding id="contentPlaceholder" [class.mobile]="isMobile"> 
+  <ion-content padding>
     <!-- <div padding class="image-splash-page"></div>
     <div padding class="title-splash-page">
       text new conversation + button
     </div> -->
-    
 
-    <ion-grid class="grid_content" [class.mobile]="isMobile">
-      <ion-row class="row_content ion-justify-content-center ion-align-items-center" style="flex-direction: column">
+    <ion-grid style="height: 100%;">
+      <ion-row class="ion-justify-content-center ion-align-items-center" style="height: 100%; flex-direction: column">
         <span *ngIf="isOnline === true  && !showSpinner"
-          style="color: #92949c; font-size: 16px;line-height: 18px;">
+          style="color: #92949c; font-size: 16px;line-height: 18px;margin-top: -160px;">
           <span *ngIf="conversation_count > 0 ">
             {{'PleaseSelectChatToStartMessaging' | translate }}
           </span>
           <span *ngIf="conversation_count === 0" style="line-height: 1.2;color: #4b5258;
         font-weight: 500;">
             {{'ALL_CONVS_SERVED' | translate}}
+
           </span>
 
         </span>
@@ -43,13 +37,15 @@
     [idLoggedUser]="loggedUser.uid"
     [conversationUid]="conversationWith"
     [conversationAvatar]="conversationAvatar" 
-    [translationsMap]="translationsHeaderMap"
-    [conv_type]="conv_type">
+    [translationMap]="translationMap"
+    [isOpenInfoConversation]="isOpenInfoConversation" 
+    [conv_type]="conv_type"
+    (eventOpenCloseInfoConversation)="returnOpenCloseInfoConversation($event)">
   </app-header-conversation-detail>
 
-  <ion-content id="conv-details" [class.mobile]="isMobile">
-    <ion-grid class="grid_content" [class.mobile]="isMobile">
-      <ion-row class="row_content" [class.mobile]="isMobile">
+  <ion-content id="conv-details">
+    <ion-grid class="grid_content">
+      <ion-row class="row_content">
         <ion-col id="chatArea" [class.mobile]="isMobile" [class.open]="openInfoConversation"
         [ngClass]="{'chat-area-apps-sidebar-wide': appsidebarIsWide === true}">
 
@@ -102,15 +98,10 @@
             </ng-template>
 
             <ng-template #content_messages>
-              <ion-content #ionContentChatArea appScrollbarTheme class="ionContentChatArea" 
-                (drop)="drop($event)"
-                (dragover)="allowDrop($event)" 
-                (dragleave)="drag($event)" 
-                [scrollEvents]="true"
-                (ionScrollStart)="logScrollStart($event)" 
-                (ionScroll)="logScrolling($event)"
-                (ionScrollEnd)="logScrollEnd($event)" 
-                [class.active]="true">
+              <ion-content #ionContentChatArea appScrollbarTheme class="ionContentChatArea" (drop)="drop($event)"
+                (dragover)="allowDrop($event)" (dragleave)="drag($event)" [scrollEvents]="true"
+                (ionScrollStart)="logScrollStart($event)" (ionScroll)="logScrolling($event)"
+                (ionScrollEnd)="logScrollEnd($event)" [class.active]="showIonContent">
 
                 <!-- ----------------------------------------------------------- -->
                 <!-- DROPZONE -->
@@ -134,13 +125,7 @@
                   [senderId]="loggedUser.uid"
                   [baseLocation]="window?.location?.origin"
                   [areVisibleCAR]="areVisibleCAR" 
-                  [supportMode]= "supportMode"
-                  [isMobile]="isMobile"
-                  [isTypings]="isTypings"
-                  [openInfoConversation]="openInfoConversation"
-                  [idUserTypingNow]="idUserTypingNow"
-                  [nameUserTypingNow]="nameUserTypingNow" 
-                  [translationMap]="translationsContentMap"
+                  [supportMode]= "supportMode" 
                   [stylesMap]="styleMap"
                   (onBeforeMessageRender)="onBeforeMessageRenderFN($event)"
                   (onAfterMessageRender)="onAfterMessageRenderFN($event)"
@@ -148,8 +133,7 @@
                   (onScrollContent)="returnOnScrollContent($event)" 
                   (onMenuOptionShow)="returnOnMenuOption($event)"
                   (onElementRendered)="onElementRenderedFN($event)"
-                  (onAddUploadingBubble)="addUploadingBubbleEvent($event)"
-                  (onOpenCloseInfoConversation)="onOpenCloseInfoConversation($event)">
+                  (onAddUploadingBubble)="addUploadingBubbleEvent($event)">
                 </ion-conversation-detail>
 
               </ion-content>
@@ -171,8 +155,7 @@
               [conversationWith]="conversationWith"
               [conversationWithFullname]="conversationWithFullname"
               [currentString]="messageStr"
-              [stylesMap]="styleMap"
-              [translationMap]="translationsMap"
+              [translationMap]="translationMap"
               (onLoadedCannedResponses)="onLoadedCannedResponses($event)"
               (onClickCanned)="replaceTagInMessage($event)"
               (onClickAddCannedResponse)="presentCreateCannedResponseModal()">
@@ -228,9 +211,9 @@
               [loggedUser]="loggedUser" 
               [conversationWith]="conversationWith" 
               [tagsCannedFilter]="tagsCannedFilter"
-              [translationMap]="translationsMap"
+              [translationMap]="translationMap"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
-              [isOpenInfoConversation]="openInfoConversation" 
+              [isOpenInfoConversation]="isOpenInfoConversation" 
               [dropEvent]="dropEvent"
               [disableTextarea]="disableTextarea"
               (eventChangeTextArea)="returnChangeTextArea($event)"
@@ -247,11 +230,10 @@
         [ngClass]="{'info-convs-apps-sidebar-wide': appsidebarIsWide === true}">
           <app-info-content 
             [openInfoConversation]="openInfoConversation" 
+            [translationMap]="translationMap"
             [loggedUser]="loggedUser" 
             [tenant]="tenant" 
-            [groupDetail]="groupDetail"
-            [isMobile]="isMobile"
-            [translationMap]="translationsMap">
+            [groupDetail]="groupDetail">
           </app-info-content>
         </ion-col>