@chat21/chat21-ionic 3.0.61-rc2 → 3.0.61-rc21

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -18,11 +18,11 @@ import { ConversationHandlerService } from '../abstract/conversation-handler.ser
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO , TOUCHING_OPERATOR} from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO, TOUCHING_OPERATOR } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 
 
-import { messageType } from 'src/chat21-core/utils/utils-message';
+import { messageType, isEmojii } from 'src/chat21-core/utils/utils-message';
 
 
 
@@ -156,7 +156,8 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             typeMsg,
             attributes,
             channelType,
-            false
+            false,
+            isEmojii(msg)
         );
         const messageRef = firebaseMessagesCustomUid.push({
             language: lang,
@@ -288,6 +289,10 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
 
         // verifico che il sender è il logged user
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+
+        //check if message contains only an emojii
+        msg.emoticon = isEmojii(msg.text)
+
         // traduco messaggi se sono del server
         if (msg.attributes && msg.attributes.subtype) {
             if (msg.attributes.subtype === 'info' || msg.attributes.subtype === 'info/support') {

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

@@ -108,4 +108,9 @@ export const LogLevel = {
     'WARN': 1,
     'INFO': 2,
     'DEBUG': 3
-}
+}
+
+export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr']
+
+
+

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

@@ -85,6 +85,25 @@ export function messageType(msgType: string, message: any) {
     }
 }
 
+export function isEmojii(message: any){
+  if (message.length > 2) {
+    return false;
+  }
+  let fistChar = '';
+  try {
+    fistChar = message.trim(); // .charAt(0);
+  } catch (e) {
+    return false;
+  }
+
+  const ranges = ['(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])'];
+  if (fistChar.match(ranges.join('|'))) {
+      return true;
+  } else {
+      return false;
+  }
+}
+
 /** */
 export function getSizeImg(message: any, maxWidthImage?: number): any {
     try {

package/src/global.scss

@@ -58,7 +58,6 @@ body {
     // -webkit-font-smoothing: subpixel-antialiased !important;
     // text-shadow: 0px 0px 0px !important;
     // -webkit-text-stroke-width: 0.01px !important;
-  
 }
 
 // Ionic 'Split Pane' styles need to be tweaked to
@@ -543,6 +542,14 @@ select:-webkit-autofill:focus {
     color: #f44336;
 }
 
+#canned > ion-list > ion-item > div > div.no-canned-available-text {
+    color: #1877f2 !important;
+}
+
+#canned > ion-list > ion-item > div > div.no-canned-available-text:hover {
+    text-decoration: underline;
+}
+
 .highlight-search-string {
     color: #1877f2 !important;
 }
@@ -650,9 +657,9 @@ select:-webkit-autofill:focus {
 }
 
 .small-sidebar-tiledesk-nav-user {
-    height: 40px;
-    min-height: 40px;
-    max-height: 40px;
+    height: 35px;
+    min-height: 35px;
+    max-height: 35px;
 }
 
 .user {
@@ -674,41 +681,41 @@ select:-webkit-autofill:focus {
     display: none;
 }
 
-.small-sidebar-email {
-    display: none;
-}
+
 
 .tiledesk-nav-avatar {
     background-color: #2d323e !important;
     color: #fff !important;
 }
 
-.avatar-container {
+.sidebar-avatar-container {
     text-align: center;
     cursor: pointer;
     position: absolute;
     // top: 80px;
     border-radius: 50%;
-    padding: 4px;
+    // padding: 4px;
     -webkit-transform: translateX(-50%);
     transform: translateX(-50%);
     left: 50%;
+    width: 35px;
+    height: 35px;
 }
 
-.avatar-container .sidebar-avatar {
-    width: 40px;
-    height: 40px;
+.sidebar-avatar-container .sidebar-avatar {
+    width: 35px;
+    height: 35px;
     margin: 0;
     border-radius: 50%;
     -o-object-fit: cover;
     object-fit: cover;
-    min-width: 40px;
-    max-width: 40px;
+    min-width: 35px;
+    max-width: 35px;
 }
 
 .small-sidebar-status-icon {
-    left: 33px !important;
-    bottom: 4px !important;
+    left: 26px !important;
+    bottom: -1px !important;
     width: 12px !important;
     height: 12px !important;
 }
@@ -740,11 +747,11 @@ select:-webkit-autofill:focus {
 }
 
 .sidebar--isBusy-icon-wpr {
-    width: 14px;
-    height: 14px;
+    width: 12px;
+    height: 12px;
     position: absolute;
-    top: 12px;
-    right: 37px;
+    top: -5px;
+    right: 25px;
 }
 
 @media (max-width: 991px) {
@@ -754,7 +761,7 @@ select:-webkit-autofill:focus {
 }
 
 .sidebar .nav {
-    margin-top: 20px;
+    margin-top: 0px;
 }
 
 .nav {
@@ -777,8 +784,9 @@ select:-webkit-autofill:focus {
     margin-bottom: 5px;
 }
 
-.nav > li:hover {
-    background-color: #eee;
+.nav > li:hover > a > i {
+    // background-color: #eee;
+    color: #a9afbb
 }
 
 .sidebar .nav li > a {
@@ -794,7 +802,7 @@ select:-webkit-autofill:focus {
 
 .item-active {
     height: 40px;
-    background-color: #3ea9f5;
+    // background-color: #3ea9f5;
     color: #fff !important;
     pointer-events: none;
 }
@@ -810,7 +818,7 @@ select:-webkit-autofill:focus {
 }
 
 .logo {
-    background-color: #1e2129 !important;
+    background-color: #2d323e !important;
     padding-bottom: 5px;
     min-height: 60px;
     width: 60px; // for SMALL SIDEBAR
@@ -844,55 +852,39 @@ select:-webkit-autofill:focus {
     display: none;
 }
 
-.small-sidebar-status-icon {
-    left: 33px !important;
-    bottom: 4px !important;
-    width: 12px !important;
-    height: 12px !important;
-}
-
-.small-sidebar-status-text {
-    display: none;
-}
-
-.small-sidebar-userfullname {
-    display: none;
-}
-
-.small-sidebar-camera-icon {
-    // top: 86px !important;
-    top: 19px !important;
-}
 
 /* OVERWRITE THE DEFAULT STYLE */
 .nav-mobile-menu {
     margin-top: 45px !important;
 }
-/* // NK end NEW: AVATAR ON THE SIDEBAR  */
 
-/* NK start CUSTOM SCROLL BAR */
-/* width */
-::-webkit-scrollbar {
+
+/* CUSTOM SCROLL BAR FOR LEFT SIDEBAR */
+.sidebar-wrapper::-webkit-scrollbar {
     width: 3px;
 }
-
-/* Track */
-::-webkit-scrollbar-track {
-    background: #f1f1f1;
+.sidebar-wrapper::-webkit-scrollbar-track {
+    background-color: #1c2b45;
+}
+.sidebar-wrapper::-webkit-scrollbar-thumb {
+    background-color: #3c485b;
+    border-radius: 3px;
 }
 
-/* Handle */
-::-webkit-scrollbar-thumb {
-    background: #888;
-    /* border-radius: 6px; */
+/* CUSTOM SCROLL BAR FOR USER DETAILS DRAWER */
+#user-details::-webkit-scrollbar {
+    width: 3px;
 }
 
-/* Handle on hover */
-::-webkit-scrollbar-thumb:hover {
-    background: #555;
-    /* width: 10px !important; */
+#user-details::-webkit-scrollbar-track {
+    background-color: #1c2b45;
 }
-/* NK end CUSTOM SCROLL BAR */
+#user-details::-webkit-scrollbar-thumb {
+    background-color: #3c485b;
+    border-radius: 3px;
+}
+
+/* end CUSTOM SCROLL BAR */
 
 /* SIDEBAR NAV ITEMS  */
 
@@ -912,12 +904,7 @@ select:-webkit-autofill:focus {
     margin-top: 0px;
 }
 
-.logo {
-    background-color: #1e2129 !important;
-    padding-bottom: 5px;
-    min-height: 60px;
-    width: 60px; // for SMALL SIDEBAR
-}
+
 
 /* *** SMALL SIDEBAR STYLE ***  */
 .small-sidebar-tiledesk-nav-user {
@@ -926,32 +913,16 @@ select:-webkit-autofill:focus {
     max-height: 40px;
 }
 .small-sidebar-avatar {
-    top: 12px;
+    top: 13px;
 }
-
-.small-sidebar-email {
-    display: none;
-}
-
-.small-sidebar-status-icon {
-    left: 33px !important;
-    bottom: 4px !important;
-    width: 12px !important;
-    height: 12px !important;
+.small-sidebar-avatar-with-avatar {
+    top: 13px;
 }
 
 .small-sidebar-status-text {
     display: none;
 }
 
-.small-sidebar-userfullname {
-    display: none;
-}
-
-.small-sidebar-camera-icon {
-    // top: 86px !important;
-    top: 19px !important;
-}
 
 /* OVERWRITE THE DEFAULT STYLE */
 .nav-mobile-menu {
@@ -959,30 +930,6 @@ select:-webkit-autofill:focus {
 }
 /* // NK end NEW: AVATAR ON THE SIDEBAR  */
 
-/* NK start CUSTOM SCROLL BAR */
-/* width */
-::-webkit-scrollbar {
-    width: 8px;
-}
-
-/* Track */
-::-webkit-scrollbar-track {
-    background: #f1f1f1;
-}
-
-/* Handle */
-::-webkit-scrollbar-thumb {
-    background: #888;
-    /* border-radius: 6px; */
-}
-
-/* Handle on hover */
-::-webkit-scrollbar-thumb:hover {
-    background: #555;
-    /* width: 10px !important; */
-}
-/* NK end CUSTOM SCROLL BAR */
-
 /* SIDEBAR NAV ITEMS  */
 
 .item-active a {
@@ -1032,6 +979,13 @@ ul.dropdown-menu > li > a {
     // line-height: 30px;
     width: 60px;
     text-align: center;
-    color: #a9afbb;
+    // color: #a9afbb;
+    color: #647491;
     padding-top: 10px;
 }
+
+// ng-select custom class in Create ticket modal
+.ng-select.create-ticket-custom-select {
+    margin-top: 5px !important;
+}
+

package/publish_pre.sh

@@ -1,33 +0,0 @@
-npm version patch
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-echo 'URL_VER: ---->'$URL_VER
-
-# if [ "$version" != "" ]; then
-#     git tag -a "$version" -m "`git log -1 --format=%s`"
-#     echo "Created a new tag, $version"
-#     git push --tags
-#     npm publish
-# fi
-
-# sed -i -e "s/$start$ver.$build/$start$NEW_VER.$NEW_BUILD/g" src/utils/constants.ts
-sed -i -e "s/$URL_VER/g" src/utils/constants.ts
-ionic cordova platform add browser --save
-#ionic cordova build --env=prod browser  -- --base-href /www/ --prod
-ionic cordova build --env=prod browser --prod 
-cp -p src/firebase-messaging-sw.js platforms/browser/www/
-cp -p src/manifest.json platforms/browser/www/
-cp -p src/chat-config.json platforms/browser/www/
-
-cd platforms/browser/www
-#aws s3 sync . s3://tiledesk-dashboard/chat/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/$version/
-cd ../../../
-# aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
-
-# echo new version deployed on s3://tiledesk-dashboard/chat/$NEW_BUILD/
-echo new version deployed on s3://tiledesk-console/v2/chat-ionic5/$version/
-echo available on https://console.tiledesk.com/v2/chat-ionic5/$version/index.html

package/publish_prod.sh

@@ -1,33 +0,0 @@
-npm version patch
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-echo 'URL_VER: ---->'$URL_VER
-
-# if [ "$version" != "" ]; then
-#     git tag -a "$version" -m "`git log -1 --format=%s`"
-#     echo "Created a new tag, $version"
-#     git push --tags
-#     npm publish
-# fi
-
-# sed -i -e "s/$start$ver.$build/$start$NEW_VER.$NEW_BUILD/g" src/utils/constants.ts
-sed -i -e "s/$URL_VER/g" src/utils/constants.ts
-ionic cordova platform add browser --save
-#ionic cordova build --env=prod browser  -- --base-href /www/ --prod
-ionic cordova build --env=prod browser --prod 
-cp -p src/firebase-messaging-sw.js platforms/browser/www/
-cp -p src/manifest.json platforms/browser/www/
-cp -p src/chat-config.json platforms/browser/www/
-
-cd platforms/browser/www
-#aws s3 sync . s3://tiledesk-dashboard/chat/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/
-aws s3 sync . s3://tiledesk-console/v2/chat-ionic5/$version/
-cd ../../../
-# aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
-
-# echo new version deployed on s3://tiledesk-dashboard/chat/$NEW_BUILD/
-echo new version deployed on s3://tiledesk-console/v2/chat-ionic5/$version/
-echo available on https://console.tiledesk.com/v2/chat-ionic5/$version/index.html