From 9a8beafc284bcfa2a45f94bb1b5922d817698d4b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 15 Jan 2024 14:52:20 +0530
Subject: [PATCH 01/21] Improved: code for preventing redirect to login on
 successful log in using browser back button (#51)

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

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 631448b..0a5cdc9 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -239,7 +239,7 @@ export default defineComponent({
       try {
         await this.authStore.login(username.trim(), password)
         if (this.authStore.getRedirectUrl) {
-          window.location.href = `${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+          window.location.replace(`${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`)
         } else {
           // All the failure cases are handled in action, if then block is executing, login is successful
           this.username = ''
@@ -255,7 +255,7 @@ export default defineComponent({
         const { token, expirationTime } = this.$route.query as any
         await this.authStore.samlLogin(token, expirationTime)
         if (this.authStore.getRedirectUrl) {
-          window.location.href = `${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+          window.location.replace(`${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`)
         } else {
           this.router.push('/')
         }

From d282c271eaf24c5a07ee4d88d5a9c563bfbe4df0 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 20 Feb 2024 18:23:19 +0530
Subject: [PATCH 02/21] Improved: added spinner in launchpad login next button
 to be shown while checkLoginOption request accomplishes (#88)

---
 src/views/Login.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 631448b..cb1519e 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -11,9 +11,12 @@
             </ion-item>
 
             <div class="ion-padding">
+              <ion-button v-if="isSpinnerActive" color="primary" expand="block">
+                <ion-spinner />
+              </ion-button>
               <!-- @keyup.enter.stop to stop the form from submitting on enter press as keyup.enter is already bound
               through the form above, causing both the form and the button to submit. -->
-              <ion-button color="primary" expand="block" @click.prevent="setOms()" @keyup.enter.stop>
+              <ion-button v-else color="primary" expand="block" @click.prevent="setOms()" @keyup.enter.stop>
                 {{ $t("Next") }}
                 <ion-icon slot="end" :icon="arrowForwardOutline" />
               </ion-button>
@@ -108,7 +111,8 @@ export default defineComponent({
       hideBackground: true,
       isConfirmingForActiveSession: false,
       loader: null as any,
-      loginOption: {} as any
+      loginOption: {} as any,
+      isSpinnerActive: false
     };
   },
   ionViewWillEnter() {
@@ -203,6 +207,8 @@ export default defineComponent({
         return
       }
 
+      this.isSpinnerActive = true
+
       const instanceURL = this.instanceUrl.trim().toLowerCase();
       if (!this.baseURL) this.authStore.setOMS(this.alias[instanceURL] ? this.alias[instanceURL] : instanceURL);
 
@@ -217,6 +223,7 @@ export default defineComponent({
       } else {
         this.toggleOmsInput()
       }
+      this.isSpinnerActive = false
     },
     async fetchLoginOptions() {
       this.loginOption = {}

From 5417216d308a9816cad240d32216dd5aad1232eb Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 20 Feb 2024 18:26:33 +0530
Subject: [PATCH 03/21] Improved: added  import for the IonSpinner in Login
 page (#88)

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

diff --git a/src/views/Login.vue b/src/views/Login.vue
index cb1519e..e2c3c68 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -72,6 +72,7 @@ import {
   IonItem,
   IonLabel,
   IonPage,
+  IonSpinner,
   loadingController
 } from "@ionic/vue";
 import { defineComponent } from "vue";
@@ -97,6 +98,7 @@ export default defineComponent({
     IonItem,
     IonLabel,
     IonPage,
+    IonSpinner,
     Logo
   },
   data () {

From b542badbdd3db4f1f52fdfe1b09dccab8bfd54e6 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 21 Feb 2024 12:28:04 +0530
Subject: [PATCH 04/21] Fixed: screen halt on logging by showing a loader until
 succesfully logged in (#81)

---
 src/locales/en.json | 1 +
 src/views/Login.vue | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index 67b8a28..648b9bc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -3,6 +3,7 @@
   "Launch Pad": "Launch Pad",
   "Login": "Login",
   "Logout": "Logout",
+  "Logging in": "Loggin in",
   "Next": "Next",
   "OMS": "OMS",
   "Password": "Password",
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 631448b..37334ea 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -236,6 +236,7 @@ export default defineComponent({
         return
       }
 
+      this.presentLoader('Logging in')
       try {
         await this.authStore.login(username.trim(), password)
         if (this.authStore.getRedirectUrl) {
@@ -249,6 +250,7 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
       }
+      this.dismissLoader()
     },
     async samlLogin() {
       try {

From 7006b34d5402084635e96a46748657f6e19a8582 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 21 Feb 2024 12:40:35 +0530
Subject: [PATCH 05/21] Fixed: entry in locale file for loader messgae while
 logging (#81)

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 648b9bc..96b2e7b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -3,7 +3,7 @@
   "Launch Pad": "Launch Pad",
   "Login": "Login",
   "Logout": "Logout",
-  "Logging in": "Loggin in",
+  "Logging in": "Logging in",
   "Next": "Next",
   "OMS": "OMS",
   "Password": "Password",

From bd54b834b6a1f3f250c5242f1b317328fe7a190c Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 20 Mar 2024 12:20:52 +0530
Subject: [PATCH 06/21] Improved: variable name for checking whether api is
 loading or not (#88)

---
 src/views/Login.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index e2c3c68..5b61640 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -11,7 +11,7 @@
             </ion-item>
 
             <div class="ion-padding">
-              <ion-button v-if="isSpinnerActive" color="primary" expand="block">
+              <ion-button v-if="isLoading" color="primary" expand="block">
                 <ion-spinner />
               </ion-button>
               <!-- @keyup.enter.stop to stop the form from submitting on enter press as keyup.enter is already bound
@@ -114,7 +114,7 @@ export default defineComponent({
       isConfirmingForActiveSession: false,
       loader: null as any,
       loginOption: {} as any,
-      isSpinnerActive: false
+      isLoading: false
     };
   },
   ionViewWillEnter() {
@@ -209,7 +209,7 @@ export default defineComponent({
         return
       }
 
-      this.isSpinnerActive = true
+      this.isLoading = true
 
       const instanceURL = this.instanceUrl.trim().toLowerCase();
       if (!this.baseURL) this.authStore.setOMS(this.alias[instanceURL] ? this.alias[instanceURL] : instanceURL);
@@ -225,7 +225,7 @@ export default defineComponent({
       } else {
         this.toggleOmsInput()
       }
-      this.isSpinnerActive = false
+      this.isLoading = false
     },
     async fetchLoginOptions() {
       this.loginOption = {}

From c4710d06875f9805515eaeeba4de83ee98acac46 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 7 Aug 2024 16:15:07 +0530
Subject: [PATCH 07/21] Implemented: support to login into app instance using
 different login flow

---
 src/util/index.ts  |  5 +++--
 src/views/Home.vue | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/util/index.ts b/src/util/index.ts
index 945221d..bf5ed75 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -10,9 +10,10 @@ const showToast = async (message: string) => {
   return toast.present();
 }
 
-const isMaargLogin = (handle: string) => {
+const isMaargLogin = (handle: string, environment = "") => {
+  const appHandle = environment ? handle + environment : handle
   const maargLoginApps = JSON.parse(process.env.VUE_APP_MAARG_LOGIN ? process.env.VUE_APP_MAARG_LOGIN : [])
-  return maargLoginApps.some((appName: string) => handle.includes(appName))
+  return maargLoginApps.some((appName: string) => appHandle.includes(appName))
 }
 
 export { isMaargLogin, showToast }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index cd2e76a..b0b73b9 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -46,10 +46,12 @@
                   {{ translate("Not configured") }}
                 </ion-badge>
                 <ion-buttons class="app-links" v-else>
-                  <ion-button color="medium" @click.stop="generateAppLink(app, devHandle)">
+                  <!-- Disabled is added on the buttons only for the case when specific instance of the app support maarg login -->
+                  <!-- This checks can be removed when all the app instance uses a single login flow either from ofbiz or from moqui -->
+                  <ion-button color="medium" :disabled="authStore.isAuthenticated && isMaargLogin(app.handle, devHandle) && !authStore.getMaargOms" @click.stop="generateAppLink(app, devHandle)">
                     <ion-icon slot="icon-only" :icon="codeWorkingOutline" />
                   </ion-button>
-                  <ion-button color="medium" @click.stop="generateAppLink(app, uatHandle)">
+                  <ion-button color="medium" :disabled="authStore.isAuthenticated && isMaargLogin(app.handle, uatHandle) && !authStore.getMaargOms" @click.stop="generateAppLink(app, uatHandle)">
                     <ion-icon slot="icon-only" :icon="shieldHalfOutline" />
                   </ion-button>
                 </ion-buttons>
@@ -134,8 +136,8 @@ export default defineComponent({
       }
     },
     generateAppLink(app: any, appEnvironment = '') {
-      const oms = isMaargLogin(app.handle) ? this.authStore.getMaargOms : this.authStore.getOMS;
-      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
+      const oms = isMaargLogin(app.handle, appEnvironment) ? this.authStore.getMaargOms : this.authStore.getOMS;
+      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
     }
   },
   setup() {

From 494cdadc31f066b76cdbb614d1d93dd5a5218a2e Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Wed, 7 Aug 2024 16:26:41 +0530
Subject: [PATCH 08/21] Improved: Added inventory count dev and uat app entries
 for maarg login.

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index f212c93..0721cdd 100644
--- a/.env.example
+++ b/.env.example
@@ -4,4 +4,4 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
-VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing"]
\ No newline at end of file
+VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount-dev", "inventorycount-uat"]
\ No newline at end of file

From ae07a8c53d12a5b83c4f2676e602334b75e19ce3 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 12 Aug 2024 15:31:14 +0530
Subject: [PATCH 09/21] Improved: user card so as to allow user jump directly
 to the details page (#91)

---
 .env.example                          |  4 +-
 src/components/Image.vue              | 74 +++++++++++++++++++++++++++
 src/components/UserActionsPopover.vue | 65 +++++++++++++++++++++++
 src/views/Home.vue                    | 31 +++++++++--
 4 files changed, 168 insertions(+), 6 deletions(-)
 create mode 100644 src/components/Image.vue
 create mode 100644 src/components/UserActionsPopover.vue

diff --git a/.env.example b/.env.example
index 0721cdd..afb02d1 100644
--- a/.env.example
+++ b/.env.example
@@ -4,4 +4,6 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
-VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount-dev", "inventorycount-uat"]
\ No newline at end of file
+VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount-dev", "inventorycount-uat"]
+VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
+VUE_APP_RESOURCE_URL=
\ No newline at end of file
diff --git a/src/components/Image.vue b/src/components/Image.vue
new file mode 100644
index 0000000..92b9157
--- /dev/null
+++ b/src/components/Image.vue
@@ -0,0 +1,74 @@
+<template>
+  <img :src="imageUrl"/>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { useAuthStore } from '@/store/auth';
+
+export default defineComponent({
+  name: "Image",
+  props: ['src'],
+  components: {},
+  created() {
+    if (
+      process.env.VUE_APP_RESOURCE_URL
+    ) {
+      this.resourceUrl = process.env.VUE_APP_RESOURCE_URL;
+    } else {
+      const authStore = useAuthStore();
+      const baseURL = authStore.getBaseUrl
+      this.resourceUrl = baseURL.replace("/api", "")
+    }
+  },
+  mounted() {
+    this.setImageUrl();
+  },
+  updated() {
+    this.setImageUrl();
+  },
+  data() {
+    return {
+      resourceUrl: '',
+      imageUrl: require("@/assets/images/defaultImage.png")
+    }
+  },
+  methods: {
+    checkIfImageExists(src: string) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = function () {
+          resolve(true);
+        }
+        img.onerror = function (error) {
+          reject(false);
+        }
+        img.src = src;
+      })
+    },
+    setImageUrl() {
+      if (this.src) {
+        if (this.src.indexOf('assets/') != -1) {
+          // Assign directly in case of assets
+          this.imageUrl = this.src;
+        } else if (this.src.startsWith('http')) {
+          // If starts with http, it is web url check for existence and assign
+          this.checkIfImageExists(this.src).then(() => {
+            this.imageUrl = this.src;
+          }).catch(() => {
+            console.error("Image doesn't exist", this.src);
+          })
+        } else {
+          // Image is from resource server, hence append to base resource url, check for existence and assign
+          const imageUrl = this.resourceUrl.concat(this.src)
+          this.checkIfImageExists(imageUrl).then(() => {
+            this.imageUrl = imageUrl;
+          }).catch(() => {
+            console.error("Image doesn't exist", imageUrl);
+          })
+        }
+      }
+    }
+  },
+});
+</script>
diff --git a/src/components/UserActionsPopover.vue b/src/components/UserActionsPopover.vue
new file mode 100644
index 0000000..e69d59d
--- /dev/null
+++ b/src/components/UserActionsPopover.vue
@@ -0,0 +1,65 @@
+<template>
+  <ion-content>
+    <ion-list>
+      <ion-list-header>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</ion-list-header>
+
+      <ion-item button @click="redirectToUserDetails()">
+        <ion-label>{{ translate("View profile") }}</ion-label>
+        <ion-icon :icon="personCircleOutline" />
+      </ion-item>
+      <ion-item button lines="none"  @click="logout()">
+        <ion-label color="danger">{{ translate("Logout") }}</ion-label>
+        <ion-icon :icon="exitOutline" color="danger"/>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</template>
+
+<script lang="ts">
+import {
+  IonContent,
+  IonIcon,
+  IonItem,
+  IonLabel,
+  IonList,
+  IonListHeader,
+  popoverController,
+} from "@ionic/vue";
+import { defineComponent } from "vue";
+import { translate } from "@/i18n";
+import { exitOutline, personCircleOutline } from 'ionicons/icons';
+import { useAuthStore } from '@/store/auth';
+
+export default defineComponent({
+  name: "UserActionsPopover",
+  components: {
+    IonContent,
+    IonIcon,
+    IonItem,
+    IonLabel,
+    IonList,
+    IonListHeader,
+  },
+  methods: {
+    redirectToUserDetails() {
+      const userDetailUrl = `${process.env.VUE_APP_USERS_LOGIN_URL}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}&partyId=${this.authStore.current.partyId}`
+      window.location.href = userDetailUrl
+      popoverController.dismiss()
+    },
+    async logout() {
+      await this.authStore.logout()
+      popoverController.dismiss()
+    }
+  },
+  setup() {
+    const authStore = useAuthStore();
+
+    return {
+      authStore,
+      exitOutline,
+      personCircleOutline,
+      translate
+    }
+  }
+});
+</script>
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b0b73b9..72c8d30 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -10,10 +10,14 @@
         <ion-card v-if="authStore.isAuthenticated">
           <ion-list>
             <ion-item lines="full">
-              <ion-icon slot="start" :icon="lockClosedOutline"/>
-              {{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
-              <ion-button fill="outline" color="medium" slot="end" @click="authStore.logout()">
-                {{ $t('Logout') }}
+              <ion-avatar slot="start">
+                <Image :src="authStore.current?.partyImageUrl" />
+              </ion-avatar>
+              <ion-label class="ion-text-nowrap">
+                <h2>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</h2>
+              </ion-label>
+              <ion-button fill="clear" slot="end" @click="openUserActionPopover($event)">
+                <ion-icon color="medium" slot="icon-only" :icon="chevronForwardOutline" />
               </ion-button>
             </ion-item>
             <ion-item lines="none">
@@ -66,6 +70,7 @@
 
 <script lang="ts">
 import {
+  IonAvatar,
   IonBadge,
   IonButton,
   IonButtons,
@@ -77,10 +82,12 @@ import {
   IonItem,
   IonLabel,
   IonList,
-  IonPage
+  IonPage,
+  popoverController
 } from '@ionic/vue';
 import { defineComponent, ref } from 'vue';
 import {
+  chevronForwardOutline,
   codeWorkingOutline,
   hardwareChipOutline,
   lockClosedOutline,
@@ -94,10 +101,14 @@ import { useRouter } from "vue-router";
 import { goToOms } from '@hotwax/dxp-components'
 import { isMaargLogin } from '@/util';
 import { translate } from '@/i18n';
+import UserActionsPopover from '@/components/UserActionsPopover.vue'
+import Image from "@/components/Image.vue";
 
 export default defineComponent({
   name: 'Home',
   components: {
+    Image,
+    IonAvatar,
     IonBadge,
     IonButton,
     IonButtons,
@@ -138,6 +149,15 @@ export default defineComponent({
     generateAppLink(app: any, appEnvironment = '') {
       const oms = isMaargLogin(app.handle, appEnvironment) ? this.authStore.getMaargOms : this.authStore.getOMS;
       window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
+    },
+    async openUserActionPopover(event: any) {
+      const userActionsPopover = await popoverController.create({
+        component: UserActionsPopover,
+        event,
+        showBackdrop: false,
+      });
+
+      userActionsPopover.present();
     }
   },
   setup() {
@@ -229,6 +249,7 @@ export default defineComponent({
     return {
       authStore,
       appCategory,
+      chevronForwardOutline,
       codeWorkingOutline,
       devHandle,
       domain,

From 4f2df5103b844325ec1b423f2bce6b552f0e9006 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 12 Aug 2024 16:13:35 +0530
Subject: [PATCH 10/21] Improved: added entry in locales for missing static
 text (#91)

---
 src/locales/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index b8ef5a3..851679e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -14,5 +14,6 @@
   "Something went wrong while login. Please contact administrator.": "Something went wrong while login. Please contact administrator.",
   "Sorry, your username or password is incorrect. Please try again.": "Sorry, your username or password is incorrect. Please try again.",
   "This application is not enabled for your account": "This application is not enabled for your account",
-  "Username": "Username"
+  "Username": "Username",
+  "View profile": "View profile"
 }
\ No newline at end of file

From 6532e4268f887521aa8cb54add4204234b4fe0b7 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 12 Aug 2024 16:36:40 +0530
Subject: [PATCH 11/21] Improved: method name for opening popover for user
 actions (#91)

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

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 72c8d30..b1c9206 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -16,7 +16,7 @@
               <ion-label class="ion-text-nowrap">
                 <h2>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</h2>
               </ion-label>
-              <ion-button fill="clear" slot="end" @click="openUserActionPopover($event)">
+              <ion-button fill="clear" slot="end" @click="openUserActionsPopover($event)">
                 <ion-icon color="medium" slot="icon-only" :icon="chevronForwardOutline" />
               </ion-button>
             </ion-item>
@@ -150,7 +150,7 @@ export default defineComponent({
       const oms = isMaargLogin(app.handle, appEnvironment) ? this.authStore.getMaargOms : this.authStore.getOMS;
       window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
     },
-    async openUserActionPopover(event: any) {
+    async openUserActionsPopover(event: any) {
       const userActionsPopover = await popoverController.create({
         component: UserActionsPopover,
         event,

From adbcfc621a74ed496f3a2fb657e33c75c3f889b9 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 13 Aug 2024 11:20:22 +0530
Subject: [PATCH 12/21] Improved: simplified logic for redirecting to user
 details and removed resource url support (#91)

---
 .env.example                          |  3 +--
 src/components/Image.vue              | 18 ++++--------------
 src/components/UserActionsPopover.vue |  5 ++---
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.env.example b/.env.example
index afb02d1..31ff5e9 100644
--- a/.env.example
+++ b/.env.example
@@ -5,5 +5,4 @@ VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
 VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount-dev", "inventorycount-uat"]
-VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
-VUE_APP_RESOURCE_URL=
\ No newline at end of file
+VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
\ No newline at end of file
diff --git a/src/components/Image.vue b/src/components/Image.vue
index 92b9157..ce0da42 100644
--- a/src/components/Image.vue
+++ b/src/components/Image.vue
@@ -10,17 +10,6 @@ export default defineComponent({
   name: "Image",
   props: ['src'],
   components: {},
-  created() {
-    if (
-      process.env.VUE_APP_RESOURCE_URL
-    ) {
-      this.resourceUrl = process.env.VUE_APP_RESOURCE_URL;
-    } else {
-      const authStore = useAuthStore();
-      const baseURL = authStore.getBaseUrl
-      this.resourceUrl = baseURL.replace("/api", "")
-    }
-  },
   mounted() {
     this.setImageUrl();
   },
@@ -29,7 +18,6 @@ export default defineComponent({
   },
   data() {
     return {
-      resourceUrl: '',
       imageUrl: require("@/assets/images/defaultImage.png")
     }
   },
@@ -59,8 +47,10 @@ export default defineComponent({
             console.error("Image doesn't exist", this.src);
           })
         } else {
-          // Image is from resource server, hence append to base resource url, check for existence and assign
-          const imageUrl = this.resourceUrl.concat(this.src)
+          const authStore = useAuthStore();
+          const baseURL = authStore.getBaseUrl.replace("/api", "")
+
+          const imageUrl = baseURL.concat(this.src)
           this.checkIfImageExists(imageUrl).then(() => {
             this.imageUrl = imageUrl;
           }).catch(() => {
diff --git a/src/components/UserActionsPopover.vue b/src/components/UserActionsPopover.vue
index e69d59d..0cfc92d 100644
--- a/src/components/UserActionsPopover.vue
+++ b/src/components/UserActionsPopover.vue
@@ -1,7 +1,7 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-list-header>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</ion-list-header>
+      <ion-list-header>{{ authStore.current?.partyName ? authStore.current.partyName : authStore.current.userLoginId }}</ion-list-header>
 
       <ion-item button @click="redirectToUserDetails()">
         <ion-label>{{ translate("View profile") }}</ion-label>
@@ -42,8 +42,7 @@ export default defineComponent({
   },
   methods: {
     redirectToUserDetails() {
-      const userDetailUrl = `${process.env.VUE_APP_USERS_LOGIN_URL}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}&partyId=${this.authStore.current.partyId}`
-      window.location.href = userDetailUrl
+      window.location.href = `${process.env.VUE_APP_USERS_LOGIN_URL}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}&partyId=${this.authStore.current.partyId}`
       popoverController.dismiss()
     },
     async logout() {

From 65c2fab0fea82457c44e3b8bca6bafe2ef84eded Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 16 Aug 2024 00:08:41 +0530
Subject: [PATCH 13/21] Improved: click events over the user card items (#91)

---
 src/views/Home.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index b1c9206..db047b0 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -9,7 +9,7 @@
         
         <ion-card v-if="authStore.isAuthenticated">
           <ion-list>
-            <ion-item lines="full">
+            <ion-item lines="full" button @click="openUserActionsPopover($event)">
               <ion-avatar slot="start">
                 <Image :src="authStore.current?.partyImageUrl" />
               </ion-avatar>
@@ -20,12 +20,12 @@
                 <ion-icon color="medium" slot="icon-only" :icon="chevronForwardOutline" />
               </ion-button>
             </ion-item>
-            <ion-item lines="none">
+            <ion-item lines="none" button @click="goToOms(authStore.token.value, authStore.getOMS)">
               <ion-icon slot="start" :icon="hardwareChipOutline"/>
               <ion-label>
                 <h2>{{ authStore.getOMS }}</h2>
               </ion-label>
-              <ion-button fill="clear" @click="goToOms(authStore.token.value, authStore.getOMS)">
+              <ion-button fill="clear">
                 <ion-icon color="medium" slot="icon-only" :icon="openOutline" />
               </ion-button>
             </ion-item>

From 1e3a4ee76c04f257c0ddcb8d34084bc517795e6d Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 22 Aug 2024 16:01:44 +0530
Subject: [PATCH 14/21] Improved: used spinner instead of loader while logging
 in (#81)

---
 src/locales/en.json |  1 -
 src/views/Login.vue | 14 +++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 0ff1df7..851679e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -3,7 +3,6 @@
   "Launch Pad": "Launch Pad",
   "Login": "Login",
   "Logout": "Logout",
-  "Logging in...": "Logging in...",
   "Logging out...": "Logging out...",
   "Next": "Next",
   "Not configured": "Not configured",
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 581e1b7..8defa3b 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -34,9 +34,10 @@
             </ion-item>
 
             <div class="ion-padding">
-              <ion-button color="primary" expand="block" @click="login()">
+              <ion-button color="primary" expand="block" @click="isLoggingIn ? '' : login()">
                 {{ $t("Login") }}
-                <ion-icon slot="end" :icon="arrowForwardOutline" />
+                <ion-spinner v-if="isLoggingIn" name="crescent" />
+                <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>
           </section>
@@ -64,6 +65,7 @@ import {
   IonInput,
   IonItem,
   IonPage,
+  IonSpinner,
   loadingController
 } from "@ionic/vue";
 import { defineComponent } from "vue";
@@ -88,6 +90,7 @@ export default defineComponent({
     IonInput,
     IonItem,
     IonPage,
+    IonSpinner,
     Logo
   },
   data () {
@@ -102,7 +105,8 @@ export default defineComponent({
       hideBackground: true,
       isConfirmingForActiveSession: false,
       loader: null as any,
-      loginOption: {} as any
+      loginOption: {} as any,
+      isLoggingIn: false
     };
   },
   ionViewWillEnter() {
@@ -242,7 +246,7 @@ export default defineComponent({
         return
       }
 
-      this.presentLoader('Logging in...')
+      this.isLoggingIn = true;
       try {
         await this.authStore.login(username.trim(), password)
         if (this.authStore.getRedirectUrl) {
@@ -256,7 +260,7 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
       }
-      this.dismissLoader()
+      this.isLoggingIn = false;
     },
     async samlLogin() {
       try {

From 8831741b05c921703dd8a210bebe3a222702e062 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 22 Aug 2024 16:10:08 +0530
Subject: [PATCH 15/21] Improved: added margin at between login text and
 spinner (#81)

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

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8defa3b..162ba56 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -36,7 +36,7 @@
             <div class="ion-padding">
               <ion-button color="primary" expand="block" @click="isLoggingIn ? '' : login()">
                 {{ $t("Login") }}
-                <ion-spinner v-if="isLoggingIn" name="crescent" />
+                <ion-spinner v-if="true" slot="end" name="crescent" class="ion-margin-start" />
                 <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>

From e84bf4488c765fa531d5e65949716dc4c6625564 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 22 Aug 2024 16:25:11 +0530
Subject: [PATCH 16/21] Improved: removed margin from the spinner and added
 size attribute (#81)

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

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 162ba56..7b9fe48 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -36,7 +36,7 @@
             <div class="ion-padding">
               <ion-button color="primary" expand="block" @click="isLoggingIn ? '' : login()">
                 {{ $t("Login") }}
-                <ion-spinner v-if="true" slot="end" name="crescent" class="ion-margin-start" />
+                <ion-spinner v-if="isLoggingIn" slot="end" name="crescent" data-spinner-size="medium" />
                 <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>

From b56f8cd22c4981e9a49e4349a7b931eb1c7374c5 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 23 Aug 2024 10:52:33 +0530
Subject: [PATCH 17/21] Improved: code to stop click event over next button
 until api call in progress (#88)

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

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 3b19860..4bfb353 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -12,7 +12,7 @@
             <div class="ion-padding">
               <!-- @keyup.enter.stop to stop the form from submitting on enter press as keyup.enter is already bound
               through the form above, causing both the form and the button to submit. -->
-              <ion-button color="primary" expand="block" @click.prevent="setOms()" @keyup.enter.stop>
+              <ion-button color="primary" expand="block" @click.prevent="isCheckingOms ? '' : setOms()" @keyup.enter.stop>
                 {{ $t("Next") }}
                 <ion-spinner v-if="isCheckingOms" name="crescent" data-spinner-size="medium" slot="end" />
                 <ion-icon v-else slot="end" :icon="arrowForwardOutline" />

From 40313fd4e29bfa6de7aa061cb186e7778b59c862 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Mon, 26 Aug 2024 10:48:27 +0530
Subject: [PATCH 18/21] Updated: maarg login entries as all the instances of
 inventory count app are now maarg based.

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 31ff5e9..c768924 100644
--- a/.env.example
+++ b/.env.example
@@ -4,5 +4,5 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
-VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount-dev", "inventorycount-uat"]
+VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount"]
 VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
\ No newline at end of file

From a72d65da4322652d91f737f21c81c2f9f0689041 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 27 Aug 2024 11:20:07 +0530
Subject: [PATCH 19/21] Improved: icons shown in user profile items and remove
 click event from icon (#91)

---
 src/views/Home.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index db047b0..0afda29 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -16,18 +16,14 @@
               <ion-label class="ion-text-nowrap">
                 <h2>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</h2>
               </ion-label>
-              <ion-button fill="clear" slot="end" @click="openUserActionsPopover($event)">
-                <ion-icon color="medium" slot="icon-only" :icon="chevronForwardOutline" />
-              </ion-button>
+              <ion-icon slot="end" :icon="chevronForwardOutline" class="ion-margin-start" />
             </ion-item>
             <ion-item lines="none" button @click="goToOms(authStore.token.value, authStore.getOMS)">
               <ion-icon slot="start" :icon="hardwareChipOutline"/>
               <ion-label>
                 <h2>{{ authStore.getOMS }}</h2>
               </ion-label>
-              <ion-button fill="clear">
-                <ion-icon color="medium" slot="icon-only" :icon="openOutline" />
-              </ion-button>
+              <ion-icon slot="end" :icon="openOutline" class="ion-margin-start" />
             </ion-item>
           </ion-list>
         </ion-card>

From 1b4893bbc0213210804ff40a0f78e715e8f77a77 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 4 Sep 2024 16:03:42 +0530
Subject: [PATCH 20/21] Implemented: hotwax apps-theme package and reverted
 custom size attribute from ion-spinner (#129)

---
 package-lock.json       | 11 +++++++++++
 package.json            |  1 +
 src/main.ts             |  1 +
 src/theme/variables.css | 10 ----------
 src/views/Login.vue     |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c799666..a70717f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "Launchpad",
       "version": "2.1.0",
       "dependencies": {
+        "@hotwax/apps-theme": "^1.2.8",
         "@hotwax/dxp-components": "^1.12.2",
         "@hotwax/oms-api": "^1.13.0",
         "@ionic/core": "^7.6.0",
@@ -2580,6 +2581,11 @@
         "@hapi/hoek": "^9.0.0"
       }
     },
+    "node_modules/@hotwax/apps-theme": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.8.tgz",
+      "integrity": "sha512-6ZE2y4DKWcDdYNToPv7L6oYM71NS4zgxfoncIUvSvA9BYqi3MavfC36Z6ujHBEB/PsUhcbU8DOdpakTvyL5aGw=="
+    },
     "node_modules/@hotwax/dxp-components": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.2.tgz",
@@ -15717,6 +15723,11 @@
         "@hapi/hoek": "^9.0.0"
       }
     },
+    "@hotwax/apps-theme": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.8.tgz",
+      "integrity": "sha512-6ZE2y4DKWcDdYNToPv7L6oYM71NS4zgxfoncIUvSvA9BYqi3MavfC36Z6ujHBEB/PsUhcbU8DOdpakTvyL5aGw=="
+    },
     "@hotwax/dxp-components": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.2.tgz",
diff --git a/package.json b/package.json
index f90494f..770cbae 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "@hotwax/dxp-components": "^1.12.2",
     "@hotwax/oms-api": "^1.13.0",
+    "@hotwax/apps-theme": "^1.2.8",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "^7.6.0",
diff --git a/src/main.ts b/src/main.ts
index 69e87ef..8eed0b0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,6 +25,7 @@ import '@ionic/vue/css/display.css';
 
 /* Theme variables */
 import './theme/variables.css';
+import '@hotwax/apps-theme';
 
 const app = createApp(App)
   .use(IonicVue, {
diff --git a/src/theme/variables.css b/src/theme/variables.css
index b00dc83..05f685e 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -236,16 +236,6 @@ http://ionicframework.com/docs/theming/ */
 }
 
 body {
-  /** Spacer variables **/
-  --spacer-2xs: 0.25rem; /* 4px */
-  --spacer-xs: 0.5rem;   /* 8px */
-  --spacer-sm: 1rem;     /* 16px */
-  --spacer-base: 1.5rem; /* 24px */
-  --spacer-lg: 2rem;     /* 32px */
-  --spacer-xl: 2.5rem;   /* 40px */
-  --spacer-2xl: 5rem;    /* 80px */
-  --spacer-3xl: 10rem;   /* 160px */
-
   /** Border variable **/
   --border-medium: 1px solid var(--ion-color-medium);
 }
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 4bfb353..919a6de 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -14,7 +14,7 @@
               through the form above, causing both the form and the button to submit. -->
               <ion-button color="primary" expand="block" @click.prevent="isCheckingOms ? '' : setOms()" @keyup.enter.stop>
                 {{ $t("Next") }}
-                <ion-spinner v-if="isCheckingOms" name="crescent" data-spinner-size="medium" slot="end" />
+                <ion-spinner v-if="isCheckingOms" name="crescent" slot="end" />
                 <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>
@@ -37,7 +37,7 @@
             <div class="ion-padding">
               <ion-button color="primary" expand="block" @click="isLoggingIn ? '' : login()">
                 {{ $t("Login") }}
-                <ion-spinner v-if="isLoggingIn" slot="end" name="crescent" data-spinner-size="medium" />
+                <ion-spinner v-if="isLoggingIn" slot="end" name="crescent" />
                 <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>

From 56d0e2722d5d325afe30361778e5162ce3d21d00 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Thu, 26 Sep 2024 19:10:59 +0530
Subject: [PATCH 21/21] Updated: app version for the release v3.0.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a70717f..4a3c3db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "Launchpad",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Launchpad",
-      "version": "2.1.0",
+      "version": "3.0.0",
       "dependencies": {
         "@hotwax/apps-theme": "^1.2.8",
         "@hotwax/dxp-components": "^1.12.2",
diff --git a/package.json b/package.json
index 770cbae..1343149 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Launchpad",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",