From 42c58296acea1071ed890092b2acade504d50319 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Jun 2024 08:44:40 +0200 Subject: [PATCH] refafctor: changed titles errors --- src/components/common/VnBreadcrumbs.vue | 1 - src/i18n/locale/en.yml | 8 +++++--- src/i18n/locale/es.yml | 8 +++++--- src/pages/Claim/Card/ClaimSummary.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 8 ++++---- src/pages/Travel/Card/TravelSummary.vue | 8 ++++---- src/pages/Travel/ExtraCommunity.vue | 2 +- src/pages/Travel/ExtraCommunityFilter.vue | 2 +- src/router/index.js | 7 ++----- src/router/modules/item.js | 9 --------- src/stores/useNavigationStore.js | 4 ++-- 11 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue index 75fd6d499..337507233 100644 --- a/src/components/common/VnBreadcrumbs.vue +++ b/src/components/common/VnBreadcrumbs.vue @@ -37,7 +37,6 @@ function getBreadcrumb(param) { locale: t(`globals.pageTitles.${param.meta.title}`), }; - //TODO modificar para que funcione títulos de página if (screen.gt.sm) { breadcrumb.name = param.name; breadcrumb.title = useCamelCase(param.meta.title); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9bf272d61..3cf929f82 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -100,8 +100,8 @@ globals: modes: Modes zones: Zones zonesList: Zones - deliveryList: Delivery days - upcomingList: Upcoming deliveries + deliveryDays: Delivery days + upcomingDeliveries: Upcoming deliveries role: Role alias: Alias aliasUsers: Users @@ -220,6 +220,8 @@ globals: lastEntries: Last entries itemType: Item type monitors: Monitors + dashboard: Dashboard + users: Users created: Created worker: Worker now: Now @@ -260,7 +262,7 @@ verifyEmail: verifyEmail: Email verification dashboard: pageTitles: - dashboard: Dashboard + customer: list: phone: Phone diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f33cc8543..2b4498ced 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -100,8 +100,8 @@ globals: modes: Modos zones: Zonas zonesList: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos + deliveryDays: Días de entrega + upcomingDeliveries: Próximos repartos role: Role alias: Alias aliasUsers: Usuarios @@ -221,6 +221,8 @@ globals: lastEntries: Últimas entradas itemType: Familia monitors: Monitores + dashboard: Tablón + users: Usuarios created: Fecha creación worker: Trabajador now: Ahora @@ -259,7 +261,7 @@ verifyEmail: verifyEmail: Verificación de correo dashboard: pageTitles: - dashboard: Tablón + customer: list: phone: Teléfono diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 36a26008e..241709bdd 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -223,7 +223,7 @@ async function changeState(value) { `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 91b36f0cf..f0785cff1 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -49,7 +49,7 @@ const entriesTableColumns = computed(() => { showValue: false, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'supplierName', name: 'supplierName', align: 'left', @@ -247,7 +247,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -265,7 +265,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -283,7 +283,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue index 607ecb560..eb410a489 100644 --- a/src/pages/Travel/ExtraCommunity.vue +++ b/src/pages/Travel/ExtraCommunity.vue @@ -132,7 +132,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'cargoSupplierNickname', name: 'cargoSupplierNickname', align: 'left', diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue index 7fe628180..5f9adedfa 100644 --- a/src/pages/Travel/ExtraCommunityFilter.vue +++ b/src/pages/Travel/ExtraCommunityFilter.vue @@ -182,7 +182,7 @@ const decrement = (paramsObj, key) => { 1) { const module = matches[1]; const moduleTitle = module.meta && module.meta.title; - moduleName = toLowerCamel(module.name); if (moduleTitle) { - title = t(`${moduleName}.pageTitles.${moduleTitle}`); + title = t(`globals.pageTitles.${moduleTitle}`); } } @@ -94,7 +91,7 @@ export default route(function (/* { store, ssrContext } */) { if (childPageTitle && matches.length > 2) { if (title != '') title += ': '; - const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`; + const moduleLocale = `globals.pageTitles.${childPageTitle}`; const pageTitle = te(moduleLocale) ? t(moduleLocale) : t(`globals.pageTitles.${childPageTitle}`); diff --git a/src/router/modules/item.js b/src/router/modules/item.js index 6e8659747..06fe680eb 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -201,15 +201,6 @@ export default { }, component: () => import('src/pages/Item/Card/ItemLog.vue'), }, - { - path: 'botanical', - name: 'ItemBotanical', - meta: { - title: 'botanical', - icon: 'vn:botanical', - }, - component: () => import('src/pages/Item/Card/ItemBotanical.vue'), - }, ], }, ], diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index 4dd5ed2ae..51f266800 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -60,7 +60,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { menuChildren = menuChildren.map(({ name, title, icon }) => ({ name, icon, - title: `${module}.pageTitles.${title}`, + title: `globals.pageTitles.${title}`, })); if (meta && meta.roles && role.hasAny(meta.roles) === false) return; @@ -70,7 +70,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { children: menuChildren, }; if (meta) { - item.title = `${module}.pageTitles.${meta.title}`; + item.title = `globals.pageTitles.${meta.title}`; item.icon = meta.icon; }