Merge branch 'fix-issues' into uat

@@ -4,11 +4,11 @@
     <sidebar class="sidebar-container"
     <sidebar class="sidebar-container"
       :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
       :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
     <div :class="{ hasTagsView: needTagsView }" class="main-container">
     <div :class="{ hasTagsView: needTagsView }" class="main-container">
-      <div class="headerRef" :class="{ 'fixed-header': fixedHeader }" ref="headerRef">
+      <div class="headerRef" :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <navbar />
         <tags-view v-if="needTagsView" />
         <tags-view v-if="needTagsView" />
       </div>
       </div>
-      <app-main ref="appMainBlock" />
+      <app-main />
       <right-panel v-if="false">
       <right-panel v-if="false">
         <settings />
         <settings />
       </right-panel>
       </right-panel>

@@ -6,7 +6,6 @@ const WIDTH = 992; // refer to Bootstrap's responsive design
 export default {
 export default {
   watch: {
   watch: {
     $route(route) {
     $route(route) {
-      this.getBlockCurrentHeight();
       if (this.device === "mobile" && this.sidebar.opened) {
       if (this.device === "mobile" && this.sidebar.opened) {
         store.dispatch("app/closeSideBar", { withoutAnimation: false });
         store.dispatch("app/closeSideBar", { withoutAnimation: false });
       }
       }
@@ -23,10 +22,7 @@ export default {
     if (isMobile) {
     if (isMobile) {
       store.dispatch("app/toggleDevice", "mobile");
       store.dispatch("app/toggleDevice", "mobile");
       store.dispatch("app/closeSideBar", { withoutAnimation: true });
       store.dispatch("app/closeSideBar", { withoutAnimation: true });
-    };
-    this.$nextTick(() => {
-      this.getBlockCurrentHeight();
-    });
+    }
   },
   },
   methods: {
   methods: {
     // use $_ for mixins properties
     // use $_ for mixins properties
@@ -45,11 +41,5 @@ export default {
         }
         }
       }
       }
     },
     },
-    getBlockCurrentHeight() {
-      let appHeaderHeight = this.$refs.headerRef.clientHeight;
-      let appMainHeight = this.$refs.appMainBlock.$el.clientHeight;
-      this.$store.dispatch("app/setAppHeaderBlockCH", appHeaderHeight);
-      this.$store.dispatch("app/setAppMainBlockCH", appMainHeight);
-    },
   },
   },
 };
 };

@@ -10,8 +10,6 @@ const state = {
   device: "desktop",
   device: "desktop",
   //size: Cookies.get('size') || 'medium'
   //size: Cookies.get('size') || 'medium'
   size: localStorage.getItem("size") || "medium",
   size: localStorage.getItem("size") || "medium",
-  headerBlockClientHeight: null,
-  appMainBlockClientHeight: null,
 };
 };
 
 
 const mutations = {
 const mutations = {
@@ -40,13 +38,8 @@ const mutations = {
     //Cookies.set('size', size)
     //Cookies.set('size', size)
     localStorage.setItem("size", size);
     localStorage.setItem("size", size);
   },
   },
-  SET_APPHEADERBLOCKCH: (state, height) => {
-    state.headerBlockClientHeight = height;
-  },
-  SET_APPMAINBLOCKCH: (state, height) => {
-    state.appMainBlockClientHeight = height;
-  },
-}
+};
+
 const actions = {
 const actions = {
   toggleSideBar({ commit }) {
   toggleSideBar({ commit }) {
     commit("TOGGLE_SIDEBAR");
     commit("TOGGLE_SIDEBAR");
@@ -60,12 +53,6 @@ const actions = {
   setSize({ commit }, size) {
   setSize({ commit }, size) {
     commit("SET_SIZE", size);
     commit("SET_SIZE", size);
   },
   },
-  setAppHeaderBlockCH({ commit }, height) {
-    commit("SET_APPHEADERBLOCKCH", height);
-  },
-  setAppMainBlockCH({ commit }, height) {
-    commit("SET_APPMAINBLOCKCH", height);
-  },
 };
 };
 
 
 export default {
 export default {