@chat21/chat21-ionic 3.0.80-rc.1 → 3.0.80

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.scss

@@ -9,8 +9,8 @@
 }
 ion-item {
     cursor: pointer;
-    height: 90px; //70px;
-    --min-height: 90px; //70px;
+    height: 70px;
+    --min-height: 70px;
     position: relative;
     display: flex;
     text-decoration: none;
@@ -19,14 +19,6 @@ ion-item {
     --padding-start: 0;
     --inner-padding-end: 0;
     --background-hover: #000000 !important;
-    --background: transparent;
-    border-radius: var(--border-radius-item);
-    margin: 4px 5px;
-    .conv-container{
-        width: 84%;
-        height: 100%;
-        padding: 12px 0;
-    }
     .selected {
         // border-radius: 10px;
         // padding-left: 8px;
@@ -41,13 +33,12 @@ ion-item {
     ion-avatar {
         position: relative;
         padding: 0;
-        margin: 20px 8px 0px 8px;//0 12px 0 8px;
-        height: 40px; //50px;
-        width: 40px; //50px;
-        min-width: 40px; //50px;
-        min-height: 40px; //50px;
-        line-height: 40px; //50px;
-        align-self: end;
+        margin: 0 12px 0 8px;
+        height: 50px;
+        width: 50px;
+        min-width: 50px;
+        min-height: 50px;
+        line-height: 50px;
         .avatar-placeholder {
             position: absolute;
             top: 0;
@@ -56,7 +47,7 @@ ion-item {
             height: 100%;
             border-radius: 50%;
             text-align: center;
-            font-size: 15px; //20px;
+            font-size: 20px;
             color: #ffffff;
             font-weight: 500;
         }
@@ -79,47 +70,22 @@ ion-item {
         justify-content: center;
         min-width: 0;
         padding: 0;
-        margin: 0;
         font-family: Helvetica, Helvetica, Arial, sans-serif;
         line-height: 1.28;
         text-rendering: optimizeLegibility;
-        .conversation_project{
-            display: inline-flex;
-            align-items: center;
-            line-height: 1.2rem;
-            font-weight: 500;
-            color: #779bbb;
-            font-size: 10px;
-            max-width: 90%;
-            svg {
-                fill:#779bbb;
-                vertical-align: sub;
-            }
-            span{
-                padding-left: 5px
-            }
-        }
         .conversation_with {
             color: rgba(0, 0, 0, 1);
             font-size: 15px;
             font-weight: 400;
             line-height: 1.4;
-            width: 70% !important;
-            &.not-read {
-                font-weight: 600;
-                color: #3c4858; //#1876f2;
-            }
         }
-        
         .conversation_message {
-            margin: 5px 0px;
             p {
-                color: #6e6f73; //#3c4858;
-                font-size: 15px;
+                color: rgba(153, 153, 153, 1);
+                font-size: 13px;
                 font-weight: 400;
                 height: 18px;
                 vertical-align: middle;
-                align-self: center;
                 &.not-read {
                     font-weight: 600;
                     color: #1876f2;
@@ -127,13 +93,13 @@ ion-item {
             }
 
             span {
-                color: rgb(60, 72, 88);
-                font-size: 12px;
+                color: rgba(153, 153, 153, 1);
+                font-size: 13px;
                 font-weight: 400;
                 height: 18px;
                 &.not-read {
                     font-weight: 600;
-                    color: #3c4858; //#1876f2;
+                    color: #1876f2;
                 }
             }
         }
@@ -141,15 +107,8 @@ ion-item {
     ion-note {
         position: absolute;
         right: 8px;
-        top: 40px;
+        top: 4px;
         font-size: 10px;
-        display: flex;
-        flex-direction: column;
-        color: #6e6f73;
-
-        &.is-on-mobile{
-            top: 10px;
-        }
     }
     ion-buttons {
         margin: 0;
@@ -161,7 +120,7 @@ ion-item {
             font-size: 10px;
             --padding-start: 0px;
             --padding-end: 0px;
-            color: var(--basic-blue);//rgba(153, 153, 153, 1);
+            color: rgba(153, 153, 153, 1);
             background-color: transparent;
             border-radius: 50%; // nk
             &:hover {
@@ -174,17 +133,17 @@ ion-item {
         width: 10px;
         height: 10px;
         border-radius: 50%;
-        background-color: var(--basic-blue);
+        background-color: rgb(22, 92, 238);
         position: absolute;
         right: 6px;
         bottom: 8px;
     }
 
     .notification_point-on-desktop {
-        bottom: 22px !important;
+        bottom: 29px !important;
     }
     .notification_point-on-mobile {
-        bottom: 22px !important;
+        bottom: 29px !important;
         right: 8px;
     }
 }
@@ -250,8 +209,7 @@ ion-item:hover {
 }
 
 .ion-selected {
-    background: var(--list-bkg-color-selected);
-    border-right: 4px solid var(--basic-blue);
+    --background: rgb(231, 241, 255);
 }
 
 .time-in-archived {

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.ts

@@ -1,5 +1,3 @@
-import { TYPE_GROUP, TYPE_SUPPORT_GROUP } from './../../../../chat21-core/utils/constants';
-import { TYPE_DIRECT } from 'src/chat21-core/utils/constants';
 import { Component, EventEmitter, Input, IterableDiffers, KeyValueDiffers, OnInit, Output, SimpleChange } from '@angular/core';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
@@ -16,7 +14,6 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 import { DomSanitizer } from '@angular/platform-browser'
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { AlertController } from '@ionic/angular';
-import { CustomTranslateService } from 'src/chat21-core/providers/custom-translate.service';
 // import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 // import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 
@@ -38,8 +35,6 @@ export class IonListConversationsComponent extends ListConversationsComponent im
   public currentYear: any;
   public browserLang: string;
 
-  public translationsMap: Map<string, string> = new Map()
-
   public PROJECT_FOR_PANEL: any;
   public archive_btn_tooltip: string;
   public resolve_btn_tooltip: string;
@@ -57,10 +52,6 @@ export class IonListConversationsComponent extends ListConversationsComponent im
     'hideDelayAfterClick': 3000,
     'hide-delay': 100
   };
-
-  TYPE_DIRECT = TYPE_DIRECT;
-  TYPE_GROUP = TYPE_GROUP;
-  TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP;
   /**
    * 
    * @param iterableDiffers 
@@ -72,7 +63,6 @@ export class IonListConversationsComponent extends ListConversationsComponent im
     public kvDiffers: KeyValueDiffers,
     public platform: Platform,
     private translate: TranslateService,
-    private translateService: CustomTranslateService,
     private networkService: NetworkService,
     private appConfigProvider: AppConfigProvider,
     private sanitizer: DomSanitizer,
@@ -83,6 +73,7 @@ export class IonListConversationsComponent extends ListConversationsComponent im
     super(iterableDiffers, kvDiffers)
     this.setMomentLocale();
 
+
     // if (this.browserLang) {
 
     //   moment.locale(this.browserLang)
@@ -132,11 +123,16 @@ export class IonListConversationsComponent extends ListConversationsComponent im
       'ALERT_TITLE',
       'ActionNotAllowed',
       'CLOSE_ALERT_CONFIRM_LABEL',
-      'YouAreNoLongerAmongTheTeammatesManagingThisConversation',
-      'GROUP_CHAT',
-      'DIRECT_CHAT'
+      'YouAreNoLongerAmongTheTeammatesManagingThisConversation'
     ]
-    this.translationsMap = this.translateService.translateLanguage(translationKeys)
+    this.translate.get(['Resolve', 'Archive', 'ALERT_TITLE']).subscribe((translations: string) => {
+        this.resolve_btn_tooltip = translations['Resolve'];
+        this.archive_btn_tooltip = translations['Archive'];
+        this.alert_lbl = translations['ALERT_TITLE']
+        this.actionNotAllowed_lbl = translations['ActionNotAllowed']
+        this.ok_lbl = translations['CLOSE_ALERT_CONFIRM_LABEL']
+        this.youAreNoLongerAmongTheTeammatesManagingThisConversation_lbl = translations['YouAreNoLongerAmongTheTeammatesManagingThisConversation']
+    });
   }
 
   setMomentLocale() {

package/src/app/components/canned-response/canned-response.component.html

@@ -6,7 +6,7 @@
       (click)="onClickCannedFN(canned, $event)">
       <div class="cannedContent">
         <ion-input [(ngModel)]="canned.title" class="title" id="{{'titleCanned_'+canned._id}}" [disabled]="canned.disabled"></ion-input>
-        <ion-input [(ngModel)]="canned.text" *ngIf="canned.text" class="text" [disabled]="canned.disabled"></ion-input>
+        <ion-input [(ngModel)]="canned.text" *ngIf="canned.text" class="text truncate" [disabled]="canned.disabled"></ion-input>
       </div>
       <ion-icon class="canned-item-icon"  name="checkmark-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && !canned.disabled" (click)="onConfirmEditCanned(canned, $event)"></ion-icon>
       <ion-icon class="canned-item-icon"  name="pencil-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && canned.disabled" (click)="onEditCanned(canned, $event)"></ion-icon>
@@ -22,10 +22,10 @@
   <div  class="loader" *ngIf="tagsCannedFilter.length === 0">
     <div class="box">
       <div class="container">
-        <span class="circle" [ngStyle]="{'background-color': stylesMap?.get('themeColor')}"></span>
-        <span class="circle" [ngStyle]="{'background-color': stylesMap?.get('themeColor')}"></span>
-        <span class="circle" [ngStyle]="{'background-color': stylesMap?.get('themeColor')}"></span>
-        <span class="circle" [ngStyle]="{'background-color': stylesMap?.get('themeColor')}"></span>
+        <span class="circle"></span>
+        <span class="circle"></span>
+        <span class="circle"></span>
+        <span class="circle"></span>
       </div>
       <div class="label">{{translationMap.get('LABEL_LOADING')}}</div>
     </div>

package/src/app/components/canned-response/canned-response.component.scss

@@ -179,7 +179,7 @@ ion-item {
             width: 15px;
             height: 15px;
             border-radius: 50%;
-            background-color: var(--basic-blue);
+            background-color: #1877f2;
             animation: move 500ms linear 0ms infinite;
             margin-right: 30px;
             

package/src/app/components/canned-response/canned-response.component.ts

@@ -20,7 +20,6 @@ export class CannedResponseComponent implements OnInit {
   @Input() conversationWith: string;
   @Input() conversationWithFullname: string;
   @Input() currentString: string;
-  @Input() stylesMap: Map<string, string>;
   @Input() translationMap: Map<string, string>;
   @Output() onLoadedCannedResponses = new EventEmitter<[any]>();
   @Output() onClickCanned = new EventEmitter<any>();

package/src/app/components/contacts-directory/contacts-directory.component.html

@@ -1,24 +1,28 @@
 
-<ion-searchbar id="contacts-searchbar" debounce="500" (ionInput)="onSearchInput($event)"></ion-searchbar>
-
-<ion-item button="true" lines="none" class="ion-no-padding" *ngFor="let user of contacts" (click)="goToChat(user)">
-  <div tabindex="0"></div>
-  <!-- <div [class.selected]="user.uid === uidUserSelected"></div> [style.background-color]="user.color"-->
-  <ion-avatar slot="start">
-    <div #avatarPlaceholder class="avatar-placeholder" [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user.color + ')'}" [innerHTML]="user.avatar"></div>
-    <div *ngIf="user.imageurl" #avatarImage class="avatar-profile" [style.background-image]="'url(' + user.imageurl + ')'"></div>
-    <!-- <div *ngIf="getImageAvatar(conversation.sender)" #avatarImage class="avatar-profile" [style.background-image]="'url(' + getImageAvatar(conversation.sender) + ')'"></div> -->
-    <div class="user-presence">
-      <app-presence
-      [isOnline]="user.online">
-      </app-presence>
-    </div>
-  </ion-avatar>
-  
-  <ion-label>
-    <h2>{{ user.fullname }}</h2>
-    <!-- <p>{{ user.uid }}</p> -->
-  </ion-label>
-  
-</ion-item>
+<ion-content padding>
+  <ion-searchbar id="contacts-searchbar" debounce="500" (ionInput)="onSearchInput($event)"></ion-searchbar>
+  <ion-list>
+    
+    <ion-item button="true" lines="none" class="ion-no-padding" *ngFor="let user of contacts" (click)="goToChat(user)">
+      <div tabindex="0"></div>
+      <!-- <div [class.selected]="user.uid === uidUserSelected"></div> [style.background-color]="user.color"-->
+      <ion-avatar slot="start">
+        <div #avatarPlaceholder class="avatar-placeholder" [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user.color + ')'}" [innerHTML]="user.avatar"></div>
+        <div *ngIf="user.imageurl" #avatarImage class="avatar-profile" [style.background-image]="'url(' + user.imageurl + ')'"></div>
+        <!-- <div *ngIf="getImageAvatar(conversation.sender)" #avatarImage class="avatar-profile" [style.background-image]="'url(' + getImageAvatar(conversation.sender) + ')'"></div> -->
+        <div class="user-presence">
+          <app-presence
+          [isOnline]="user.online">
+          </app-presence>
+        </div>
+      </ion-avatar>
+      
+      <ion-label>
+        <h2>{{ user.fullname }}</h2>
+        <!-- <p>{{ user.uid }}</p> -->
+      </ion-label>
+      
+    </ion-item>
 
+  </ion-list>
+</ion-content>

package/src/app/components/contacts-directory/contacts-directory.component.scss

@@ -1,24 +1,22 @@
 ion-item {
     cursor: pointer;
     height: 64px;
-    --min-height: 64px;
     position: relative;
     display: flex;
     text-decoration: none;
-    margin: 4px 5px;
+    padding-left: 8px;
+    padding-right: 8px;
     --padding-start: 0;
     --inner-padding-end: 0;
-    --background: transparent;
-    --background-hover: #000000 !important;
-    border-radius: var(--border-radius-item);
-    
     .selected {
+        border-radius: 10px;
+        padding-left: 8px;
+        padding-right: 8px;
         position: absolute;
         width: 100%;
         height: 100%;
         z-index:-1;
-        background: var(--list-bkg-color-selected);
-        border-right: 4px solid var(--basic-blue);
+        background-color: rgba(0, 0, 0, .05);
     }
     ion-avatar {
         position: relative;

package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.html

@@ -0,0 +1,3 @@
+<!-- <div class="row-day">
+  <div class="header-day">{{messageDate | amTimeAgo}}</div>
+</div> -->

package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.scss

@@ -0,0 +1,21 @@
+.row-day {
+    padding: 0 10px;
+    text-align: center;
+    width: 100%;
+    margin-top: 15px;
+    margin-bottom: 5px;
+}
+.header-day {
+    background-color: var(--transparent);
+    padding-top: 4px;
+    padding-bottom: 4px;
+    padding-left: 12px;
+    padding-right: 12px;
+    vertical-align: middle;
+    border-radius: 13px;
+    font-size: 14px;
+    font-weight: bold;
+    color: var(--basic-gray);
+    display: inline-block;
+}
+

package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BubbleDayMessageComponent } from './bubble-day-message.component';
+
+describe('BubbleDayMessageComponent', () => {
+  let component: BubbleDayMessageComponent;
+  let fixture: ComponentFixture<BubbleDayMessageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BubbleDayMessageComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BubbleDayMessageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.ts

@@ -0,0 +1,14 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-bubble-day-message',
+  templateUrl: './bubble-day-message.component.html',
+  styleUrls: ['./bubble-day-message.component.scss'],
+})
+export class BubbleDayMessageComponent implements OnInit {
+  @Input() messageDate = '';
+  constructor() { }
+
+  ngOnInit() {}
+
+}

package/src/app/components/conversation-detail/bubble-my-message/bubble-my-message.component.html

@@ -0,0 +1,54 @@
+<div class="message message-my" [class.first-message]="isFirstMessage" >
+ 
+  <div class="bubble-message" 
+    [class.image]="message.type == 'image'" 
+    [class.no-text]="!message.text" 
+    (mouseover)="showButtonInfo()">
+    <span class="buttonInfo" (click)="presentPopover($event, message)"> </span>
+    
+    <div *ngIf="message.type == 'image';" 
+    (click)="popupUrl(message.metadata.src,'windowName')"
+    >
+      <img 
+        class="message-content message-content-image" 
+        [src]="message.metadata.src" 
+        [width]="getSizeImg(message).width"
+        [height]="getSizeImg(message).height" />
+    </div>
+    
+    <div *ngIf="message.type == 'file';" class="message-content message-content-text" 
+    [innerHTML]="urlify(message.metadata.src, message.metadata.name)"
+    ></div>
+    
+    <div>
+    
+    <!-- <div *ngIf="message.type == 'text'"> -->
+      <div *ngIf="isPopupUrl(message.text); then contentPopup else contentNewTab">here is ignored</div>
+      <ng-template #contentPopup>
+        <div style="text-decoration: underline; padding:8px; cursor: pointer;" (click)="popupUrl(message.text,'windowName')">{{stripTags(message.text)}}</div>
+      </ng-template>
+      <ng-template #contentNewTab>
+        <div class="message-content message-content-text" [innerHTML]="message.text"></div>
+      </ng-template>
+    <!-- </div> -->
+
+    </div>
+    
+    <div class="timestamp-message right">{{message.timestamp | date: 'H:mm'}}</div>
+  </div>
+
+  <div class="attribute-message">
+    <div class="status-message">
+      <span *ngIf="!message.status" class="material-icons">
+        <ion-icon name="time-outline"></ion-icon>
+      </span>
+      <span *ngIf="message.status==MSG_STATUS_SENT" class="material-icons">
+        <ion-icon name="checkmark-outline"></ion-icon>
+      </span>
+      <span *ngIf="message.status==MSG_STATUS_RETURN_RECEIPT" class="material-icons">
+        <ion-icon name="checkmark-done-outline"></ion-icon>
+      </span>
+    </div>
+  </div>
+  
+</div>

package/src/app/components/conversation-detail/bubble-my-message/bubble-my-message.component.scss

@@ -0,0 +1,98 @@
+.message {
+    .bubble-message {
+        position: relative;
+        border-radius: 15px;
+        font-size: 15px;
+        // padding: 5px 10px 10px 10px;
+        display: block;
+        width: auto;
+        max-width: 80%;
+        line-height: 1.34;
+        direction: ltr;
+        padding: 0px;
+        .message-content-image {
+            border-radius: 15px 6px 0px 0px;
+        }
+        &.no-text {
+            line-height: 0;
+            .message-content-image {
+                border-radius: 15px 6px 0px 15px;
+            }
+            .message-content.message-content-text{
+                padding: 0px;
+                height: 0px;
+            }
+            .timestamp-message {
+                background-color: #00000045;
+                padding: 4px;
+                color: white;
+            }
+        }
+        &.image{
+            max-width: 300px;
+        }
+        
+    }
+
+    
+    
+    .message-content:after {
+        content: "\00a0\00a0\00a0\00a0\00a0\00a0";
+    }
+    .timestamp-message {
+        font-size: 10px;
+        padding: 0px;
+        position: absolute;
+        bottom: 2px;
+        right: 6px;
+        line-height: 15px;
+    }
+}
+.message-my {
+    width: 100%;
+    margin-top: 4px;
+    .message-content.message-content-text{
+        color: var(--white)!important;
+        padding: 5px 20px 5px 10px;
+    }
+        
+  
+    .bubble-message {
+        background-color: var(--bubble-blue);
+        color: white;
+        margin-right: 24px;
+        float: right;
+        border-top-right-radius: 6px;
+        border-bottom-right-radius: 6px;
+    }
+    &.first-message {
+        margin-top: 10px;
+        .bubble-message {
+            border-top-right-radius: 12px;
+            border-bottom-right-radius: 0px;
+        }
+    }
+    .timestamp-message {
+        color: var(--white);
+    }
+    .attribute-message {
+        position: absolute;
+        width: 100%;
+        background-color: transparent;
+        bottom: 0;
+        right: 0;
+        .status-message {
+            position: absolute;
+            top: 0;
+            right: 0;
+            width: 15px;
+            .material-icons {
+                font-size: 15px;
+                color: var(--basic-blue);
+                position: absolute;
+                bottom: 4px;
+                right: 2px;
+            }
+        }
+    }
+}

package/src/app/components/{conversations-list/header-conversations-list/header-conversations-list.component.spec.ts → conversation-detail/bubble-my-message/bubble-my-message.component.spec.ts}

@@ -1,19 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { HeaderConversationsList } from './header-conversations-list.component';
+import { BubbleMyMessageComponent } from './bubble-my-message.component';
 
-describe('ConversationsListHeader', () => {
-  let component: HeaderConversationsList;
-  let fixture: ComponentFixture<HeaderConversationsList>;
+describe('BubbleMineMessageComponent', () => {
+  let component: BubbleMyMessageComponent;
+  let fixture: ComponentFixture<BubbleMyMessageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HeaderConversationsList ],
+      declarations: [ BubbleMyMessageComponent ],
       imports: [IonicModule.forRoot()]
     }).compileComponents();
 
-    fixture = TestBed.createComponent(HeaderConversationsList);
+    fixture = TestBed.createComponent(BubbleMyMessageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   }));