diff --git a/package.json b/package.json index 8bfeb9e43..beae0b7b9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0", "@vue/test-utils": "^2.4.4", "autoprefixer": "^10.4.14", - "cypress": "^12.13.0", + "cypress": "^13.6.6", "eslint": "^8.41.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-cypress": "^2.13.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 07896c006..f3fe7df55 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -59,8 +59,8 @@ devDependencies: specifier: ^10.4.14 version: 10.4.17(postcss@8.4.35) cypress: - specifier: ^12.13.0 - version: 12.17.4 + specifier: ^13.6.6 + version: 13.6.6 eslint: specifier: ^8.41.0 version: 8.56.0 @@ -124,8 +124,8 @@ packages: resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} dev: true - /@cypress/request@2.88.12: - resolution: {integrity: sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==} + /@cypress/request@3.0.1: + resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==} engines: {node: '>= 6'} dependencies: aws-sign2: 0.7.0 @@ -1228,10 +1228,6 @@ packages: '@types/node': 20.11.19 dev: false - /@types/node@16.18.82: - resolution: {integrity: sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q==} - dev: true - /@types/node@20.11.19: resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} dependencies: @@ -2248,15 +2244,14 @@ packages: /csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - /cypress@12.17.4: - resolution: {integrity: sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==} - engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0} + /cypress@13.6.6: + resolution: {integrity: sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==} + engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0} hasBin: true requiresBuild: true dependencies: - '@cypress/request': 2.88.12 + '@cypress/request': 3.0.1 '@cypress/xvfb': 1.2.4(supports-color@8.1.1) - '@types/node': 16.18.82 '@types/sinonjs__fake-timers': 8.1.1 '@types/sizzle': 2.3.8 arch: 2.2.0 diff --git a/quasar.config.js b/quasar.config.js index 755e96bd3..2d8289508 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -67,7 +67,7 @@ module.exports = configure(function (/* ctx */) { // analyze: true, // env: {}, rawDefine: { - 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) + 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), }, // ignorePublicFolder: true, // minify: false, @@ -92,7 +92,7 @@ module.exports = configure(function (/* ctx */) { vitePlugins: [ [ VueI18nPlugin({ - runtimeOnly: false + runtimeOnly: false, }), { // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false` @@ -123,9 +123,6 @@ module.exports = configure(function (/* ctx */) { framework: { config: { config: { - brand: { - primary: 'orange', - }, dark: 'auto', }, }, diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 345c8d088..c53193e6f 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -171,6 +171,7 @@ const emit = defineEmits(['onFetch']); diff --git a/src/css/app.scss b/src/css/app.scss index 4fec9db08..c0c523a9f 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,17 +1,58 @@ // app global css in SCSS form @import './icons.scss'; +body.body--light { + --fount-color: black; + --vn-sectionColor: #ffffff; + --vn-pageColor: #e0e0e0; + background-color: var(--vn-pageColor); + .q-header .q-toolbar { + color: var(--fount-color); + } + --vn-text: var(--fount-color); + --vn-gray: var(--vn-sectionColor); + --vn-label: #5f5f5f; + --vn-dark: var(--vn-sectionColor); + --vn-light-gray: #e7e3e3; +} + +body.body--dark { + --vn-pageColor: #222; + --vn-SectionColor: #3c3b3b; + 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; +} + a { text-decoration: none; } .link { - color: $primary; + color: $color-link; cursor: pointer; } +.tx-color-link { + color: $color-link !important; +} + +.header-link { + color: $color-link !important; + cursor: pointer; + border-bottom: solid $primary; + border-width: 2px; + width: 100%; + .q-icon { + float: right; + } +} + .link:hover { - color: $orange-4; + text-decoration: underline; } // Removes chrome autofill background @@ -24,26 +65,6 @@ select:-webkit-autofill { background-clip: text !important; } -body.body--light { - .q-header .q-toolbar { - background-color: $white; - color: #555; - } - --vn-text: #000000; - --vn-gray: #f5f5f5; - --vn-label: #5f5f5f; - --vn-dark: white; - --vn-light-gray: #e7e3e3; -} - -body.body--dark { - --vn-text: #ffffff; - --vn-gray: #313131; - --vn-label: #a8a8a8; - --vn-dark: #292929; - --vn-light-gray: #424242; -} - .bg-vn-dark { background-color: var(--vn-dark); } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 58b202522..b70e3e8d0 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -11,26 +11,32 @@ // It's highly recommended to change the default colors // to match your app's branding. // Tip: Use the "Theme Builder" on Quasar's documentation website. - +// Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors $primary: #ec8916; -$primary-light: lighten($primary, 35%); -$secondary: #26a69a; -$accent: #9c27b0; -$white: #fff; - +$secondary: $primary; $positive: #21ba45; $negative: #c10015; $info: #31ccec; $warning: #f2c037; -$vnColor: #8ebb27; - // Pendiente de cuadrar con la base de datos $success: $positive; $alert: $negative; +$white: #fff; +$dark: #3c3b3b; +// custom +$color-link: #66bfff; +$color-spacer-light: #a3a3a31f; +$color-spacer: #7979794d; +$border-thin-light: 1px solid $color-spacer-light; +$primary-light: lighten($primary, 35%); +$dark-shadow-color: black; +$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d; +$spacing-md: 16px; .bg-success { background-color: $positive; } + .bg-notice { background-color: $info; } @@ -40,12 +46,3 @@ $alert: $negative; .bg-alert { background-color: $negative; } - -$color-spacer-light: rgba(255, 255, 255, 0.12); -$color-spacer: rgba(255, 255, 255, 0.3); -$border-thin-light: 1px solid $color-spacer-light; - -$dark-shadow-color: #000; -$dark: #292929; -$layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); -$spacing-md: 16px; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 7643ef640..3421401bf 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -172,6 +172,7 @@ export default { hasDebt: 'Customer has debt', notChecked: 'Customer not checked', noWebAccess: 'Web access is disabled', + businessTypeFk: 'Business type', }, summary: { basicData: 'Basic data', @@ -437,6 +438,7 @@ export default { shipped: 'Shipped', warehouse: 'Warehouse', customerCard: 'Customer card', + alias: 'Alias', }, boxing: { expedition: 'Expedition', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c22a15b69..4a42b6534 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -171,6 +171,7 @@ export default { hasDebt: 'El cliente tiene riesgo', notChecked: 'El cliente no está comprobado', noWebAccess: 'El acceso web está desactivado', + businessTypeFk: 'Tipo de negocio', }, summary: { basicData: 'Datos básicos', @@ -436,6 +437,7 @@ export default { shipped: 'Enviado', warehouse: 'Almacén', customerCard: 'Ficha del cliente', + alias: 'Alias', }, boxing: { expedition: 'Expedición', diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue index 8e9ab3e41..f66fcff1f 100644 --- a/src/layouts/OutLayout.vue +++ b/src/layouts/OutLayout.vue @@ -40,7 +40,7 @@ const langs = ['en', 'es']; - - - + - + + +