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

package/src/chat21-core/utils/user-typing/user-typing.component.ts

@@ -1,113 +1,31 @@
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
-
-// services
-import { TypingService } from '../../providers/abstract/typing.service';
-
-// Logger
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { Component, OnInit, OnDestroy, Input, ElementRef } from '@angular/core';
 
 @Component({
-  selector: 'app-user-typing',
+  selector: 'user-typing',
   templateUrl: './user-typing.component.html',
   styleUrls: ['./user-typing.component.scss'],
 })
 export class UserTypingComponent implements OnInit, OnDestroy {
 
-  @Input() idConversation: string;
-  @Input() idCurrentUser: string;
-  @Input() isDirect: boolean;
+ // @Input() idConversation: string;
+  // @Input() idCurrentUser: string;
+  // @Input() isDirect: boolean;
+  @Input() typingLocation: string = 'content'
   @Input() translationMap: Map<string, string>;
-  @Input() color: string;
-  @Input() membersConversation: [string];
-
-  public status = '';
-  public isTyping = false;
-  public nameUserTypingNow: string;
-
-  private setTimeoutWritingMessages: any;
-  private subscriptions = [];
-
-  private logger: LoggerService = LoggerInstance.getInstance();
+  @Input() themeColor: string;
+  @Input() idUserTypingNow: string;
+  @Input() nameUserTypingNow: string;
+  // @Input() membersConversation: [string];
 
-  constructor(
-    public typingService: TypingService
-  ) { }
+  constructor(private elementRef: ElementRef) { }
 
   /** */
   ngOnInit() {
-    this.logger.log('[USER-TYPING-COMPONENT] - ngOnInit');
-    this.initialize();
+    this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
   }
 
   /** */
   ngOnDestroy() {
-    this.logger.log('UserTypingComponent - ngOnDestroy');
-    // this.unsubescribeAll();
-  }
-
-  /** */
-  initialize() {
-    this.status = ''; // this.translationMap.get('LABEL_AVAILABLE');
-    this.logger.log('this.translationMap', this.translationMap);
-    this.logger.log('this.status', this.status);
-    this.setSubscriptions();
-    this.typingService.isTyping(this.idConversation, this.idCurrentUser, this.isDirect);
-  }
-
-  /** */
-  private setSubscriptions() {
-    const that = this;
-    const conversationSelected = this.subscriptions.find(item => item.key === this.idConversation);
-    if (!conversationSelected) {
-      const subscribeBSIsTyping =  this.typingService.BSIsTyping.subscribe((data: any) => {
-        this.logger.log('***** BSIsTyping *****', data);
-        if (data) {
-          const isTypingUid = data.uid;
-          if (this.idConversation === isTypingUid) {
-            that.subscribeTypings(data);
-          }
-        }
-      });
-      const subscribe = {key: this.idConversation, value: subscribeBSIsTyping };
-      this.subscriptions.push(subscribe);
-    }
-  }
-
-  /** */
-  subscribeTypings(data: any) {
-    const that = this;
-    try {
-      const key = data.uidUserTypingNow;
-      this.nameUserTypingNow = null;
-      if (data.nameUserTypingNow) {
-        this.nameUserTypingNow = data.nameUserTypingNow;
-      }
-      this.logger.log('subscribeTypings data:', data);
-      const userTyping = this.membersConversation.includes(key);
-      if ( !userTyping ) {
-        this.isTyping = true;
-        this.logger.log('child_changed key', key);
-        this.logger.log('child_changed name', this.nameUserTypingNow);
-        clearTimeout(this.setTimeoutWritingMessages);
-        this.setTimeoutWritingMessages = setTimeout(() => {
-            that.isTyping = false;
-        }, 2000);
-      }
-    } catch (error) {
-      this.logger.log('error: ', error);
-    }
-  }
-
-
-  /** */
-  private unsubescribeAll() {
-    this.logger.log('UserTypingComponent unsubescribeAll: ', this.subscriptions);
-    this.subscriptions.forEach((subscription: any) => {
-      this.logger.log('unsubescribe: ', subscription);
-      subscription.unsubescribe();
-    });
-    this.subscriptions = [];
   }
 
 

package/src/chat21-core/utils/utils.ts

@@ -590,8 +590,10 @@ export function setConversationAvatar(
   conversationWith: string,
   conversationWithFullname: string,
   conversationChannelType: string,
+  projectId?: string,
+  project_name?: string,
   width?: string,
-  height?: string
+  height?: string,
 ): any {
   const conversationWidth = (width) ? width : '40px';
   const conversationHeight = (height) ? height : '40px';
@@ -602,6 +604,8 @@ export function setConversationAvatar(
     channelType: conversationChannelType,
     avatar: avatarPlaceholder(conversationWithFullname),
     color: getColorBck(conversationWithFullname),
+    projectId: projectId,
+    project_name: project_name,
     width: conversationWidth,
     height: conversationHeight
   };
@@ -810,6 +814,10 @@ export function redirect2(router, IDConv, conversationSelected) {
 /** */
 export function checkPlatformIsMobile() {
   // console.log('UTILS - checkPlatformIsMobile:: ', window.innerWidth);
+  // if (/Android|iPhone/i.test(window.navigator.userAgent)) {
+  //   return true
+  // }
+  // return false
   if (window.innerWidth < 768) {
     return true;
   }

package/src/global.scss

@@ -794,66 +794,70 @@ select:-webkit-autofill:focus {
 }
 
 // select teammate status in user detail drawer
-.ng-select.teammate-status-in-drawer {
+.teammate-status-in-drawer {
+
+    &.ng-select {
 
-    .ng-select-container {
-        background-color: #2d323e;
-        color: #fff;
-        border: 1px solid #2d323e;
-    }
-    &.ng-select-opened{
         .ng-select-container {
             background-color: #2d323e;
+            color: #fff;
             border: 1px solid #2d323e;
         }
+        &.ng-select-opened{
+            .ng-select-container {
+                background-color: #2d323e;
+                border: 1px solid #2d323e;
+            }
+        }
+    
+        &.ng-select-focused:not(.ng-select-opened){
+             >.ng-select-container{
+                border: 1px solid #2d323e;
+                box-shadow: unset;
+             }
+        }
+    
+        
     }
 
-    &.ng-select-focused:not(.ng-select-opened){
-         >.ng-select-container{
+    .ng-dropdown-panel {
+        background-color: #2d323e;
+        border: 1px solid #2d323e;
+    
+        &.ng-select-bottom {
             border: 1px solid #2d323e;
-            box-shadow: unset;
-         }
-    }
-
+            margin-top: 8px;
+            border-top-right-radius: 4px;
+            border-top-left-radius: 4px;
+        }
     
-}
-
-.ng-dropdown-panel {
-    background-color: #2d323e;
-    border: 1px solid #2d323e;
-
-    &.ng-select-bottom {
-        border: 1px solid #2d323e;
-        margin-top: 8px;
-        border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-    }
-
-    .ng-dropdown-panel-items {
-        .ng-option {
-            background-color: #2d323e;
-            color: #fff;
-
-            &.ng-option-marked {
-                background-color: rgba(30, 33, 41, 0.3);
-                color: #fff;
-            }
-
-            &.ng-option-selected {
+        .ng-dropdown-panel-items {
+            .ng-option {
                 background-color: #2d323e;
                 color: #fff;
+    
+                &.ng-option-marked {
+                    background-color: rgba(30, 33, 41, 0.3);
+                    color: #fff;
+                }
+    
+                &.ng-option-selected {
+                    background-color: #2d323e;
+                    color: #fff;
+                }
+    
+                &.ng-option-marked.ng-option-selected{
+                    background-color: rgba(30, 33, 41, 0.3);
+                    color: #fff;
+                }
             }
-
-            &.ng-option-marked.ng-option-selected{
-                background-color: rgba(30, 33, 41, 0.3);
-                color: #fff;
-            }
+            
         }
-        
     }
 }
 
 
+
 /* *** SMALL SIDEBAR STYLE ***  */
 .small-sidebar-tiledesk-nav-user {
     height: 40px;

package/src/variables.scss

@@ -1,4 +1,4 @@
-:root {
+body {
     /* Color palette */
     --white: #ffffff;
     --black: #000000;
@@ -7,27 +7,44 @@
     --basic-green: #0A7D41;
     --dark-green: #005f3b;
     --light-green: #8cc841;
-    
     --light-gray: #F2F2F2;
     --basic-gray: #666666;
     --dark-gray: #363636;
-    
-
     --light-blue: #C9E4F6;
     --basic-blue: #2a69c1;
     --bubble-blue: rgb(0, 153, 255);
-    --bubble-lightyellow: rgb(255, 247, 237);
-    --bubble-privateMsg: rgb(254, 214, 168);
-    --bubble-privateMsgColor: rgb(47, 57, 65);
+    
 
     --basic-yellow: #FFC627;
     --basic-red: #EB1E23;
 
-    --bck-msg-sent: #62a8ea;
+    --bck-msg-sent: #2a6ac1;
     --col-msg-sent:#ffffff;
+
+    --bck-msg-received: #f0f2f7;
+    --col-msg-received: #06132b;
+
+    --bubble-lightyellow: rgb(255, 247, 237);
+    --bubble-privateMsg: rgb(254, 214, 168);
+    --bubble-privateMsgColor: rgb(47, 57, 65);
+
     --light-white: #f7f7f7;
     --black: #1a1a1a;
     --gray: #aaaaaa;
 
+    --header-height: 60px;
+    --list-bkg-color: #f8fafc;
+    --list-bkg-color-selected: rgba(24, 119, 242, 0.12); //rgba(24, 119, 242, 0.04);
+
+    --button-in-msg-font-size: 15px;
+    --buttonBackgroundColor: #ffffff;
+    --buttonTextColor: #2a6ac1;
+    --buttonHoverBackgroundColor: #2a6ac1;
+    --buttonHoverTextColor: #ffffff;
+
+    --padding-conversation-detail: 10px;
+
+    --border-radius-item: 16px;
+    --border-radius-content: 16px
     
-  }
+}

package/src/app/components/conversation-detail/option-header/option-header.component.html

@@ -1,13 +0,0 @@
-<ion-header no-border class="ion-no-border">
-  <ion-toolbar>
-    
-    <ion-buttons slot="start">
-      <ion-button ion-button (click)="onBackButtonHandler()">
-        <ion-icon slot="icon-only" name="arrow-back-outline"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-
-    <ion-title> {{headerTitle}}</ion-title>
-
-  </ion-toolbar>
-</ion-header>