@chat21/chat21-web-widget 5.0.89 → 5.0.90-rc.2

package/src/app/component/message/bubble-message/bubble-message.component.html

@@ -1,9 +1,26 @@
 <!-- [ngClass]="{'button-in-msg' : message.metadata && message.metadata.button}" -->
 <!-- ngStyle]="{'padding': (isImage(message) || isFrame(message))?'1px':'0 8px'}" -->
 <!-- 'width': (isImage(message) || isFrame(message))? sizeImage?.width + 'px': null  -->
-<div id="bubble-message" [ngStyle]="{'padding': (isImage(message) || isFrame(message))?'0 0px':'0 8px'}" class="messages primary-color">
-  
+
+
     
+<!-- <div id="bubble-message" *ngIf="isAudio(message)" [ngStyle]="{'padding': '0'}" class="messages primary-color">
+  <div>
+    <chat-audio-track  *ngIf="isAudio(message)"
+      [metadata]="message.metadata" 
+    ></chat-audio-track>
+  </div>
+</div> 
+
+
+[ngStyle]="{'padding': (isImage(message) || isFrame(message) || isAudio(message))?'0 0px':'0 8px'}"
+-->
+
+
+
+
+
+<div id="bubble-message"  class="messages primary-color">
     <div>
 
       <div *ngIf="messageType(MESSAGE_TYPE_OTHERS, message) && !isSameSender"
@@ -36,10 +53,18 @@
         (onElementRendered)="onElementRenderedFN($event)">
       </chat-frame>
 
-      <chat-audio *ngIf="isAudio(message)"
+      <!-- <chat-audio *ngIf="isAudio(message)"
         [metadata]="message.metadata" 
         (onElementRendered)="onElementRenderedFN($event)">
-      </chat-audio>
+      </chat-audio> -->
+
+      <chat-audio-track  *ngIf="isAudio(message)"
+        [metadata]="message.metadata"
+        [color]="fontColor"
+        [fontSize]="fontSize"
+        [stylesMap]="stylesMap">
+      </chat-audio-track>
+
 
       <!-- <chat-frame *ngIf="message.metadata && message.metadata.type && message.metadata.type.includes('video')"
         [metadata]="message.metadata"
@@ -51,7 +76,7 @@
       <!-- <div *ngIf="message.type == 'text'"> -->     
 
       <!-- tooltip="{{message.timestamp | dateAgo}} ({{message.timestamp | date:'shortDate'}} {{message.timestamp | date:'HH:mm:ss'}})" placement="bottom" -->
-      <div *ngIf="message?.text" >
+      <div *ngIf="message?.text && !isAudio(message)" >
 
         <!-- [htmlEnabled]="(message?.type==='html')? true : false" -->
         <chat-text *ngIf="message?.type !=='html'"

package/src/app/component/message/bubble-message/bubble-message.component.scss

@@ -5,6 +5,9 @@
     border-radius: var(--border-radius-bubble-message);
     padding: 0;
     word-wrap: break-word;
+
+    background: transparent;
+    
     // padding: 14px;
     // padding: 6px 6px 6px 6px;
     // box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
@@ -26,4 +29,8 @@
         height: auto;
         object-fit: cover;
     }
+
+    chat-audio-track {
+        display: flex;
+    }
 }

package/src/app/component/message/bubble-message/bubble-message.component.ts

