- added: menu component on left header tiledesk hover icon click

Tiledesk · Nov 18, 2023 · 689253b · 689253b
1 parent e30fd4c
commit 689253b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 134 deletions.
diff --git a/src/app/chatbot-design-studio/cds-base-element/menu/menu.component.ts b/src/app/chatbot-design-studio/cds-base-element/menu/menu.component.ts
@@ -41,7 +41,8 @@ export class CDSMenuComponent implements OnInit {
   // -------------------------------------------------------------------------------------- 
   onGoBack() {
     let dashbordBaseUrl = this.appConfigService.getConfig().dashboardBaseUrl + '#/project/'+ this.dashboardService.projectID + '/bots/my-chatbots/all'
-    window.open(dashbordBaseUrl, '_self')
+    const myWindow = window.open(dashbordBaseUrl, '_self')
+    myWindow.focus();
     // this.location.back()
     // this.router.navigate(['project/' + this.project._id + '/bots/my-chatbots/all']);
   }
@@ -50,10 +51,11 @@ export class CDSMenuComponent implements OnInit {
   // Export chatbot to JSON
   // -------------------------------------------------------------------------------------- 
   onLogOut(){
+    this.tiledeskAuthService.logOut()
+    this.goToDashboardLogin()
 
   }
 
-
   // -------------------------------------------------------------------------------------- 
   // Export chatbot to JSON
   // -------------------------------------------------------------------------------------- 
@@ -73,4 +75,10 @@ export class CDSMenuComponent implements OnInit {
     });
   }
 
+  goToDashboardLogin(){
+    let DASHBOARD_URL = this.appConfigService.getConfig().dashboardBaseUrl + '#/login'
+    const myWindow = window.open(DASHBOARD_URL, '_self');
+    myWindow.focus();
+  }
+
 }
diff --git a/src/app/chatbot-design-studio/cds-chatbot-details/detail/detail.component.ts b/src/app/chatbot-design-studio/cds-chatbot-details/detail/detail.component.ts
@@ -18,7 +18,6 @@ import { UploadService } from 'src/chat21-core/providers/abstract/upload.service
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { UserModel } from 'src/chat21-core/models/user';
 import { UploadModel } from 'src/chat21-core/models/upload';
