From 7a5ea89fd9cc1010c6d42e4bac43e83157fbcc41 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 6 Sep 2022 14:06:26 +0530
Subject: [PATCH] chore: Sidebar improvements in small screens (#5400)

* chore: Sidebar improvements in small screens

* chore: Minor fixes
---
 .../dashboard/components/layout/Sidebar.vue   | 44 +++++++++++++------
 .../sidebarComponents/AccountContext.vue      | 10 +++--
 .../layout/sidebarComponents/Secondary.vue    | 23 ++++++++--
 .../dashboard/routes/dashboard/Dashboard.vue  | 12 ++---
 .../components/HelpCenterLayout.vue           |  5 +++
 .../helpcenter/components/Sidebar/Sidebar.vue |  9 ++++
 .../routes/dashboard/notifications/routes.js  |  1 +
 .../dashboard/settings/SettingsHeader.vue     |  6 ++-
 .../routes/dashboard/settings/Wrapper.vue     |  5 +++
 9 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index ca6524db32781..9048779ef2c81 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -11,25 +11,27 @@
       @key-shortcut-modal="toggleKeyShortcutModal"
       @open-notification-panel="openNotificationPanel"
     />
-    <secondary-sidebar
-      v-if="showSecondarySidebar"
-      :account-id="accountId"
-      :inboxes="inboxes"
-      :labels="labels"
-      :teams="teams"
-      :custom-views="customViews"
-      :menu-config="activeSecondaryMenu"
-      :current-role="currentRole"
-      :is-on-chatwoot-cloud="isOnChatwootCloud"
-      @add-label="showAddLabelPopup"
-      @toggle-accounts="toggleAccountModal"
-    />
+    <div class="secondary-sidebar">
+      <secondary-sidebar
+        v-if="showSecondarySidebar"
+        :class="sidebarClassName"
+        :account-id="accountId"
+        :inboxes="inboxes"
+        :labels="labels"
+        :teams="teams"
+        :custom-views="customViews"
+        :menu-config="activeSecondaryMenu"
+        :current-role="currentRole"
+        :is-on-chatwoot-cloud="isOnChatwootCloud"
+        @add-label="showAddLabelPopup"
+        @toggle-accounts="toggleAccountModal"
+      />
+    </div>
   </aside>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-
 import adminMixin from '../../mixins/isAdmin';
 import { getSidebarItems } from './config/default-sidebar';
 import alertMixin from 'shared/mixins/alertMixin';
@@ -58,6 +60,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    sidebarClassName: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -214,6 +220,14 @@ export default {
     width: 40rem;
   }
 }
