From 78f23775ab429d12bcb1eb31f76ebc51c7b4a11f Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Tue, 2 Jan 2024 18:31:10 +0530
Subject: [PATCH 1/2] Improved: app to use the ionic v7.6.0(#82)

---
 package-lock.json | 164 +++++++++++++++++++++++++++++++++-------------
 package.json      |   5 +-
 2 files changed, 121 insertions(+), 48 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 703cd46..2b590e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,9 @@
       "dependencies": {
         "@hotwax/dxp-components": "^1.11.0",
         "@hotwax/oms-api": "^1.9.0",
-        "@ionic/vue": "^6.0.2",
-        "@ionic/vue-router": "^6.0.2",
+        "@ionic/core": "^7.6.0",
+        "@ionic/vue": "^7.6.0",
+        "@ionic/vue-router": "^7.6.0",
         "core-js": "^3.8.3",
         "firebase": "^10.3.1",
         "luxon": "^3.3.0",
@@ -2639,6 +2640,45 @@
         "url": "https://github.com/sponsors/kazupon"
       }
     },
+    "node_modules/@hotwax/dxp-components/node_modules/@ionic/core": {
+      "version": "6.7.5",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
+      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
+      "dependencies": {
+        "@stencil/core": "^2.18.0",
+        "ionicons": "^6.1.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/@ionic/vue": {
+      "version": "6.7.5",
+      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
+      "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
+      "dependencies": {
+        "@ionic/core": "6.7.5",
+        "ionicons": "^6.1.3"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/@stencil/core": {
+      "version": "2.22.3",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
+      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/@hotwax/dxp-components/node_modules/ionicons": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
+      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
+      "dependencies": {
+        "@stencil/core": "^2.18.0"
+      }
+    },
     "node_modules/@hotwax/dxp-components/node_modules/pinia": {
       "version": "2.0.36",
       "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.36.tgz",
@@ -2893,30 +2933,30 @@
       }
     },
     "node_modules/@ionic/core": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
-      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.0.tgz",
+      "integrity": "sha512-pDX8G915puz8OcLhxfb9MwuvpYZsUOCngJdd+61ibJ6UF+NA2mGatsMqHKzcgelTXtwcHDpi9ZLUD/HNmupqaQ==",
       "dependencies": {
-        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.1.3",
+        "@stencil/core": "^4.8.1",
+        "ionicons": "^7.2.1",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@ionic/vue": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
-      "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.6.0.tgz",
+      "integrity": "sha512-2CWLcVNS8kLQ6BK4UmRdc7a0HSsS6MqyTQh7+0qT88z+Ih05dCcZ3CiJ27F3F2a7jsOi48ggXt97zOpBbZENlg==",
       "dependencies": {
-        "@ionic/core": "6.7.5",
-        "ionicons": "^6.1.3"
+        "@ionic/core": "7.6.0",
+        "ionicons": "^7.0.0"
       }
     },
     "node_modules/@ionic/vue-router": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-6.7.5.tgz",
-      "integrity": "sha512-nupLaWFARdy5vOCNg2xw6YpecaR/hPEew+tWjUJE1INlwvB88o7Uct/R480vqFj3fB436W4O4ViJd4/g0ZBZ8A==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-7.6.0.tgz",
+      "integrity": "sha512-grzMyURlZX3EqkQFBXeKuhxN2psbNKAI8CVwPi56xRPwCvSp32KFYtGxj20k1QBl+Kzg7/RbxTERArxZRtPWJw==",
       "dependencies": {
-        "@ionic/vue": "6.7.5"
+        "@ionic/vue": "7.6.0"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -3217,15 +3257,15 @@
       "dev": true
     },
     "node_modules/@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.9.0.tgz",
+      "integrity": "sha512-aWSkhBmk3yPwRAkUwBbzRwmdhb8hKiQ/JMr9m5jthpBZLjtppYbzz6PN2MhSMDfRp6K93eQw5WogSEH4HHuB6w==",
       "bin": {
         "stencil": "bin/stencil"
       },
       "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "node": ">=16.0.0",
+        "npm": ">=7.10.0"
       }
     },
     "node_modules/@trysound/sax": {
@@ -8433,11 +8473,11 @@
       "dev": true
     },
     "node_modules/ionicons": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
-      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz",
+      "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==",
       "dependencies": {
-        "@stencil/core": "^2.18.0"
+        "@stencil/core": "^4.0.3"
       }
     },
     "node_modules/ipaddr.js": {
@@ -15823,6 +15863,38 @@
           "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.7.0.tgz",
           "integrity": "sha512-PUkEuk//YKu4CHS5ah3mNa3XL/+TZj6rAY/6yYN+GCNFd2u+uWUkeuwE4Q6t8dydRWlErOePHHS0KyNoof/oBw=="
         },
+        "@ionic/core": {
+          "version": "6.7.5",
+          "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
+          "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
+          "requires": {
+            "@stencil/core": "^2.18.0",
+            "ionicons": "^6.1.3",
+            "tslib": "^2.1.0"
+          }
+        },
+        "@ionic/vue": {
+          "version": "6.7.5",
+          "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
+          "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
+          "requires": {
+            "@ionic/core": "6.7.5",
+            "ionicons": "^6.1.3"
+          }
+        },
+        "@stencil/core": {
+          "version": "2.22.3",
+          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
+          "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng=="
+        },
+        "ionicons": {
+          "version": "6.1.3",
+          "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
+          "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
+          "requires": {
+            "@stencil/core": "^2.18.0"
+          }
+        },
         "pinia": {
           "version": "2.0.36",
           "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.36.tgz",
@@ -15997,30 +16069,30 @@
       }
     },
     "@ionic/core": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
