From d387ba9004c69eb1f746dddade498f87e4cfc4ff Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Tue, 16 Jun 2020 15:05:59 +0300
Subject: [PATCH] fix tracker event

---
 src/renderer/_vue/App.vue                   | 23 ++++++++++------
 src/renderer/_vue/assets/css/app.scss       | 30 ++++++++-------------
 src/renderer/_vue/store/modules/clusters.ts |  8 +++---
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/renderer/_vue/App.vue b/src/renderer/_vue/App.vue
index 0f7c6ea8ff..0ca9d236cd 100644
--- a/src/renderer/_vue/App.vue
+++ b/src/renderer/_vue/App.vue
@@ -1,13 +1,10 @@
 <template>
-  <div id="app_vue">
-    <div class="draggable-top" />
-    <div id="lens-container" />
-    <div class="main-view" :class="{ 'menu-visible': isMenuVisible }">
-      <main-menu v-if="isMenuVisible" />
-      <router-view />
-    </div>
-    <bottom-bar v-if="isMenuVisible" />
+  <div class="draggable-top" />
+  <div class="main-view" :class="{ 'menu-visible': isMenuVisible }">
+    <main-menu v-if="isMenuVisible" />
+    <router-view />
   </div>
+  <bottom-bar v-if="isMenuVisible" />
 </template>
 
 <script>
@@ -25,3 +22,13 @@ export default {
 }
 </script>
 
+<style scoped>
+  .draggable-top{
+    -webkit-app-region: drag;
+    left: 0;
+    top: 0;
+    position: absolute;
+    height: 20px;
+    width: 100%;
+  }
+</style>
\ No newline at end of file
diff --git a/src/renderer/_vue/assets/css/app.scss b/src/renderer/_vue/assets/css/app.scss
index 0443856eb3..4de541694d 100644
--- a/src/renderer/_vue/assets/css/app.scss
+++ b/src/renderer/_vue/assets/css/app.scss
@@ -25,6 +25,17 @@ pre {
   color: $lens-text-color-light;
 }
 
+// react-app container (dashboard)
+#app {
+  position: absolute;
+  top: 0;
+  left: 70px;
+  right: 0;
+  height: 100%;
+  z-index: 100;
+  display: none;
+}
+
 #app_vue {
   width: 100%;
   height: 100%;
@@ -57,15 +68,6 @@ pre {
   }
 }
 
-.draggable-top{
-  -webkit-app-region: drag;
-  left: 0;
-  top: 0;
-  position: absolute;
-  height: 20px;
-  width: 100%;
-}
-
 ::-webkit-scrollbar {
   width: 12px;
 
@@ -202,14 +204,4 @@ h1, h2, h3, h4, h5, h6{
     top: 3px;
     font-size: 16px;
   }
-}
-
-#lens-container {
-  position: absolute;
-  top: 0;
-  left: 70px;
-  right: 0;
-  height: 100%;
-  z-index: 100;
-  display: none;
 }
\ No newline at end of file
diff --git a/src/renderer/_vue/store/modules/clusters.ts b/src/renderer/_vue/store/modules/clusters.ts
index ebdc7e87e6..269ec648c2 100644
--- a/src/renderer/_vue/store/modules/clusters.ts
+++ b/src/renderer/_vue/store/modules/clusters.ts
@@ -88,7 +88,7 @@ const actions: ActionTree<ClusterState, any>  = {
     await promiseIpc.send("removeCluster", cluster.id).catch((error: Error) => {
       return false;
     })
-    tracker.event("cluster", "remove´");
+    tracker.event("cluster", "remove");
     await dispatch("refreshClusters", getters.currentWorkspace)
     return true;
   },
@@ -166,7 +166,7 @@ const actions: ActionTree<ClusterState, any>  = {
   },
 
   attachWebview({commit}, lens: LensWebview) {
-    const container: any = document.getElementById("lens-container");
+    const container: any = document.getElementById("app");
     if (!container || !lens.webview) {
       return
     }
@@ -190,7 +190,7 @@ const actions: ActionTree<ClusterState, any>  = {
     promiseIpc.send("enableClusterSettingsMenuItem", lens.id)
   },
   detachWebview({commit}, lens: LensWebview) {
-    const container: any = document.getElementById("lens-container");
+    const container: any = document.getElementById("app");
     if (!container) { return }
     container.childNodes.forEach((child: any) => {
       if (child === lens.webview) {
@@ -203,7 +203,7 @@ const actions: ActionTree<ClusterState, any>  = {
     promiseIpc.send("disableClusterSettingsMenuItem")
   },
   hideWebviews({commit}) {
-    const container: any = document.getElementById("lens-container");
+    const container: any = document.getElementById("app");
     if (!container) { return }
     container.style = "display: none;"
     container.childNodes.forEach((child: any) => {