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/5] 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/5] 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"

From ed0d9ee431e526e90c14e5480c23c36c3fde05b0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 25 Aug 2020 19:15:32 +0530
Subject: [PATCH 3/5] chore: remove stray whitesapce

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

diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 0fc3d38..a339bb9 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -8,7 +8,7 @@ module.exports = {
   // and the URI for assets are tightly coupled. This is handled in the Go app
   // by using stuffbin aliases.
   assetsDir: 'frontend',
-  
+
   // Move the index.html file from dist/index.html to dist/frontend/index.html
   indexPath: './frontend/index.html',
 

From abe8c598fcbeab2fd0695cc262f8bc2a241e02b6 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 25 Aug 2020 19:16:33 +0530
Subject: [PATCH 4/5] fix: update toggle on update:active

---
 frontend/src/App.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 406308d..18a08d2 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -33,6 +33,7 @@
 
                 <b-menu-item :expanded="activeGroup.lists"
                   :active="activeGroup.lists"
+                  v-on:update:active="(state) => toggleGroup('lists', state)"
                   icon="format-list-bulleted-square" label="Lists">
                   <b-menu-item :to="{name: 'lists'}" tag="router-link"
                     :active="activeItem.lists"
@@ -45,6 +46,7 @@
 
                 <b-menu-item :expanded="activeGroup.subscribers"
                   :active="activeGroup.subscribers"
+                  v-on:update:active="(state) => toggleGroup('subscribers', state)"
                   icon="account-multiple" label="Subscribers">
                   <b-menu-item :to="{name: 'subscribers'}" tag="router-link"
                     :active="activeItem.subscribers"
@@ -56,8 +58,9 @@
                 </b-menu-item><!-- subscribers -->
 
                 <b-menu-item :expanded="activeGroup.campaigns"
-                    :active="activeGroup.campaigns"
-                    icon="rocket-launch-outline" label="Campaigns">
+                  :active="activeGroup.campaigns"
+                  v-on:update:active="(state) => toggleGroup('campaigns', state)"
+                  icon="rocket-launch-outline" label="Campaigns">
                   <b-menu-item :to="{name: 'campaigns'}" tag="router-link"
                     :active="activeItem.campaigns"
                     icon="rocket-launch-outline" label="All campaigns"></b-menu-item>
@@ -150,6 +153,9 @@ export default Vue.extend({
   },
 
   methods: {
+    toggleGroup(group, state) {
+      this.activeGroup = state ? { [group]: true } : {};
+    },
     reloadApp() {
       this.$api.reloadApp().then(() => {
         this.$utils.toast('Reloading app ...');

From 11b0bba8ae48673051460a77b4c4ae3f6939b59e Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Sat, 29 Aug 2020 11:34:30 +0530
Subject: [PATCH 5/5] Typo in README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

configruation 🡢 configuration
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 67c1150..53c2ca0 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ This one-click [Heroku deploy button](https://github.com/bumi/listmonk-heroku) p
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/bumi/listmonk-heroku)
 
-Please note that [configuration options](https://listmonk.app/docs/configuration) must be set using [environment configruation variables](https://devcenter.heroku.com/articles/config-vars).
+Please note that [configuration options](https://listmonk.app/docs/configuration) must be set using [environment configuration variables](https://devcenter.heroku.com/articles/config-vars).