From 3d745cc0e6ee0fc51e4d2cb350f349370ff2405a Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yash.maheshwari@hotwax.co>
Date: Mon, 11 Oct 2021 12:09:11 +0530
Subject: [PATCH 1/4] Improved: code by removing the redundant usage of
 ion-footer and declared the footer in the app file(#ew8pb0)

---
 src/App.vue            | 28 ++++++++++++++++++++++++----
 src/views/Search.vue   | 10 ----------
 src/views/Settings.vue |  5 +++--
 src/views/Upload.vue   | 20 ++++++++------------
 4 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1c775950..600aebee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,21 +1,35 @@
 <template>
   <ion-app>
-    <ion-router-outlet />
+    <ion-page>
+      <ion-content :fullscreen="true">
+        <ion-router-outlet />
+      </ion-content>
+      <ion-footer v-if="showFooter">
+        <ion-toolbar>
+          <tab-bar />
+        </ion-toolbar>
+      </ion-footer>
+    </ion-page>
   </ion-app>
 </template>
 
 <script lang="ts">
-import { IonApp, IonRouterOutlet } from '@ionic/vue';
+import { IonApp, IonRouterOutlet, IonPage, IonFooter, IonToolbar, IonContent } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { loadingController } from '@ionic/vue';
 import emitter from "@/event-bus"
-
+import TabBar from "./components/TabBar.vue"
 
 export default defineComponent({
   name: 'App',
   components: {
     IonApp,
-    IonRouterOutlet
+    IonRouterOutlet,
+    IonPage,
+    IonFooter,
+    IonToolbar,
+    TabBar,
+    IonContent
   },
   data() {
     return {
@@ -46,5 +60,11 @@ export default defineComponent({
     emitter.off('presentLoader', this.presentLoader);
     emitter.off('dismissLoader', this.dismissLoader);
   },
+  computed: {
+    showFooter () {
+      if (['/settings', '/count', '/search', '/upload'].includes(this.$route.path)) return true
+      return false
+    }
+  }
 });
 </script>
\ No newline at end of file
diff --git a/src/views/Search.vue b/src/views/Search.vue
index 2efd7b68..dc51f3dc 100644
--- a/src/views/Search.vue
+++ b/src/views/Search.vue
@@ -29,17 +29,10 @@
         </ion-col>
       </ion-row>
     </ion-grid>
-
-    <ion-footer :translucent="true">
-      <ion-toolbar>
-        <tab-bar />
-      </ion-toolbar>
-    </ion-footer>
   </ion-page>
 </template>
 
 <script lang="ts">
-import TabBar from '@/components/TabBar.vue'
 import {
   IonPage,
   IonHeader,
@@ -52,7 +45,6 @@ import {
   IonGrid,
   IonRow,
   IonCol,
-  IonFooter,
   IonInfiniteScroll,
   IonInfiniteScrollContent,
   IonList,
@@ -79,12 +71,10 @@ export default defineComponent({
     IonGrid,
     IonRow,
     IonCol,
-    IonFooter,
     IonInfiniteScroll,
     IonInfiniteScrollContent,
     IonList,
     IonListHeader,
-    TabBar,
     ProductListItem
   },
   data (){
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index ddde6039..3c3fb5cf 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts">
-import { alertController, IonButton, IonContent, IonHeader,IonIcon, IonItem, IonLabel, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar } from '@ionic/vue';
+import { alertController, IonButton, IonContent, IonHeader,IonIcon, IonItem, IonLabel, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, IonList } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { ellipsisVertical, personCircleOutline, storefrontOutline} from 'ionicons/icons'
 import { mapGetters, useStore } from 'vuex';
@@ -48,7 +48,8 @@ export default defineComponent({
     IonSelect,
     IonSelectOption,
     IonTitle, 
-    IonToolbar
+    IonToolbar,
+    IonList
   },
   computed: {
     ...mapGetters({
diff --git a/src/views/Upload.vue b/src/views/Upload.vue
index 3fb2191c..a2d40d1e 100644
--- a/src/views/Upload.vue
+++ b/src/views/Upload.vue
@@ -30,18 +30,12 @@
         </ion-item>
         <ion-button fill="clear" @click="removeItem(product.sku)">{{ $t( "Remove" ) }}</ion-button>
       </ion-card>
-      <ion-fab vertical="bottom"  horizontal="end" slot="fixed">
+      <ion-fab id="upload-button" vertical="bottom" horizontal="end" slot="fixed">
         <ion-fab-button @click="upload()">
           <ion-icon :icon="cloudUploadOutline" />
         </ion-fab-button>
       </ion-fab>
     </ion-content>
-
-    <ion-footer :translucent="true">
-      <ion-toolbar>
-        <tab-bar />
-      </ion-toolbar>
-    </ion-footer>
   </ion-page>
 </template>
 
@@ -62,12 +56,10 @@ import {
   IonThumbnail,
   IonTitle,
   IonToolbar,
-  IonFooter
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
-import TabBar from '@/components/TabBar.vue'
 import { useRouter } from 'vue-router';
 
 export default defineComponent({
@@ -87,9 +79,7 @@ export default defineComponent({
     IonPage,
     IonThumbnail,
     IonTitle,
-    IonToolbar,
-    IonFooter,
-    TabBar
+    IonToolbar
   },
   computed: {
     ...mapGetters({
@@ -129,3 +119,9 @@ export default defineComponent({
   },
 });
 </script>
+
+<style scoped>
+  #upload-button {
+    bottom: 70px;
+  }
+</style>
\ No newline at end of file

From 5876896ffe47222cd13fec3f82cb32e43fb24431 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yash.maheshwari@hotwax.co>
Date: Mon, 11 Oct 2021 12:15:46 +0530
Subject: [PATCH 2/4] Removed: the count route from the array(#ew8pb0)

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

diff --git a/src/App.vue b/src/App.vue
index 600aebee..ef620f5f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,7 +62,7 @@ export default defineComponent({
   },
   computed: {
     showFooter () {
-      if (['/settings', '/count', '/search', '/upload'].includes(this.$route.path)) return true
+      if (['/settings', '/search', '/upload'].includes(this.$route.path)) return true
       return false
     }
   }

From afbcd9b83db603d178c2cae072eedc50815e13ff Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yash.maheshwari@hotwax.co>
Date: Mon, 11 Oct 2021 12:21:32 +0530
Subject: [PATCH 3/4] Removed: the requested tab from the tabbar and from the
 internationalization file(#ew8pb0)

---
 src/components/TabBar.vue | 4 ----
 src/locales/en.json       | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/components/TabBar.vue b/src/components/TabBar.vue
index e6a2fd88..bc9890ae 100644
--- a/src/components/TabBar.vue
+++ b/src/components/TabBar.vue
@@ -6,10 +6,6 @@
           <ion-icon :icon="search" />
           <ion-label>{{ $t("Search") }}</ion-label>
         </ion-tab-button>
-        <ion-tab-button tab="requested" href="/requested">
-          <ion-icon :icon="list" />
-          <ion-label>{{ $t("Requested") }}</ion-label>
-        </ion-tab-button>
         <ion-tab-button tab="upload" href="/upload">
           <ion-icon :icon="cloudUpload" />
           <ion-label>{{ $t("Upload") }}</ion-label>
diff --git a/src/locales/en.json b/src/locales/en.json
index 0c0e6c5d..12ca11da 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -7,7 +7,6 @@
   "Logout": "Logout",
   "Product not found": "Product not found",
   "Remove": "Remove",
-  "Requested": "Requested",
   "Save":"Save",
   "Scan": "Scan",
   "Search": "Search",

From 88f53c5daccb2d2c5019d13a3cdbd893e58836c5 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yash.maheshwari@hotwax.co>
Date: Mon, 11 Oct 2021 12:31:53 +0530
Subject: [PATCH 4/4] Added: changelog entry file(#ew8pb0)

---
 changelogs/unreleased/-ew8pb0.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelogs/unreleased/-ew8pb0.yml

diff --git a/changelogs/unreleased/-ew8pb0.yml b/changelogs/unreleased/-ew8pb0.yml
new file mode 100644
index 00000000..138ead6a
--- /dev/null
+++ b/changelogs/unreleased/-ew8pb0.yml
@@ -0,0 +1,7 @@
+---
+title: 'Improved: code by removing the redundant usage of ion-footer and declared
+  the footer in the app file, also removed the requested tab'
+ticket_id: "#ew8pb0"
+merge_request: 2
+author: Yash Maheshwari
+type: fixed