From 0c3dc30b8c329273fdcc79969cea991ec9c22e06 Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 12 Mar 2024 09:49:58 +0100 Subject: [PATCH 01/27] fix(styles): refs #7001 create VnTitle and correct background-page color --- src/components/common/VnTitle.vue | 25 +++++++++++ src/css/app.scss | 2 +- src/pages/Claim/Card/ClaimSummary.vue | 10 +++-- src/pages/Entry/Card/EntrySummary.vue | 63 +-------------------------- 4 files changed, 34 insertions(+), 66 deletions(-) create mode 100644 src/components/common/VnTitle.vue diff --git a/src/components/common/VnTitle.vue b/src/components/common/VnTitle.vue new file mode 100644 index 000000000..1d53e47a1 --- /dev/null +++ b/src/components/common/VnTitle.vue @@ -0,0 +1,25 @@ + + + diff --git a/src/css/app.scss b/src/css/app.scss index 38dd642a3..459a7f2dc 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -18,7 +18,7 @@ body.body--light { body.body--dark { --vn-pageColor: #222; - --vn-SectionColor: #3c3b3b; + --vn-SectionColor: #403c3c; background-color: var(--vn-pageColor); --vn-text: white; --vn-gray: var(--vn-SectionColor); diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index bf6b57973..2d8592b6d 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -11,6 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue'; import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; +import VnTitle from 'src/components/common/VnTitle.vue'; const route = useRoute(); const { t } = useI18n(); @@ -179,10 +180,11 @@ function openDialog(dmsId) { @@ -158,3 +182,22 @@ function copyUserToken() { } } + + + en: + localWarehouse: Local warehouse + localBank: Local bank + localCompany: Local company + userWarehouse: User warehouse + userCompany: User company + es: + New province: Nueva provincia + Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos! + Name: Nombre + Autonomy: Autonomía + localWarehouse: Almacén local + localBank: Banco local + localCompany: Empresa local + userWarehouse: Almacén del usuario + userCompany: Empresa del usuario + From 2d880be0f8b748a50295c42b4208ea18fcf1b081 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 12 Mar 2024 11:04:57 +0100 Subject: [PATCH 03/27] refs #6905 fix vnrow --- src/components/UserPanel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index 5b51e283e..d6acb9a99 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -116,7 +116,7 @@ function copyUserToken() { -
+
-
+
From 64d8f86ea952bf28cc503e9fc86b93dcbabf0a72 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 12 Mar 2024 12:25:31 +0100 Subject: [PATCH 04/27] refactor(routeList): refs #6971 moved button to subtoolbar + same functionality as other subtoolbar items --- src/pages/Route/RouteList.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index 0b4aa6795..de600bc0e 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -255,6 +255,15 @@ const markAsServed = () => { > {{ t('Mark as served') }} + + + {{ t('newRoute') }} +
@@ -494,12 +503,6 @@ const markAsServed = () => {
- - - - {{ t('newRoute') }} - - From 00a47cd5b254ea73750a58176b7d275bf1e1b235 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 14 Mar 2024 15:06:06 +0100 Subject: [PATCH 05/27] refactor(style): refs #7001 add style font vnTitle vnChip --- src/components/NavBar.vue | 2 +- src/components/common/VnBreadcrumbs.vue | 2 +- src/components/common/VnChip.vue | 13 +++ src/components/common/VnDmsList.vue | 2 +- src/components/common/VnLog.vue | 21 ++--- src/components/common/VnSelectDialog.vue | 2 +- src/components/common/VnSmsDialog.vue | 5 +- src/components/common/VnTitle.vue | 14 ++-- src/components/ui/CardDescriptor.vue | 10 +-- src/components/ui/CardList.vue | 16 ++-- src/components/ui/CardSummary.vue | 12 +-- src/components/ui/VnSearchbar.vue | 2 +- src/components/ui/VnSms.vue | 8 +- src/css/app.scss | 51 ++++++------ src/css/quasar.variables.scss | 8 +- src/pages/Claim/Card/ClaimDescriptor.vue | 6 +- src/pages/Claim/Card/ClaimLines.vue | 13 +-- src/pages/Claim/Card/ClaimSummary.vue | 48 ++++++----- src/pages/Claim/ClaimList.vue | 6 +- .../Customer/Card/CustomerConsignees.vue | 4 +- src/pages/Customer/Card/CustomerGreuges.vue | 4 +- src/pages/Customer/Card/CustomerNotes.vue | 4 +- .../Customer/Card/CustomerRecoveries.vue | 4 +- src/pages/Customer/Card/CustomerSummary.vue | 81 +++++++------------ .../Defaulter/CustomerBalanceDueTotal.vue | 6 +- .../Customer/Payments/CustomerPayments.vue | 3 +- .../Department/Card/DepartmentSummary.vue | 12 ++- src/pages/Entry/Card/EntryBuys.vue | 2 +- src/pages/Entry/Card/EntrySummary.vue | 25 +++--- src/pages/Entry/EntryLatestBuysFilter.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 63 +++++++-------- .../InvoiceOut/Card/InvoiceOutSummary.vue | 16 +--- src/pages/InvoiceOut/InvoiceOutGlobal.vue | 4 +- src/pages/Login/VerifyEmail.vue | 7 +- src/pages/Order/Card/OrderCatalogFilter.vue | 2 +- src/pages/Order/Card/OrderCatalogItem.vue | 6 +- src/pages/Order/Card/OrderSummary.vue | 2 +- src/pages/Order/OrderCatalog.vue | 2 +- src/pages/Order/OrderLines.vue | 16 ++-- src/pages/Order/OrderList.vue | 2 +- src/pages/Order/OrderVolume.vue | 4 +- src/pages/Route/Cmr/CmrList.vue | 1 + .../Supplier/Card/SupplierConsumption.vue | 2 +- src/pages/Supplier/Card/SupplierContacts.vue | 2 +- src/pages/Supplier/Card/SupplierSummary.vue | 3 +- src/pages/Ticket/Card/TicketDescriptor.vue | 5 +- src/pages/Ticket/Card/TicketSummary.vue | 62 +++++++------- src/pages/Ticket/TicketList.vue | 1 + src/pages/Travel/Card/TravelSummary.vue | 5 +- src/pages/Travel/TravelList.vue | 2 + src/pages/Worker/Card/WorkerSummary.vue | 13 ++- 51 files changed, 304 insertions(+), 304 deletions(-) create mode 100644 src/components/common/VnChip.vue diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 12366e174..c51ed3024 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -106,7 +106,7 @@ const pinnedModulesRef = ref(); width: max-content; } .q-header { - background-color: var(--vn-dark); + background-color: var(--vn-section-color); } diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue index 666f14c72..09bc198f7 100644 --- a/src/components/common/VnBreadcrumbs.vue +++ b/src/components/common/VnBreadcrumbs.vue @@ -71,7 +71,7 @@ function getBreadcrumb(param) { } &--last, &__separator { - color: var(--vn-label); + color: var(--vn-label-color); } } @media (max-width: $breakpoint-md) { diff --git a/src/components/common/VnChip.vue b/src/components/common/VnChip.vue new file mode 100644 index 000000000..dd2de2c64 --- /dev/null +++ b/src/components/common/VnChip.vue @@ -0,0 +1,13 @@ + + diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index 5057c0790..07940274e 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -304,7 +304,7 @@ function parseDms(data) { row-gap: 20px; } .labelColor { - color: var(--vn-label); + color: var(--vn-label-color); } diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index eae391cc4..732f0e964 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -14,6 +14,7 @@ import VnJsonValue from '../common/VnJsonValue.vue'; import FetchData from '../FetchData.vue'; import VnSelectFilter from './VnSelectFilter.vue'; import VnUserLink from '../ui/VnUserLink.vue'; +import VnChip from '../common/VnChip.vue'; const stateStore = useStateStore(); const validationsStore = useValidator(); @@ -443,10 +444,10 @@ setLogTree(); > - - {{ t(modelLog.modelI18n) }} - + :text="t(modelLog.modelI18n)" + dense="dense" + /> #{{ modelLog.id }} @@ -819,7 +820,7 @@ setLogTree(); diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue index ceb24b2bb..d45eef103 100644 --- a/src/components/ui/VnSms.vue +++ b/src/components/ui/VnSms.vue @@ -4,6 +4,7 @@ import { date } from 'quasar'; import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnAvatar from '../ui/VnAvatar.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue'; +import VnChip from '../common/VnChip.vue'; const $props = defineProps({ url: { type: String, default: null }, @@ -89,15 +90,14 @@ function formatNumber(number) { ) }} - - {{ row.sms.status }} - + :text="row.sms.status" + /> diff --git a/src/css/app.scss b/src/css/app.scss index 459a7f2dc..7d8a29920 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -2,29 +2,24 @@ @import './icons.scss'; body.body--light { - --fount-color: black; - --vn-sectionColor: #ffffff; - --vn-pageColor: #e0e0e0; - background-color: var(--vn-pageColor); + --font-color: black; + --vn-section-color: #e0e0e0; + --vn-page-color: #ffffff; + background-color: #ffffff; .q-header .q-toolbar { - color: var(--fount-color); + color: var(--font-color); } - --vn-text: var(--fount-color); - --vn-gray: var(--vn-sectionColor); - --vn-label: #5f5f5f; - --vn-dark: var(--vn-sectionColor); - --vn-light-gray: #e7e3e3; + --vn-text-color: var(--font-color); + --vn-label-color: #5f5f5f; + --vn-accent-color: #e7e3e3; } body.body--dark { - --vn-pageColor: #222; - --vn-SectionColor: #403c3c; - background-color: var(--vn-pageColor); - --vn-text: white; - --vn-gray: var(--vn-SectionColor); - --vn-label: #a8a8a8; - --vn-dark: var(--vn-SectionColor); - --vn-light-gray: #424242; + --vn-section-color: #403c3c; + background-color: #222; + --vn-text-color: white; + --vn-label-color: #a8a8a8; + --vn-accent-color: #424242; } a { @@ -59,19 +54,23 @@ a { // Removes chrome autofill background input:-webkit-autofill, select:-webkit-autofill { - color: var(--vn-text); + color: var(--vn-text-color); font-family: $typography-font-family; - -webkit-text-fill-color: var(--vn-text); + -webkit-text-fill-color: var(--vn-text-color); -webkit-background-clip: text !important; background-clip: text !important; } .bg-vn-dark { - background-color: var(--vn-dark); + background-color: var(--vn-section-color); +} + +.bg-vn-dark { + background-color: var(--vn-section-color); } .color-vn-text { - color: var(--vn-text); + color: var(--vn-text-color); } .color-vn-white { @@ -79,8 +78,8 @@ select:-webkit-autofill { } .vn-card { - background-color: var(--vn-gray); - color: var(--vn-text); + background-color: var(--vn-section-color); + color: var(--vn-text-color); border-radius: 8px; } @@ -90,11 +89,11 @@ select:-webkit-autofill { } .bg-vn-primary-row { - background-color: var(--vn-dark); + background-color: var(--vn-section-color); } .bg-vn-secondary-row { - background-color: var(--vn-light-gray); + background-color: var(--vn-accent-color); } /* Estilo para el asterisco en campos requeridos */ diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index b70e3e8d0..8423a9a35 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -14,10 +14,10 @@ // Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors $primary: #ec8916; $secondary: $primary; -$positive: #21ba45; -$negative: #c10015; -$info: #31ccec; -$warning: #f2c037; +$positive: #c8e484; +$negative: #fb5252; +$info: #84d0e2; +$warning: #f4b974; // Pendiente de cuadrar con la base de datos $success: $positive; $alert: $negative; diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index b5b9aae99..968f1e294 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -107,7 +107,11 @@ onMounted(async () => {