-      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.0.tgz",
+      "integrity": "sha512-pDX8G915puz8OcLhxfb9MwuvpYZsUOCngJdd+61ibJ6UF+NA2mGatsMqHKzcgelTXtwcHDpi9ZLUD/HNmupqaQ==",
       "requires": {
-        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.1.3",
+        "@stencil/core": "^4.8.1",
+        "ionicons": "^7.2.1",
         "tslib": "^2.1.0"
       }
     },
     "@ionic/vue": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.7.5.tgz",
-      "integrity": "sha512-6JBEaHCT2vVUzYqyfBiEUN8Wo7FezxY5Y3n+HGqI61J4qVay+8IxZRTYeX+O72QglbYOkzvfjE6SgS25oS+S9A==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.6.0.tgz",
+      "integrity": "sha512-2CWLcVNS8kLQ6BK4UmRdc7a0HSsS6MqyTQh7+0qT88z+Ih05dCcZ3CiJ27F3F2a7jsOi48ggXt97zOpBbZENlg==",
       "requires": {
-        "@ionic/core": "6.7.5",
-        "ionicons": "^6.1.3"
+        "@ionic/core": "7.6.0",
+        "ionicons": "^7.0.0"
       }
     },
     "@ionic/vue-router": {
-      "version": "6.7.5",
-      "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-6.7.5.tgz",
-      "integrity": "sha512-nupLaWFARdy5vOCNg2xw6YpecaR/hPEew+tWjUJE1INlwvB88o7Uct/R480vqFj3fB436W4O4ViJd4/g0ZBZ8A==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic/vue-router/-/vue-router-7.6.0.tgz",
+      "integrity": "sha512-grzMyURlZX3EqkQFBXeKuhxN2psbNKAI8CVwPi56xRPwCvSp32KFYtGxj20k1QBl+Kzg7/RbxTERArxZRtPWJw==",
       "requires": {
-        "@ionic/vue": "6.7.5"
+        "@ionic/vue": "7.6.0"
       }
     },
     "@jridgewell/gen-mapping": {
@@ -16277,9 +16349,9 @@
       "dev": true
     },
     "@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng=="
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.9.0.tgz",
+      "integrity": "sha512-aWSkhBmk3yPwRAkUwBbzRwmdhb8hKiQ/JMr9m5jthpBZLjtppYbzz6PN2MhSMDfRp6K93eQw5WogSEH4HHuB6w=="
     },
     "@trysound/sax": {
       "version": "0.2.0",
@@ -20196,11 +20268,11 @@
       "dev": true
     },
     "ionicons": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
-      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz",
+      "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==",
       "requires": {
-        "@stencil/core": "^2.18.0"
+        "@stencil/core": "^4.0.3"
       }
     },
     "ipaddr.js": {
diff --git a/package.json b/package.json
index 906136a..bed7eb5 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,9 @@
   "dependencies": {
     "@hotwax/dxp-components": "^1.11.0",
     "@hotwax/oms-api": "^1.9.0",
-    "@ionic/vue": "^6.0.2",
-    "@ionic/vue-router": "^6.0.2",
+    "@ionic/core": "^7.6.0",
+    "@ionic/vue": "^7.6.0",
+    "@ionic/vue-router": "^7.6.0",
     "core-js": "^3.8.3",
     "firebase": "^10.3.1",
     "luxon": "^3.3.0",

From e1955d72968f2e5116fdf320d45db95becfab299 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 3 Jan 2024 11:04:27 +0530
Subject: [PATCH 2/2] Improved: usage of ion-input and ion-label as per the
 changes in ionic v7(#82)

---
 src/views/Home.vue  |  4 +---
 src/views/Login.vue | 11 +++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 39a1a09..4f8b1f3 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -11,9 +11,7 @@
           <ion-list>
             <ion-item lines="full">
               <ion-icon slot="start" :icon="lockClosedOutline"/>
-              <ion-label>
-                {{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
-              </ion-label>
+              {{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
               <ion-button fill="outline" color="medium" slot="end" @click="authStore.logout()">
                 {{ $t('Logout') }}
               </ion-button>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 631448b..d6742c8 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -6,8 +6,7 @@
           <Logo />
           <section v-if="showOmsInput">
             <ion-item lines="full">
-              <ion-label position="fixed">{{ $t("OMS") }}</ion-label>
-              <ion-input name="instanceUrl" v-model="instanceUrl" id="instanceUrl" type="text" required />
+              <ion-input :label="$t('OMS')" label-placement="fixed" name="instanceUrl" v-model="instanceUrl" id="instanceUrl" type="text" required />
             </ion-item>
 
             <div class="ion-padding">
@@ -28,12 +27,10 @@
             </div>
 
             <ion-item lines="full">
-              <ion-label position="fixed">{{ $t("Username") }}</ion-label>
-              <ion-input name="username" v-model="username" id="username"  type="text" required />
+              <ion-input :label="$t('Username')" label-placement="fixed" name="username" v-model="username" id="username"  type="text" required />
             </ion-item>
             <ion-item lines="none">
-              <ion-label position="fixed">{{ $t("Password") }}</ion-label>
-              <ion-input name="password" v-model="password" id="password" type="password" required />
+              <ion-input :label="$t('Password')" label-placement="fixed" name="password" v-model="password" id="password" type="password" required />
             </ion-item>
 
             <div class="ion-padding">
@@ -67,7 +64,6 @@ import {
   IonIcon,
   IonInput,
   IonItem,
-  IonLabel,
   IonPage,
   loadingController
 } from "@ionic/vue";
@@ -92,7 +88,6 @@ export default defineComponent({
     IonIcon,
     IonInput,
     IonItem,
-    IonLabel,
     IonPage,
     Logo
   },