@@ -42,6 +42,7 @@ export class BubbleMessageComponent implements OnInit {
   constructor(public sanitizer: DomSanitizer) { }
 
   ngOnInit() {
+    // console.log("---- > MSG:", this.message);
   }
 
   ngOnChanges() {

package/src/app/providers/global-settings.service.ts

@@ -196,12 +196,7 @@ export class GlobalSettingsService {
         } catch (error) {
             this.logger.error('[GLOBAL-SET] setMainParametersFromSettings filterByRequester > Error :', error);
         }
-        try {
-            const isLogEnabled = tiledeskSettings['isLogEnabled'];
-            if (typeof isLogEnabled !== 'undefined') { this.globals.isLogEnabled = (isLogEnabled === true) ? true : false; }
-        } catch (error) {
-            this.logger.error('[GLOBAL-SET] setMainParametersFromSettings isLogEnabled > Error :', error);
-        }
+
         try {
             const departmentID = tiledeskSettings['departmentID'];
             if (typeof departmentID !== 'undefined') { this.globals.departmentID = departmentID; }
@@ -209,14 +204,6 @@ export class GlobalSettingsService {
             this.logger.error('[GLOBAL-SET] setMainParametersFromSettings departmentID > Error :', error);
         }
 
-        try {
-            const showAttachmentButton = tiledeskSettings['showAttachmentButton'];
-            // tslint:disable-next-line:max-line-length
-            if (typeof showAttachmentButton !== 'undefined') { this.globals.showAttachmentButton = (showAttachmentButton === true) ? true : false; }
-        } catch (error) {
-            this.logger.error('[GLOBAL-SET] setMainParametersFromSettings showAttachmentButton > Error :', error);
-        }
-
         try {
             const showAllConversations = tiledeskSettings['showAllConversations'];
             // tslint:disable-next-line:max-line-length
@@ -839,11 +826,6 @@ export class GlobalSettingsService {
         if (TEMP !== undefined) {
             globals.customAttributes = TEMP;
         }
-        TEMP = tiledeskSettings['showAttachmentButton'];
-        // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > showAttachmentButton:: ', TEMP]);
-        if (TEMP !== undefined) {
-            globals.showAttachmentButton = (TEMP === true) ? true : false;
-        }
         TEMP = tiledeskSettings['showAllConversations'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > showAllConversations:: ', TEMP]);
         if (TEMP !== undefined) {
@@ -889,10 +871,10 @@ export class GlobalSettingsService {
         if (TEMP !== undefined) {
             globals.hideSettings = (TEMP === true) ? true : false;;
         }
-        TEMP = tiledeskSettings['logLevel'];
+        TEMP = tiledeskSettings['isLogEnabled'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > logLevel:: ', TEMP]);
         if (TEMP !== undefined) {
-            globals.logLevel = TEMP;
+            globals.isLogEnabled = TEMP;
         }
         TEMP = tiledeskSettings['preChatFormJson'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > preChatFormJson:: ', TEMP]);
@@ -900,7 +882,6 @@ export class GlobalSettingsService {
             if(isJsonArray(TEMP)){
                 globals.preChatFormJson = TEMP;
             }
-
         }
         TEMP = tiledeskSettings['bubbleSentBackground'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > bubbleSentBackground:: ', TEMP);
@@ -1055,7 +1036,17 @@ export class GlobalSettingsService {
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > onPageChangeVisibilityMobile:: ', TEMP]);
         if (TEMP !== undefined) {
             globals.onPageChangeVisibilityMobile = TEMP;
-        }     
+        }    
+        TEMP = tiledeskSettings['showAttachmentFooterButton'];
+        // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > showAttachmentFooterButton:: ', TEMP]);
+        if (TEMP !== undefined) {
+            globals.showAttachmentFooterButton = (TEMP === true) ? true : false;
+        }
+        TEMP = tiledeskSettings['showEmojiFooterButton'];
+        // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > showEmojiFooterButton:: ', TEMP]);
+        if (TEMP !== undefined) {
+            globals.showEmojiFooterButton = (TEMP === true) ? true : false;
+        } 
     }
 
     /**
@@ -1203,10 +1194,6 @@ export class GlobalSettingsService {
         if (TEMP !== null) {
             this.globals.filterByRequester = (TEMP === true) ? true : false;
         }
-        TEMP = el.nativeElement.getAttribute('showAttachmentButton');
-        if (TEMP !== null) {
-            this.globals.showAttachmentButton = (TEMP === true) ? true : false;
-        }
         TEMP = el.nativeElement.getAttribute('departmentID');
         if (TEMP !== null) {
             this.globals.departmentID = TEMP;
@@ -1326,6 +1313,14 @@ export class GlobalSettingsService {
         if (TEMP !== null) {
             this.globals.disconnetTime = +TEMP;
         }
+        TEMP = el.nativeElement.getAttribute('showAttachmentFooterButton');
+        if (TEMP !== null) {
+            this.globals.showAttachmentFooterButton = (TEMP === true) ? true : false;
+        }
+        TEMP = el.nativeElement.getAttribute('showEmojiFooterButton');
+        if (TEMP !== null) {
+            this.globals.showEmojiFooterButton = (TEMP === true) ? true : false;
+        }
         
         
     }
@@ -1574,11 +1569,6 @@ export class GlobalSettingsService {
             globals.customAttributes = JSON.parse(TEMP);
         }
 
-        TEMP = getParameterByName(windowContext, 'tiledesk_showAttachmentButton');
-        if (TEMP) {
-            globals.showAttachmentButton = stringToBoolean(TEMP);
-        }
-
         TEMP = getParameterByName(windowContext, 'tiledesk_departmentID');
         if (TEMP) {
             globals.departmentID = TEMP;
@@ -1784,6 +1774,16 @@ export class GlobalSettingsService {
         if (TEMP) {
             globals.isDevMode = stringToBoolean(TEMP);
         }
+
+        TEMP = getParameterByName(windowContext, 'tiledesk_showAttachmentFooterButton');
+        if (TEMP) {
+            globals.showAttachmentFooterButton = stringToBoolean(TEMP);
+        }
+
+        TEMP = getParameterByName(windowContext, 'tiledesk_showEmojiFooterButton');
+        if (TEMP) {
+            globals.showEmojiFooterButton = stringToBoolean(TEMP);
+        }
         
     }
 

package/src/app/utils/globals.ts

@@ -175,7 +175,6 @@ export class Globals {
   supportMode: boolean;
 
   customAttributes: any;
-  showAttachmentButton: boolean;
   showAllConversations: boolean;
   //  privacyField: string;
   jwt: string;
@@ -216,6 +215,9 @@ export class Globals {
 
   hiddenMessage: string; // *******  new ********
   isDevMode: boolean; // *******  new ********
+
+  showEmojiFooterButton: boolean // *******  new ********
+  showAttachmentFooterButton: boolean // *******  new ********
   constructor(
   ) { }
 
@@ -388,7 +390,7 @@ export class Globals {
     /**enable user to set a facebook messanger page to chat with */
     this.telegramUsername = ''
     /**enable user to set a telegram number to chat with */
-    this.fileUploadAccept = "image/*,.pdf,.txt"
+    this.fileUploadAccept = "image/*,.pdf,.txt,.mp3"
     /**enable auto disconnect from messaging after a defined amount of time (s)*/
     this.disconnetTime = 0
 
@@ -400,7 +402,6 @@ export class Globals {
     this.showLogoutOption = false;
 
     this.isOpenNewMessage = false;
-    this.showAttachmentButton = true;
     this.showAllConversations = true;
 
     //WIDGET VISIBILITY - desktop
@@ -412,6 +413,10 @@ export class Globals {
 
     /**set an hidden message to show when conversation starts */
     this.hiddenMessage = null
+    /** show/hide emoji option in footer chat-detail page */
+    this.showEmojiFooterButton = true;
+    /** show/hide attachment option in footer chat-detail page */
+    this.showAttachmentFooterButton = true;
 
     // ============ END: SET EXTERNAL PARAMETERS ==============//
 
@@ -540,10 +545,11 @@ export class Globals {
       'projectid': this.projectid,
       'recipientId': this.recipientId,
       'restartConversation': this.restartConversation,
+      'showAllConversations': this.showAllConversations, 'showAvailableAgents': this.showAvailableAgents,
+      'showAttachmentFooterButton': this.showAttachmentFooterButton, 'showEmojiFooterButton': this.showEmojiFooterButton, 
+      'showInfoMessage': this.showInfoMessage, 'showWaitTime': this.showWaitTime, 
+      'showLogoutOption': this.showLogoutOption,
       'singleConversation': this.singleConversation,
-      'showInfoMessage': this.showInfoMessage, 'showAllConversations': this.showAllConversations, 
-      'showWaitTime': this.showWaitTime, 'showAvailableAgents': this.showAvailableAgents,
-      'showLogoutOption': this.showLogoutOption, 'showAttachmentButton': this.showAttachmentButton,
       'soundEnabled': this.soundEnabled, 
       'startHidden': this.startHidden, 'startFromHome': this.startFromHome, 
       'tenant': this.tenant, 

package/src/assets/twp/index-dev.html

@@ -131,6 +131,7 @@
             display: -webkit-box;
             max-height: 258px; /* Fallback for non-webkit */
             line-height: 2.3;
+            line-clamp: 8;
             -webkit-line-clamp: 8;
             -webkit-box-orient: vertical;
             overflow: hidden;
@@ -1340,13 +1341,19 @@
             window.Tiledesk('restart')
         }
 
-        function onClickShowAttachmentButton(){
-            let status = document.querySelector('input[name="showAttachmentButton"]:checked').value
-            window.tiledeskSettings['showAttachmentButton'] = stringToBoolean(status)
-            console.log('onClickShowAttachmentButton:', window.tiledeskSettings)
+        function onClickShowAttachmentFooterButton(){
+            let status = document.querySelector('input[name="showAttachmentFooterButton"]:checked').value
+            window.tiledeskSettings['showAttachmentFooterButton'] = stringToBoolean(status)
+            console.log('onClickShowAttachmentFooterButton:', window.tiledeskSettings)
+            window.Tiledesk('restart')
+        }
+        
+        function onClickShowEmojiFooterButton(){
+            let status = document.querySelector('input[name="showEmojiFooterButton"]:checked').value
+            window.tiledeskSettings['showEmojiFooterButton'] = stringToBoolean(status)
+            console.log('onClickShowEmojiFooterButton:', window.tiledeskSettings)
             window.Tiledesk('restart')
         }
-
 
 
 
@@ -2370,13 +2377,23 @@
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>showAttachmentButton</strong></em></span></div>
+                            <div class="col-md-5 formElement"><span><em><strong>showAttachmentFooterButton</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="showAttachmentFooterButton" value="true" checked><label>True</label>
+                                <input class="form-check-input" type="radio" name="showAttachmentFooterButton" value="false"><label>False</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickShowAttachmentFooterButton()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-5 formElement"><span><em><strong>showEmojiFooterButton</strong></em></span></div>
                             <div class="col-md-5">
-                                <input class="form-check-input" type="radio" name="showAttachmentButton" value="true" checked><label>True</label>
-                                <input class="form-check-input" type="radio" name="showAttachmentButton" value="false"><label>False</label>
+                                <input class="form-check-input" type="radio" name="showEmojiFooterButton" value="true" checked><label>True</label>
+                                <input class="form-check-input" type="radio" name="showEmojiFooterButton" value="false"><label>False</label>
                             </div>
                             <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickShowAttachmentButton()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
+                                <button class="btn btn-light" onclick="onClickShowEmojiFooterButton()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
 

package/src/app/component/message/audio/audio.component.html

@@ -1,20 +0,0 @@
-
-
-<div id="audio_container" #audio_container> 
-
-    <audio aria-label="traccia audio" #audio_msg controls controlsList="nodownload" id="audio_msg" (pause)="pauseAudioMsg($event)" (play)="playAudioMsg($event)" (timeupdate)="updateTimeAudioMsg($event)">
-        <source [src]="metadata?.src" [type]="metadata?.type">
-        <!-- {{metadata?.src}} -->
-        <!-- controlsList="nodownload" -->
-    </audio>
-
-    <!-- <button id="play-icon" (click)="onPlayPause('play')" *ngIf="status === 'play'">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z"/></svg>
-    </button> 
-    <button id="pause-icon" (click)="onPlayPause('pause')" *ngIf="status === 'pause'">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/></svg>
-    </button>
-    <div id="duration" #duration>0:00</div>
-    <input type="range" id="seek-slider" max="100" value="0"> -->
-</div>
-

package/src/app/component/message/audio/audio.component.scss

@@ -1,122 +0,0 @@
-#audio_container{
-    display: flex;
-}
-
-#play-icon,
-#pause-icon {
-    margin: 20px 2.5% 10px 2.5%;
-}
-
-.time {
-    display: inline-block;
-    width: 37px;
-    text-align: center;
-    font-size: 20px;
-    margin: 28.5px 0 18.5px 0;
-    float: left;
-}
-output {
-    display: inline-block;
-    width: 32px;
-    text-align: center;
-    font-size: 20px;
-    margin: 10px 2.5% 0 5%;
-    float: left;
-    clear: left;
-}
-
-input[type="range"] {
-    position: relative;
-    -webkit-appearance: none;
-    width: 48%;
-    margin: 0;
-    padding: 0;
-    height: 19px;
-    margin: 30px 2.5% 20px 2.5%;
-    float: left;
-    outline: none;
-}
-input[type="range"]::-webkit-slider-runnable-track {
-    width: 100%;
-    height: 3px;
-    cursor: pointer;
-    background: linear-gradient(to right, rgba(0, 125, 181, 0.6) var(--buffered-width), rgba(0, 125, 181, 0.2) var(--buffered-width));
-}
-input[type="range"]::before {
-    position: absolute;
-    content: "";
-    top: 8px;
-    left: 0;
-    width: var(--seek-before-width);
-    height: 3px;
-    background-color: #007db5;
-    cursor: pointer;
-}
-input[type="range"]::-webkit-slider-thumb {
-    position: relative;
-    -webkit-appearance: none;
-    box-sizing: content-box;
-    border: 1px solid #007db5;
-    height: 15px;
-    width: 15px;
-    border-radius: 50%;
-    background-color: #fff;
-    cursor: pointer;
-    margin: -7px 0 0 0;
-}
-input[type="range"]:active::-webkit-slider-thumb {
-    transform: scale(1.2);
-    background: #007db5;
-}
-input[type="range"]::-moz-range-track {
-    width: 100%;
-    height: 3px;
-    cursor: pointer;
-    background: linear-gradient(to right, rgba(0, 125, 181, 0.6) var(--buffered-width), rgba(0, 125, 181, 0.2) var(--buffered-width));
-}
-input[type="range"]::-moz-range-progress {
-    background-color: #007db5;
-}
-input[type="range"]::-moz-focus-outer {
-    border: 0;
-}
-input[type="range"]::-moz-range-thumb {
-    box-sizing: content-box;
-    border: 1px solid #007db5;
-    height: 15px;
-    width: 15px;
-    border-radius: 50%;
-    background-color: #fff;
-    cursor: pointer;
-}
-input[type="range"]:active::-moz-range-thumb {
-    transform: scale(1.2);
-    background: #007db5;
-}
-input[type="range"]::-ms-track {
-    width: 100%;
-    height: 3px;
-    cursor: pointer;
-    background: transparent;
-    border: solid transparent;
-    color: transparent;
-}
-input[type="range"]::-ms-fill-lower {
-    background-color: #007db5;
-}
-input[type="range"]::-ms-fill-upper {
-    background: linear-gradient(to right, rgba(0, 125, 181, 0.6) var(--buffered-width), rgba(0, 125, 181, 0.2) var(--buffered-width));
-}
-input[type="range"]::-ms-thumb {
-    box-sizing: content-box;
-    border: 1px solid #007db5;
-    height: 15px;
-    width: 15px;
-    border-radius: 50%;
-    background-color: #fff;
-    cursor: pointer;
-}
-input[type="range"]:active::-ms-thumb {
-    transform: scale(1.2);
-    background: #007db5;
-}

package/src/app/component/message/audio/audio.component.ts

@@ -1,122 +0,0 @@
-import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-// import lottieWeb from 'https://cdn.skypack.dev/lottie-web';
-
-@Component({
-  selector: 'chat-audio',
-  templateUrl: './audio.component.html',
-  styleUrls: ['./audio.component.scss']
-})
-export class AudioComponent implements OnInit {
-
-  @Input() metadata: any;
-  @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>();
-
-  uidAudioPlayng: string = ''
-  divPlay: HTMLAudioElement
-  playState: HTMLElement
-  status: 'play' | 'pause' = 'play'
-
-  constructor(private elementRef: ElementRef) { }
-
-  ngOnInit() {
-    // this.divPlay = this.elementRef.nativeElement.querySelector('#audio_container').querySelector('#audio_msg')
-    // this.playState= this.elementRef.nativeElement.querySelector('#audio_container').querySelector('#duration')
-  }
-
-  onPlayPause(status: string){
-    // const divPlay = (<HTMLAudioElement>document.getElementById('audio_msg'));
-    if(status === 'play') {
-      this.divPlay.play();
-      this.status = 'pause'
-    } else {
-      this.divPlay.pause();
-      this.status = 'play'
-    }
-  }
-  
-  pauseAudioMsg(e) {
-    try {
-      // stop all audio
-      if (this.uidAudioPlayng) {
-        const divPlay = (<HTMLAudioElement>document.getElementById(this.uidAudioPlayng));
-        divPlay.pause();
-        // console.log('> pausa: ', divPlay);
-      }
-    } catch (error) {
-      console.log('> Error is: ', error);
-    }
-
-    try {
-      // console.log(e.target.id);
-      if (this.uidAudioPlayng) {
-        this.uidAudioPlayng = '';
-      }
-    } catch (error) {
-      console.log('> Error is: ', error);
-    }
-  }
-
-  playAudioMsg(e) {
-    // stop all audio
-    if (this.uidAudioPlayng) {
-      const divPlay = (<HTMLAudioElement>document.getElementById(this.uidAudioPlayng));
-      divPlay.pause();
-      // console.log('> pausa: ', divPlay);
-    }
-    try {
-      // console.log(e.target.id);
-      // set uid audio playng
-      this.uidAudioPlayng = e.target.id;
-    } catch (error) {
-      console.log('> Error is: ', error);
-    }
-  }
-
-  updateTimeAudioMsg(ev){
-    var currTime = Math.floor(ev.target.currentTime); 
-    var duration = Math.floor(ev.target.duration);
-
-    let minutes = 0;
-    if(currTime > 60){
-      minutes = Math.floor(currTime / 60);
-    }
-    const seconds = currTime - minutes * 60
-    // console.log('timeeee', minutes + ':' + seconds )
-    // this.playState.innerHTML = minutes + ':' + seconds
-  }
-
-
-
-  /**
-   *
-   * @param uid
-   */
-  playPausaAudioMsg(uid: string) {
-    // console.log('playPausaAudioMsg: ', uid);
-    const that = this;
-    try {
-      const divPause = (<HTMLAudioElement>document.getElementById(that.uidAudioPlayng));
-      const divPlay = (<HTMLAudioElement>document.getElementById(uid));
-      if (divPause) {
-        divPause.pause();
-      }
-
-      if (that.uidAudioPlayng === uid) {
-        that.uidAudioPlayng = '';
-      } else {
-        if (divPlay) {
-          setTimeout(function() {
-            // if (that.g.autoplay_activated) {
-            //   divPlay.play();
-            // }
-            this.uidAudioPlayng = uid;
-          }, 300);
-        }
-      }
-
-    } catch (error) {
-      console.log('> Error is: ', error);
-    }
-  }
-
-}