From 427fcf7efdd4d4dc08e2d02db3e6f2c97b670c92 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 24 Aug 2020 19:15:28 +0530
Subject: [PATCH 1/2] fix: inconsistent active link on sidebar navigation

---
 frontend/src/App.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 770639f..736e9bd 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -32,6 +32,7 @@
                 </b-menu-item><!-- dashboard -->
 
                 <b-menu-item :expanded="activeGroup.lists"
+                  :active="activeGroup.lists"
                   icon="format-list-bulleted-square" label="Lists">
                   <b-menu-item :to="{name: 'lists'}" tag="router-link"
                     :active="activeItem.lists"
@@ -43,6 +44,7 @@
                 </b-menu-item><!-- lists -->
 
                 <b-menu-item :expanded="activeGroup.subscribers"
+                  :active="activeGroup.subscribers"
                   icon="account-multiple" label="Subscribers">
                   <b-menu-item :to="{name: 'subscribers'}" tag="router-link"
                     :active="activeItem.subscribers"
@@ -54,6 +56,7 @@
                 </b-menu-item><!-- subscribers -->
 
                 <b-menu-item :expanded="activeGroup.campaigns"
+                  :active="activeGroup.campaigns"
                     icon="rocket-launch-outline" label="Campaigns">
                   <b-menu-item :to="{name: 'campaigns'}" tag="router-link"
                     :active="activeItem.campaigns"
@@ -138,6 +141,10 @@ export default Vue.extend({
       this.activeItem = { [to.name]: true };
       if (to.meta.group) {
         this.activeGroup = { [to.meta.group]: true };
+      } else {
+        // Reset activeGroup to collapse menu items on navigating
+        // to non group items from sidebar
+        this.activeGroup = {};
       }
     },
   },

From 3b141bb1003df196c5eb78915b365715e3e538f2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 24 Aug 2020 19:52:00 +0530
Subject: [PATCH 2/2] style: remove stray tab indentation

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 736e9bd..406308d 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -56,7 +56,7 @@
                 </b-menu-item><!-- subscribers -->
 
                 <b-menu-item :expanded="activeGroup.campaigns"
-                  :active="activeGroup.campaigns"
+                    :active="activeGroup.campaigns"
                     icon="rocket-launch-outline" label="Campaigns">
                   <b-menu-item :to="{name: 'campaigns'}" tag="router-link"
                     :active="activeItem.campaigns"