From 4cdc99e9ad22c7ea0fb729a7f6bf166d19b02ba9 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Fri, 5 Jan 2024 19:11:36 +0530 Subject: [PATCH 1/4] Improved: app to upgrade ionic to 7.5.8(#244) --- package-lock.json | 76 +++++++++++++++++++++++------------------------ package.json | 4 +-- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a6f013..f572bf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", - "@ionic/core": "^6.7.5", - "@ionic/vue": "^6.7.5", + "@ionic/core": "7.5.8", + "@ionic/vue": "7.5.8", "@types/vue-barcode-reader": "^0.0.0", "firebase": "^10.3.1", "luxon": "^3.3.0", @@ -1125,22 +1125,22 @@ } }, "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.5.8", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.5.8.tgz", + "integrity": "sha512-AKqI9iUyub9tQa68CbF/h6B3gCydQpiDDres24Rs5RlXw01MSLcze88XBP4e1zaQKXMb+v/P8T5/3u7g/huK8w==", "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.5.8", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.5.8.tgz", + "integrity": "sha512-cHWhZkDR8Dr/HlNB+A/hObEJvKJxryr2v+BJiDl2lN5OeBnRR6hZ5D2DeSz96pW7v5uck1jrOCSWfQ1WtzmtDA==", "dependencies": { - "@ionic/core": "6.7.5", - "ionicons": "^6.1.3" + "@ionic/core": "7.5.8", + "ionicons": "^7.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { @@ -1271,15 +1271,15 @@ } }, "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/@types/json-schema": { @@ -3240,11 +3240,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/is-buffer": { @@ -5722,22 +5722,22 @@ "integrity": "sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==" }, "@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.5.8", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.5.8.tgz", + "integrity": "sha512-AKqI9iUyub9tQa68CbF/h6B3gCydQpiDDres24Rs5RlXw01MSLcze88XBP4e1zaQKXMb+v/P8T5/3u7g/huK8w==", "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.5.8", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.5.8.tgz", + "integrity": "sha512-cHWhZkDR8Dr/HlNB+A/hObEJvKJxryr2v+BJiDl2lN5OeBnRR6hZ5D2DeSz96pW7v5uck1jrOCSWfQ1WtzmtDA==", "requires": { - "@ionic/core": "6.7.5", - "ionicons": "^6.1.3" + "@ionic/core": "7.5.8", + "ionicons": "^7.0.0" } }, "@jridgewell/sourcemap-codec": { @@ -5850,9 +5850,9 @@ } }, "@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==" }, "@types/json-schema": { "version": "7.0.12", @@ -7288,11 +7288,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" } }, "is-buffer": { diff --git a/package.json b/package.json index 216c7ff..88aab6e 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", - "@ionic/core": "^6.7.5", - "@ionic/vue": "^6.7.5", + "@ionic/core": "7.5.8", + "@ionic/vue": "7.5.8", "@types/vue-barcode-reader": "^0.0.0", "firebase": "^10.3.1", "luxon": "^3.3.0", From e0580b9136545858469a9543f5daaa8b5c64b9c3 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Fri, 5 Jan 2024 19:12:10 +0530 Subject: [PATCH 2/4] Improved: usage of ion-select as per the changes in ionic7(#244) --- src/components/LanguageSwitcher.vue | 3 +-- src/components/ProductIdentifier.vue | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/LanguageSwitcher.vue b/src/components/LanguageSwitcher.vue index 0d0b3a0..a0f4d04 100644 --- a/src/components/LanguageSwitcher.vue +++ b/src/components/LanguageSwitcher.vue @@ -9,8 +9,7 @@ {{ $t('Select your preferred language.') }} - {{ $t("Choose language") }} - + {{ locales[locale] }} diff --git a/src/components/ProductIdentifier.vue b/src/components/ProductIdentifier.vue index d2817f3..5123522 100644 --- a/src/components/ProductIdentifier.vue +++ b/src/components/ProductIdentifier.vue @@ -12,14 +12,12 @@ - {{ "Primary Product Identifier" }} - + {{ identification }} - {{ "Secondary Product Identifier" }} - + {{ identification }} {{ "None" }} From b970f10a0e51deeed800ecc9a9c68dd3d18bd61b Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Tue, 9 Jan 2024 17:41:26 +0530 Subject: [PATCH 3/4] Improved: the ionic version to 7.6.0(#244) --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index f572bf9..3d2ee4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", - "@ionic/core": "7.5.8", - "@ionic/vue": "7.5.8", + "@ionic/core": "^7.6.0", + "@ionic/vue": "^7.6.0", "@types/vue-barcode-reader": "^0.0.0", "firebase": "^10.3.1", "luxon": "^3.3.0", @@ -1125,21 +1125,21 @@ } }, "node_modules/@ionic/core": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.5.8.tgz", - "integrity": "sha512-AKqI9iUyub9tQa68CbF/h6B3gCydQpiDDres24Rs5RlXw01MSLcze88XBP4e1zaQKXMb+v/P8T5/3u7g/huK8w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.3.tgz", + "integrity": "sha512-KT8RXcbLRoCvj2wQNZJ0FAM+PlcVZZT0N3BPYPAiyTLA/rmMnlPGxNMMqGEJMynL8oPx/2nh+bLS2Yv/kBPnug==", "dependencies": { - "@stencil/core": "^4.8.1", - "ionicons": "^7.2.1", + "@stencil/core": "^4.8.2", + "ionicons": "^7.2.2", "tslib": "^2.1.0" } }, "node_modules/@ionic/vue": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.5.8.tgz", - "integrity": "sha512-cHWhZkDR8Dr/HlNB+A/hObEJvKJxryr2v+BJiDl2lN5OeBnRR6hZ5D2DeSz96pW7v5uck1jrOCSWfQ1WtzmtDA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.6.3.tgz", + "integrity": "sha512-z++ahF2xfcbj/LuqPZUm22fxm7p5BabWOHekbrraPllIm9+1xpP6JESb7XNYT4G0+hFxThXYxUyhc+ph2cALgQ==", "dependencies": { - "@ionic/core": "7.5.8", + "@ionic/core": "7.6.3", "ionicons": "^7.0.0" } }, @@ -5722,21 +5722,21 @@ "integrity": "sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==" }, "@ionic/core": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.5.8.tgz", - "integrity": "sha512-AKqI9iUyub9tQa68CbF/h6B3gCydQpiDDres24Rs5RlXw01MSLcze88XBP4e1zaQKXMb+v/P8T5/3u7g/huK8w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.3.tgz", + "integrity": "sha512-KT8RXcbLRoCvj2wQNZJ0FAM+PlcVZZT0N3BPYPAiyTLA/rmMnlPGxNMMqGEJMynL8oPx/2nh+bLS2Yv/kBPnug==", "requires": { - "@stencil/core": "^4.8.1", - "ionicons": "^7.2.1", + "@stencil/core": "^4.8.2", + "ionicons": "^7.2.2", "tslib": "^2.1.0" } }, "@ionic/vue": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.5.8.tgz", - "integrity": "sha512-cHWhZkDR8Dr/HlNB+A/hObEJvKJxryr2v+BJiDl2lN5OeBnRR6hZ5D2DeSz96pW7v5uck1jrOCSWfQ1WtzmtDA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.6.3.tgz", + "integrity": "sha512-z++ahF2xfcbj/LuqPZUm22fxm7p5BabWOHekbrraPllIm9+1xpP6JESb7XNYT4G0+hFxThXYxUyhc+ph2cALgQ==", "requires": { - "@ionic/core": "7.5.8", + "@ionic/core": "7.6.3", "ionicons": "^7.0.0" } }, diff --git a/package.json b/package.json index 88aab6e..a7432c6 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", - "@ionic/core": "7.5.8", - "@ionic/vue": "7.5.8", + "@ionic/core": "^7.6.0", + "@ionic/vue": "^7.6.0", "@types/vue-barcode-reader": "^0.0.0", "firebase": "^10.3.1", "luxon": "^3.3.0", From 56a5db32bcdeca5d1244c7284d375ff6698af28d Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Tue, 9 Jan 2024 17:44:37 +0530 Subject: [PATCH 4/4] Improved: the label for select options in product identifier component(#244) Changed Primary Product Identifier to Primary Changed Secondary Product Identifier to Secondary The changes are made as after upgrading ionic the labels are getting truncated and also the label are having redundant keyword as product identifier --- src/components/ProductIdentifier.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ProductIdentifier.vue b/src/components/ProductIdentifier.vue index 5123522..d568bdd 100644 --- a/src/components/ProductIdentifier.vue +++ b/src/components/ProductIdentifier.vue @@ -12,12 +12,12 @@ - + {{ identification }} - - + + {{ identification }} {{ "None" }} @@ -26,7 +26,7 @@