From 879b04adb31f1161ebb99ded80be4b64d9f38a31 Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 11:31:30 +0530
Subject: [PATCH 1/7] Improved code by displaying current shop, instance and
 time-zone at the bottom of menu(#28u2peg)

---
 src/components/Menu.vue | 64 +++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index f34eb4f8d..1abb720f8 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,29 +1,41 @@
 <template>
-    <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-        <ion-header>
-          <ion-toolbar>
-            <ion-title>{{ $t("Preorder Management")}}</ion-title>
-          </ion-toolbar>
-        </ion-header>
+  <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
+    <ion-header>
+      <ion-toolbar>
+        <ion-title>{{ $t("Preorder Management")}}</ion-title>
+      </ion-toolbar>
+    </ion-header>
 
-        <ion-content>
-          <ion-list id="preorder-list">
-            <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
-              <ion-item
-                button
-                @click="selectedIndex = i"
-                router-direction="root"
-                :router-link="p.url"
-                class="hydrated"
-                :class="{ selected: selectedIndex === i }"
-              >
-                <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
-                <ion-label>{{ p.title }}</ion-label>
-              </ion-item>
-            </ion-menu-toggle>
-          </ion-list>
-        </ion-content>
-      </ion-menu>
+    <ion-content>
+      <ion-list id="preorder-list">
+        <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
+          <ion-item
+            button
+            @click="selectedIndex = i"
+            router-direction="root"
+            :router-link="p.url"
+            class="hydrated"
+            :class="{ selected: selectedIndex === i }"
+          >
+            <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
+            <ion-label>{{ p.title }}</ion-label>
+          </ion-item>
+        </ion-menu-toggle>
+      </ion-list>
+    </ion-content>
+
+    <ion-footer>
+      <ion-toolbar>
+        <ion-item lines="none">
+          <ion-label class="ion-text-wrap">
+            <p class="overline">{{ instanceUrl }}</p>
+            Shop
+          </ion-label>
+          <ion-note slot="end">{{ userProfile.userTimeZone }}</ion-note>
+        </ion-item>
+      </ion-toolbar>
+    </ion-footer>
+  </ion-menu>
 </template>
 
 <script lang="ts">
@@ -68,7 +80,9 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      isUserAuthenticated: 'user/isUserAuthenticated'
+      isUserAuthenticated: 'user/isUserAuthenticated',
+      userProfile: 'user/getUserProfile',
+      instanceUrl: 'user/getInstanceUrl'
     })
   },
   watch:{

From 2f15913289e17452a3181cf6ea8c5ed2f1830eb8 Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 12:07:24 +0530
Subject: [PATCH 2/7] Improved code by displaying brand name(#28u2peg)

---
 src/components/Menu.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 1abb720f8..b5b102acd 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -29,7 +29,7 @@
         <ion-item lines="none">
           <ion-label class="ion-text-wrap">
             <p class="overline">{{ instanceUrl }}</p>
-            Shop
+            {{ brand.name }}
           </ion-label>
           <ion-note slot="end">{{ userProfile.userTimeZone }}</ion-note>
         </ion-item>
@@ -41,15 +41,17 @@
 <script lang="ts">
 import {
   IonContent,
+  IonFooter,
   IonIcon,
   IonHeader,
   IonItem,
   IonLabel,
   IonList,
-  IonTitle,
-  IonToolbar,
   IonMenu,
   IonMenuToggle,
+  IonNote,
+  IonTitle,
+  IonToolbar
 } from "@ionic/vue";
 import { defineComponent, ref } from "vue";
 import { mapGetters } from "vuex";
@@ -61,15 +63,17 @@ export default defineComponent({
   name: "Menu",
   components: {
     IonContent,
+    IonFooter,
     IonHeader,
     IonIcon,
     IonItem,
     IonTitle,
     IonLabel,
     IonList,
-    IonToolbar,
     IonMenu,
     IonMenuToggle,
+    IonNote,
+    IonToolbar,
   },
   created() {
     // When open any specific page it should show that page selected
@@ -82,7 +86,8 @@ export default defineComponent({
     ...mapGetters({
       isUserAuthenticated: 'user/isUserAuthenticated',
       userProfile: 'user/getUserProfile',
-      instanceUrl: 'user/getInstanceUrl'
+      instanceUrl: 'user/getInstanceUrl',
+      selectedBrand: 'user/getSelectedBrand'
     })
   },
   watch:{

From 2169b5ba7729be50a5f7c744c656402d1654d7aa Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 12:41:56 +0530
Subject: [PATCH 3/7] Improved code by displaying brand name(#28u2peg)

---
 src/components/Menu.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index b5b102acd..ad97d261d 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -29,9 +29,9 @@
         <ion-item lines="none">
           <ion-label class="ion-text-wrap">
             <p class="overline">{{ instanceUrl }}</p>
-            {{ brand.name }}
+            {{ brandName }}
           </ion-label>
-          <ion-note slot="end">{{ userProfile.userTimeZone }}</ion-note>
+          <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
         </ion-item>
       </ion-toolbar>
     </ion-footer>
@@ -82,13 +82,22 @@ export default defineComponent({
       return page.url === this.$router.currentRoute.value.path;
     })
   },
+  data() {
+    return {
+      brands : JSON.parse(process.env?.VUE_APP_BRANDS),
+    }
+  },
   computed: {
     ...mapGetters({
       isUserAuthenticated: 'user/isUserAuthenticated',
       userProfile: 'user/getUserProfile',
       instanceUrl: 'user/getInstanceUrl',
       selectedBrand: 'user/getSelectedBrand'
-    })
+    }), 
+    brandName() {
+      return (this as any).brands.find((brand: any) => 
+         brand.id === (this as any).selectedBrand)?.name
+    }
   },
   watch:{
     $route (to) {

From 31261e79b27b74c9cfd85187b0f128fc117ba49a Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 13:10:54 +0530
Subject: [PATCH 4/7] Reverted indentation changes(#28u2peg)

---
 src/components/Menu.vue | 70 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index ad97d261d..6c8d5c03b 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,41 +1,41 @@
 <template>
-  <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-    <ion-header>
-      <ion-toolbar>
-        <ion-title>{{ $t("Preorder Management")}}</ion-title>
-      </ion-toolbar>
-    </ion-header>
+    <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
+      <ion-header>
+        <ion-toolbar>
+          <ion-title>{{ $t("Preorder Management")}}</ion-title>
+        </ion-toolbar>
+      </ion-header>
 
-    <ion-content>
-      <ion-list id="preorder-list">
-        <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
-          <ion-item
-            button
-            @click="selectedIndex = i"
-            router-direction="root"
-            :router-link="p.url"
-            class="hydrated"
-            :class="{ selected: selectedIndex === i }"
-          >
-            <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
-            <ion-label>{{ p.title }}</ion-label>
-          </ion-item>
-        </ion-menu-toggle>
-      </ion-list>
-    </ion-content>
+      <ion-content>
+        <ion-list id="preorder-list">
+          <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
+            <ion-item
+              button
+              @click="selectedIndex = i"
+              router-direction="root"
+              :router-link="p.url"
+              class="hydrated"
+              :class="{ selected: selectedIndex === i }"
+            >
+              <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
+              <ion-label>{{ p.title }}</ion-label>
+            </ion-item>
+          </ion-menu-toggle>
+        </ion-list>
+      </ion-content>
 
-    <ion-footer>
-      <ion-toolbar>
-        <ion-item lines="none">
-          <ion-label class="ion-text-wrap">
-            <p class="overline">{{ instanceUrl }}</p>
-            {{ brandName }}
-          </ion-label>
-          <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
-        </ion-item>
-      </ion-toolbar>
-    </ion-footer>
-  </ion-menu>
+      <ion-footer>
+        <ion-toolbar>
+          <ion-item lines="none">
+            <ion-label class="ion-text-wrap">
+              <p class="overline">{{ instanceUrl }}</p>
+              {{ brandName }}
+            </ion-label>
+            <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
+          </ion-item>
+        </ion-toolbar>
+      </ion-footer>
+    </ion-menu>
 </template>
 
 <script lang="ts">

From c4f28af7c888c6d894876788de157e2fbc0c5711 Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 13:12:01 +0530
Subject: [PATCH 5/7] Reverted indentation changes(#28u2peg)

---
 src/components/Menu.vue | 68 ++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 6c8d5c03b..77e9416dc 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,41 +1,41 @@
 <template>
     <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-      <ion-header>
-        <ion-toolbar>
-          <ion-title>{{ $t("Preorder Management")}}</ion-title>
-        </ion-toolbar>
-      </ion-header>
+        <ion-header>
+          <ion-toolbar>
+            <ion-title>{{ $t("Preorder Management")}}</ion-title>
+          </ion-toolbar>
+        </ion-header>
 
-      <ion-content>
-        <ion-list id="preorder-list">
-          <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
-            <ion-item
-              button
-              @click="selectedIndex = i"
-              router-direction="root"
-              :router-link="p.url"
-              class="hydrated"
-              :class="{ selected: selectedIndex === i }"
-            >
-              <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
-              <ion-label>{{ p.title }}</ion-label>
-            </ion-item>
-          </ion-menu-toggle>
-        </ion-list>
-      </ion-content>
+        <ion-content>
+          <ion-list id="preorder-list">
+            <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
+              <ion-item
+                button
+                @click="selectedIndex = i"
+                router-direction="root"
+                :router-link="p.url"
+                class="hydrated"
+                :class="{ selected: selectedIndex === i }"
+              >
+                <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
+                <ion-label>{{ p.title }}</ion-label>
+              </ion-item>
+            </ion-menu-toggle>
+          </ion-list>
+        </ion-content>
 
-      <ion-footer>
-        <ion-toolbar>
-          <ion-item lines="none">
-            <ion-label class="ion-text-wrap">
-              <p class="overline">{{ instanceUrl }}</p>
-              {{ brandName }}
-            </ion-label>
-            <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
-          </ion-item>
-        </ion-toolbar>
-      </ion-footer>
-    </ion-menu>
+        <ion-footer>
+          <ion-toolbar>
+            <ion-item lines="none">
+              <ion-label class="ion-text-wrap">
+                <p class="overline">{{ instanceUrl }}</p>
+                {{ brandName }}
+              </ion-label>
+              <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
+            </ion-item>
+          </ion-toolbar>
+        </ion-footer>
+      </ion-menu>
 </template>
 
 <script lang="ts">

From 38b175b9129a97777a9483dc54539da341837ce3 Mon Sep 17 00:00:00 2001
From: Aniket Kumar Pandey <meet.aniket.kumar@gmail.com>
Date: Tue, 24 May 2022 16:30:53 +0530
Subject: [PATCH 6/7] Improved: code to update indentation of coputed property
 of menu page (#28u2peg).

---
 src/components/Menu.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 77e9416dc..356394bbd 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -95,8 +95,7 @@ export default defineComponent({
       selectedBrand: 'user/getSelectedBrand'
     }), 
     brandName() {
-      return (this as any).brands.find((brand: any) => 
-         brand.id === (this as any).selectedBrand)?.name
+      return (this as any).brands.find((brand: any) => brand.id === (this as any).selectedBrand)?.name;
     }
   },
   watch:{

From fd80d79e551b82ecbace419e2cb605a42ead3659 Mon Sep 17 00:00:00 2001
From: Aniket Kumar Pandey <meet.aniket.kumar@gmail.com>
Date: Tue, 24 May 2022 17:03:25 +0530
Subject: [PATCH 7/7] Improved: code remove import warnings from app
 (#28u2peg).

---
 src/views/settings.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/settings.vue b/src/views/settings.vue
index b16c53c8d..fdf1492d4 100644
--- a/src/views/settings.vue
+++ b/src/views/settings.vue
@@ -43,6 +43,7 @@ import {
   IonButtons,
   IonContent,
   IonHeader,
+  IonIcon,
   IonItem,
   IonLabel,
   IonMenuButton,
@@ -63,6 +64,7 @@ export default defineComponent({
     IonButtons,
     IonContent,
     IonHeader,
+    IonIcon,
     IonItem,
     IonLabel,
     IonMenuButton,