+.off-canvas-content.is-open-left {
+  transform: translateX(18.8rem);
+}
+
+.secondary-sidebar {
+  overflow-y: auto;
+  height: 100%;
+}
 
 .account-selector {
   cursor: pointer;
@@ -271,6 +285,8 @@ export default {
 }
 
 .secondary-menu .nested.vertical.menu {
+  overflow-y: auto;
+  height: 100%;
   margin-left: var(--space-small);
 }
 </style>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
index 60b85cb22b8a7..4eded31808845 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
@@ -13,8 +13,9 @@
       <div v-if="showSwitchButton" class="account-context--switch-group">
         <woot-button
           variant="clear"
+          size="tiny"
           icon="arrow-swap"
-          class="cursor-pointer"
+          class="switch-button"
           @click="$emit('toggle-accounts')"
         >
           {{ $t('SIDEBAR.SWITCH') }}
@@ -54,8 +55,7 @@ export default {
   border: 1px solid var(--color-border);
   font-size: var(--font-size-mini);
   padding: var(--space-small);
-  margin-bottom: var(--space-small);
-  width: 100%;
+  margin: var(--space-small) var(--space-small) 0 var(--space-small);
   position: relative;
 
   &:hover {
@@ -68,6 +68,10 @@ export default {
   }
 }
 
+.switch-button {
+  margin-right: var(--space-small);
+}
+
 .account-context--switch-group {
   --overlay-shadow: linear-gradient(
     to right,
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 4f0a5e38de682..c303268c99596 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -242,17 +242,32 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import '~dashboard/assets/scss/woot';
+
 .secondary-menu {
   background: var(--white);
   border-right: 1px solid var(--s-50);
   height: 100%;
-  width: 19rem;
+  width: 20rem;
   flex-shrink: 0;
-  overflow: hidden;
-  padding: var(--space-small);
+  overflow-y: hidden;
+
+  @include breakpoint(xlarge down) {
+    position: absolute;
+  }
+
+  @include breakpoint(xlarge up) {
+    position: unset;
+  }
 
   &:hover {
-    overflow: auto;
+    overflow-y: hidden;
+  }
+
+  .menu {
+    padding: var(--space-small);
+    overflow-y: auto;
+    height: 94%;
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index f88aefe3a683d..03c37d4843c99 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -2,7 +2,7 @@
   <div class="row app-wrapper">
     <sidebar
       :route="currentRoute"
-      :class="sidebarClassName"
+      :sidebar-class-name="sidebarClassName"
       @open-notification-panel="openNotificationPanel"
       @toggle-account-modal="toggleAccountModal"
       @open-key-shortcut-modal="toggleKeyShortcutModal"
@@ -44,8 +44,8 @@ import { BUS_EVENTS } from 'shared/constants/busEvents';
 import WootKeyShortcutModal from 'dashboard/components/widgets/modal/WootKeyShortcutModal';
 import AddAccountModal from 'dashboard/components/layout/sidebarComponents/AddAccountModal';
 import AccountSelector from 'dashboard/components/layout/sidebarComponents/AccountSelector';
-import AddLabelModal from 'dashboard/routes/dashboard/settings/labels/AddLabel.vue';
-import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel.vue';
+import AddLabelModal from 'dashboard/routes/dashboard/settings/labels/AddLabel';
+import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel';
 
 export default {
   components: {
@@ -77,7 +77,7 @@ export default {
         return '';
       }
       if (this.isSidebarOpen) {
-        return 'off-canvas position-left is-transition-push is-open';
+        return 'off-canvas is-open';
       }
       return 'off-canvas is-transition-push is-closed';
     },
@@ -86,7 +86,7 @@ export default {
         return '';
       }
       if (this.isSidebarOpen) {
-        return 'off-canvas-content is-open-left has-transition-push has-position-left';
+        return 'off-canvas-content is-open-left has-transition-push';
       }
       return 'off-canvas-content has-transition-push';
     },
@@ -144,6 +144,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .off-canvas-content.is-open-left {
-  transform: translateX(25.4rem);
+  transform: translateX(20rem);
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
index e043adba37373..347318fcfd460 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
@@ -273,3 +273,8 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.off-canvas-content.is-open-left.has-transition-push {
+  transform: translateX(var(--space-giga));
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
index e75580b68be9b..e6dc1f427b702 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
@@ -87,6 +87,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import '~dashboard/assets/scss/woot';
 .secondary-menu {
   background: var(--white);
   border-right: 1px solid var(--s-50);
@@ -96,6 +97,14 @@ export default {
   overflow: hidden;
   padding: var(--space-small);
 
+  @include breakpoint(xlarge down) {
+    position: absolute;
+  }
+
+  @include breakpoint(xlarge up) {
+    position: unset;
+  }
+
   &:hover {
     overflow: auto;
   }
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/routes.js b/app/javascript/dashboard/routes/dashboard/notifications/routes.js
index 2c9a195ac21ad..de3411f57c551 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/notifications/routes.js
@@ -11,6 +11,7 @@ export const routes = [
       headerTitle: 'NOTIFICATIONS_PAGE.HEADER',
       icon: 'alert',
       showNewButton: false,
+      showSidemenuIcon: false,
     },
     children: [
       {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 808516185f53e..906394a07ce61 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="settings-header">
     <h1 class="page-title">
-      <woot-sidemenu-icon />
+      <woot-sidemenu-icon v-if="showSidemenuIcon" />
       <back-button
         v-if="showBackButton"
         :button-label="backButtonLabel"
@@ -60,6 +60,10 @@ export default {
       type: String,
       default: '',
     },
+    showSidemenuIcon: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index d781a74203787..b87cc56677567 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -8,6 +8,7 @@
       :show-back-button="showBackButton"
       :back-url="backUrl"
       :show-new-button="showNewButton"
+      :show-sidemenu-icon="showSidemenuIcon"
     />
     <keep-alive v-if="keepAlive">
       <router-view />
@@ -44,6 +45,10 @@ export default {
       type: [String, Object],
       default: '',
     },
+    showSidemenuIcon: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {};