From dd4b84e5e0fc34a0079c38cc8d42c2cc7f3403fa Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Tue, 26 Dec 2023 19:22:07 +0530 Subject: [PATCH 1/2] Updated: Page Name in Side Menu Navigation from Catalog to Audit(#265) --- src/components/Menu.vue | 12 ++++++------ src/router/index.ts | 16 ++++++++-------- ...uct-details.vue => audit-product-details.vue} | 4 ++-- src/views/{catalog.vue => audit.vue} | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) rename src/views/{catalog-product-details.vue => audit-product-details.vue} (99%) rename src/views/{catalog.vue => audit.vue} (97%) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 214da3f3..e075d61d 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -41,7 +41,7 @@ import { import { computed, defineComponent} from "vue" import { mapGetters } from "vuex"; -import { albums ,shirt, pricetags, settings } from "ionicons/icons"; +import { albums ,shirt, pricetags, settings, flashlightOutline } from "ionicons/icons"; import { useStore } from "@/store"; import { useRouter } from "vue-router"; import { hasPermission } from "@/authorization"; @@ -94,11 +94,11 @@ export default defineComponent({ } }, { - title: "Catalog", - url: "/catalog", - childRoutes: ["/catalog-product-details/"], - iosIcon: albums, - mdIcon: albums, + title: "Audit", + url: "/audit", + childRoutes: ["/audit-product-details/"], + iosIcon: flashlightOutline, + mdIcon: flashlightOutline, meta: { permissionId: "APP_CATALOG_VIEW" } diff --git a/src/router/index.ts b/src/router/index.ts index 62d4a0b5..b9a3f7a5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -2,9 +2,9 @@ import { createRouter, createWebHistory } from '@ionic/vue-router'; import { RouteRecordRaw } from 'vue-router'; import Products from '../views/products.vue' import ProductDetails from '../views/product-details.vue' -import CatalogProductDetails from '../views/catalog-product-details.vue' +import AuditProductDetails from '../views/audit-product-details.vue' import Orders from '../views/orders.vue' -import Catalog from '../views/catalog.vue' +import Audit from '../views/audit.vue' import Settings from '../views/settings.vue' import store from '@/store'; import { DxpLogin, useAuthStore } from '@hotwax/dxp-components'; @@ -79,18 +79,18 @@ const routes: Array = [ } }, { - path: '/catalog', - name: 'Catalog', - component: Catalog, + path: '/audit', + name: 'Audit', + component: Audit, beforeEnter: authGuard, meta: { permissionId: "APP_CATALOG_VIEW" } }, { - path: '/catalog-product-details/:productId/', - name: 'Catalog-product-details', - component: CatalogProductDetails, + path: '/audit-product-details/:productId/', + name: 'Audit-product-details', + component: AuditProductDetails, beforeEnter: authGuard, meta: { permissionId: "APP_CTLG_PRDT_DTLS_VIEW" diff --git a/src/views/catalog-product-details.vue b/src/views/audit-product-details.vue similarity index 99% rename from src/views/catalog-product-details.vue rename to src/views/audit-product-details.vue index 3a265dd4..e312c489 100644 --- a/src/views/catalog-product-details.vue +++ b/src/views/audit-product-details.vue @@ -3,7 +3,7 @@ - + {{ $t("Product audit") }} @@ -414,7 +414,7 @@ import { Plugins } from "@capacitor/core"; import { Actions, hasPermission } from '@/authorization' export default defineComponent({ - name: "catalog-product-details", + name: "audit-product-details", components: { ShopifyImg, IonButtons, diff --git a/src/views/catalog.vue b/src/views/audit.vue similarity index 97% rename from src/views/catalog.vue rename to src/views/audit.vue index 114a6e12..7dbb887a 100644 --- a/src/views/catalog.vue +++ b/src/views/audit.vue @@ -5,7 +5,7 @@ - {{ $t("Catalog") }} + {{ $t("Audit") }} @@ -116,7 +116,7 @@ import { JobService } from '@/services/JobService'; import { hasError } from '@/utils'; export default defineComponent({ - name: 'Catalog', + name: 'Audit', components: { ShopifyImg, IonButtons, @@ -211,7 +211,7 @@ export default defineComponent({ this.getCatalogProducts() }, viewProduct(product: any) { - this.router.push({ path: `/catalog-product-details/${product.groupId}`, query: { variantId: product.productId } }); + this.router.push({ path: `/audit-product-details/${product.groupId}`, query: { variantId: product.productId } }); }, async preparePreordBckordComputationJob() { try { From 2ae8e025c6186a8100ac22ac1b14522f1e7accb0 Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Wed, 27 Dec 2023 09:21:36 +0530 Subject: [PATCH 2/2] Removed: Unused Icon Album from menu --- src/components/Menu.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index e075d61d..159befa9 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -40,8 +40,7 @@ import { } from "@ionic/vue"; import { computed, defineComponent} from "vue" import { mapGetters } from "vuex"; - -import { albums ,shirt, pricetags, settings, flashlightOutline } from "ionicons/icons"; +import { shirt, pricetags, settings, flashlightOutline } from "ionicons/icons"; import { useStore } from "@/store"; import { useRouter } from "vue-router"; import { hasPermission } from "@/authorization"; @@ -118,7 +117,6 @@ export default defineComponent({ return { appPages, - albums, getValidMenuItems, pricetags, settings,