diff --git a/.eslintrc.js b/.eslintrc.js index d2fe165a5..09dc09c1e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -57,6 +57,7 @@ module.exports = { // add your custom rules here rules: { 'prefer-promise-reject-errors': 'off', + 'no-unused-vars': 'warn', // allow debugger during development only 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', diff --git a/cypress.config.js b/cypress.config.js index 59276f815..31aad6a86 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -2,7 +2,7 @@ const { defineConfig } = require('cypress'); module.exports = defineConfig({ e2e: { - baseUrl: 'http://localhost:8080/', + baseUrl: 'http://localhost:9000/', fixturesFolder: 'test/cypress/fixtures', screenshotsFolder: 'test/cypress/screenshots', supportFile: 'test/cypress/support/index.js', diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue index f8d80ac06..0db0af056 100644 --- a/src/components/common/SendEmailDialog.vue +++ b/src/components/common/SendEmailDialog.vue @@ -34,19 +34,26 @@ async function confirm() { - {{ t('sendEmailNotification') }} + {{ + t('Send email notification: Send email notification') + }} - {{ t('notifyAddress') }} + {{ t('The notification will be sent to the following address') }} - + @@ -59,14 +66,7 @@ async function confirm() { -{ - "en": { - "sendEmailNotification": "Send email notification", - "notifyAddress": "The notification will be sent to the following address" - }, - "es": { - "sendEmailNotification": "Enviar notificación por correo", - "notifyAddress": "La notificación se enviará a la siguiente dirección" - } -} + es: + Send email notification: Enviar notificación por correo, + The notification will be sent to the following address: La notificación se enviará a la siguiente dirección diff --git a/src/components/ui/Confirm.vue b/src/components/ui/VnConfirm.vue similarity index 53% rename from src/components/ui/Confirm.vue rename to src/components/ui/VnConfirm.vue index bd261f7b4..1b92477eb 100644 --- a/src/components/ui/Confirm.vue +++ b/src/components/ui/VnConfirm.vue @@ -3,30 +3,42 @@ import { ref } from 'vue'; import { useDialogPluginComponent } from 'quasar'; import { useI18n } from 'vue-i18n'; -const $props = defineProps({ +const { t } = useI18n(); + +const props = defineProps({ + icon: { + type: String, + default: null, + }, question: { type: String, - default: '', + default: null, }, message: { type: String, - default: '', + default: null, }, }); defineEmits(['confirm', ...useDialogPluginComponent.emits]); const { dialogRef, onDialogOK } = useDialogPluginComponent(); -const { t } = useI18n(); -const question = ref($props.question); -const message = ref($props.question); +const question = props.question || t('question'); +const message = props.message || t('message'); const isLoading = ref(false);