From 90e2429f11702c6e0b74387e26d525822081496e Mon Sep 17 00:00:00 2001
From: azkyakhan <azkya.khan@hotwax.co>
Date: Tue, 26 Apr 2022 12:52:08 +0530
Subject: [PATCH 1/2] Improved code by displaying instance and current time
 zone in the bottom of the menu(#28u2prh)

---
 src/components/Menu.vue | 75 +++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 67f119e3..027bc296 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,43 +1,56 @@
 <template>
-    <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-        <ion-header>
-          <ion-toolbar>
-            <ion-title>{{ $t("Import")}}</ion-title>
-          </ion-toolbar>
-        </ion-header>
+  <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
+    <ion-header>
+      <ion-toolbar>
+        <ion-title>{{ $t("Import")}}</ion-title>
+      </ion-toolbar>
+    </ion-header>
 
-        <ion-content>
-          <ion-list id="import-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="import-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>
+          </ion-label>
+          <ion-note slot="end">{{ userProfile.userTimeZone }}</ion-note>
+        </ion-item>
+      </ion-toolbar>
+    </ion-footer>
+  </ion-menu>
 </template>
 
 <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";
@@ -49,15 +62,17 @@ export default defineComponent({
   name: "Menu",
   components: {
     IonContent,
+    IonFooter,
     IonHeader,
     IonIcon,
     IonItem,
-    IonTitle,
     IonLabel,
     IonList,
-    IonToolbar,
     IonMenu,
     IonMenuToggle,
+    IonNote,
+    IonTitle,
+    IonToolbar    
   },
   created() {
     // When open any specific page it should show that page selected
@@ -68,7 +83,9 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      isUserAuthenticated: 'user/isUserAuthenticated'
+      isUserAuthenticated: 'user/isUserAuthenticated',
+      instanceUrl: 'user/getInstanceUrl',
+      userProfile: 'user/getUserProfile'
     })
   },
   watch:{

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

---
 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 027bc296..44032890 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,40 +1,40 @@
 <template>
-  <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-    <ion-header>
-      <ion-toolbar>
-        <ion-title>{{ $t("Import")}}</ion-title>
-      </ion-toolbar>
-    </ion-header>
+    <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
+        <ion-header>
+          <ion-toolbar>
+            <ion-title>{{ $t("Import")}}</ion-title>
+          </ion-toolbar>
+        </ion-header>
 
-    <ion-content>
-      <ion-list id="import-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="import-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>
-          </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>
+              </ion-label>
+              <ion-note slot="end">{{ userProfile.userTimeZone }}</ion-note>
+            </ion-item>
+          </ion-toolbar>
+        </ion-footer>
+      </ion-menu>
 </template>
 
 <script lang="ts">