-import { User } from 'firebase';
 const swal = require('sweetalert');
 
 @Component({

diff --git a/...bot-design-studio/cds-dashboard/cds-canvas/cds-panel-widget/cds-panel-widget.component.ts b/...bot-design-studio/cds-dashboard/cds-canvas/cds-panel-widget/cds-panel-widget.component.ts
@@ -71,7 +71,7 @@ export class CdsPanelWidgetComponent implements OnInit, OnDestroy {
 
   setIframeUrl(){
     this.WIDGET_BASE_URL = this.appConfigService.getConfig().widgetBaseUrl;
-    const testItOutUrl = this.WIDGET_BASE_URL + "5.0.71/assets/twp" + '/chatbot-panel.html'
+    const testItOutUrl = this.WIDGET_BASE_URL + "assets/twp" + '/chatbot-panel.html'
     // const testItOutUrl = "https://widget.tiledesk.com/v6/5.0.71/assets/twp"+ '/chatbot-panel.html'
     // const testItOutUrl = 'http://localhost:4203/assets/twp'+ '/chatbot-panel.html'
     let url = testItOutUrl + '?tiledesk_projectid=' + this.projectID + 

diff --git a/src/app/ui/notification-message/notification-message.component.html b/src/app/ui/notification-message/notification-message.component.html
@@ -141,136 +141,6 @@ <h4 id="checklist-modal" class="modal-title">
   <!-- /.modal-dialog -->
 </div>
 
-<!-- ============= YOU SUBSCRIPTION HAS EXPIRED MODAL ============= -->
-<div class="modal" tabindex="-1" role="dialog" [ngStyle]="{'display':notify.displayModalSubsExpired}"
-  style="background-color: rgba(90,90,90,0.9);">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content" style="border-top-left-radius:6px; border-top-right-radius:6px">
-      <div class="modal-header" style="padding:16px!important; border-bottom:none!important;">
-
-        <button type="button" class="close" aria-label="Close" (click)="notify.closeModalSubsExpired()"
-          style="position: absolute; right: 14px;">
-          <span aria-hidden="true">
-            <!-- &times; -->
-            <svg class="tide-icon " width="24" height="24" viewBox="0 0 24 24">
-              <path
-                d="M13.357 11.993l10.256 10.295c0.39 0.391 0.39 1.024 0 1.415-0.194 0.195-0.449 0.292-0.704 0.292s-0.51-0.097-0.705-0.292l-10.257-10.295-10.256 10.295c-0.194 0.195-0.449 0.292-0.704 0.292s-0.51-0.097-0.705-0.292c-0.39-0.391-0.39-1.024 0-1.415l10.256-10.295-10.256-10.294c-0.39-0.391-0.39-1.024 0-1.415s1.020-0.391 1.409 0l10.256 10.294 10.256-10.294c0.39-0.391 1.020-0.391 1.41 0 0.389 0.391 0.389 1.024 0 1.415l-10.256 10.294z">
-              </path>
-            </svg>
-          </span>
-        </button>
-
-        <h2 class="modal-title"
-          style="color: #262f3c; text-align: center; font-family: 'Poppins','Roboto', 'Arial', sans-serif; margin-top: 20px; font-size:28px">
-          <span style="vertical-align: middle;">
-            <!-- {{ "Pricing.SubscriptionExpired" | translate }} -->
-            {{ "Pricing.SubscriptionPaymentProblem" | translate }}
-          </span>
-        </h2>
-
-      </div>
-      <hr class="custom-hr" style="margin-top:3px; margin-bottom:3px">
-      <div class="modal-body"
-        style="padding-top: 0px; padding-bottom: 0px; padding-right: 34px; padding-left: 34px; line-height: 1;">
-
-        <div class="row">
-          <div class="col-sm-12">
-            <h3 style="text-align: center;  color: #8894ab; font-size: 22px; margin-bottom: 20px;">
-              {{ "Pricing.WeWereUnableToAutomaticallyRenewYourSubscription" | translate }}.
-              {{ "Pricing.PleaseContactUs" | translate }}
-              {{ "Pricing.ToUpdateYourPaymentInformation" | translate }}.
-            </h3>
-          </div>
-        </div>
-      </div>
-
-      <div class="modal-footer"
-        style="margin-top: 0px; background-color: #fff; border-top:none; border-bottom-left-radius:6px; border-bottom-right-radius:6px">
-        <div style="text-align: center; margin-bottom: 15px;">
-          <!-- style="background-color:rgb(136, 148, 171);color:#FFF;padding:12px 16px;border:0;border-radius:4px;font-size:17px; margin:6px"  -->
-          <!-- (click)="downgradePlanToFree()" -->
-          <button *ngIf="USER_ROLE === 'owner'" type="button" class="btn btn-danger"
-            (click)="notify.closeThisModalAndDisplayCancelSubscriptionModal()">
-
-            <!-- {{ 'Pricing.DowngradeTo' | translate }} -->
-            {{ "CancelSubscription" | translate }}
-          </button>
-          <!-- style="background-color:#3EA9F5;color:#FFF;padding:12px 16px;border:0;border-radius:4px;font-size:17px; margin:6px" -->
-          <!-- (click)="goToPricing()" (click)="launchWidget()"-->
-          <button *ngIf="USER_ROLE === 'owner'" type="button" class="btn btn-primary" (click)="notify.contacUsViaEmail()" >
-
-            <!-- {{ 'Pricing.UpgradePlan' | translate }} -->
-            <!-- Let's chat -->
-            {{'ContactUs' | translate}}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<!-- ============= ENTERPRISE PLAN HAS EXPIRED MODAL ============= -->
-<div class="modal" tabindex="-1" role="dialog" [ngStyle]="{'display':notify.displayModalEnterpiseSubsExpired}"
-  style="background-color: rgba(90,90,90,0.9);">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content" style="border-top-left-radius:6px; border-top-right-radius:6px">
-      <div class="modal-header" style="padding:16px!important; border-bottom:none!important;">
-
-        <button type="button" class="close" aria-label="Close" (click)="notify.closeModalEnterpiseSubsExpired()"
-          style="position: absolute; right: 14px;">
-          <span aria-hidden="true">
-            <!-- &times; -->
-            <svg class="tide-icon " width="24" height="24" viewBox="0 0 24 24">
-              <path
-                d="M13.357 11.993l10.256 10.295c0.39 0.391 0.39 1.024 0 1.415-0.194 0.195-0.449 0.292-0.704 0.292s-0.51-0.097-0.705-0.292l-10.257-10.295-10.256 10.295c-0.194 0.195-0.449 0.292-0.704 0.292s-0.51-0.097-0.705-0.292c-0.39-0.391-0.39-1.024 0-1.415l10.256-10.295-10.256-10.294c-0.39-0.391-0.39-1.024 0-1.415s1.020-0.391 1.409 0l10.256 10.294 10.256-10.294c0.39-0.391 1.020-0.391 1.41 0 0.389 0.391 0.389 1.024 0 1.415l-10.256 10.294z">
-              </path>
-            </svg>
-          </span>
-        </button>
-
-        <h2 class="modal-title"
-          style="color: #262f3c; text-align: center; font-family: 'Poppins','Roboto', 'Arial', sans-serif; margin-top: 20px; font-size:28px">
-          <span style="vertical-align: middle;">
-            <!-- {{ "Pricing.SubscriptionExpired" | translate }} -->
-            {{notify.prjct_profile_name}} {{ "Pricing.HasExpired" | translate }}
-          </span>
-        </h2>
-
-      </div>
-      <hr class="custom-hr" style="margin-top:3px; margin-bottom:3px">
-      <div class="modal-body"
-        style="padding-top: 0px; padding-bottom: 0px; padding-right: 34px; padding-left: 34px; line-height: 1;">
-
-        <div class="row">
-          <div class="col-sm-12">
-            <h3 style="text-align: center;  color: #8894ab; font-size: 22px; margin-bottom: 20px;">
-              {{ "Pricing.PleaseContactUs" | translate }}
-              {{ "Pricing.ToUpdateYourPaymentInformation" | translate }}.
-            </h3>
-          </div>
-        </div>
-      </div>
-
-      <div class="modal-footer"
-        style="margin-top: 0px; background-color: #fff; border-top:none; border-bottom-left-radius:6px; border-bottom-right-radius:6px">
-        <div style="text-align: center; margin-bottom: 15px;">
-
-          <!-- <button type="button" class="btn btn-danger"
-            (click)="notify.closeThisModalAndDisplayCancelSubscriptionModal()">
-            {{ "CancelSubscription" | translate }}
-          </button>
-          -->
-          <button *ngIf="USER_ROLE === 'owner'" type="button" class="btn btn-primary" (click)="notify.contacUsViaEmailPlanC()">
-            {{'ContactUs' | translate}}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
 
 <!-- -----------------------------------------------------------  -->
 <!--  "CONTACT US - TO UPGRADE PLAN  -->