0
1
Fork 0

feat: proposal updates

This commit is contained in:
Javier Segarra 2024-11-12 17:42:56 +01:00
parent 484e41e86b
commit f27dd79dcc
11 changed files with 46 additions and 72 deletions

View File

@ -7,12 +7,12 @@ Hedera is the main web page for Verdnatura.
Required dependencies.
- PHP >= 7.0
- Node.js >= 18.0
- Node.js >= 8.0
Launch application for development.
```
$ quasar dev
$ npm run dev
```
Launch project backend.

View File

@ -162,10 +162,7 @@ async function filterHandler(val, update) {
:rules="$attrs.required ? [requiredFieldRule] : null"
virtual-scroll-slice-size="options.length"
>
<template
v-if="isClearable"
#append
>
<template v-if="isClearable" #append>
<QIcon
v-show="value"
name="close"
@ -179,11 +176,7 @@ async function filterHandler(val, update) {
#[slotName]="slotData"
:key="slotName"
>
<slot
:name="slotName"
v-bind="slotData ?? {}"
:key="slotName"
/>
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</QSelect>
</template>

View File

@ -49,7 +49,7 @@ export default {
]
},
of: 'de',
startOrder: 'Començar comanda',
// Sections titles
titles: {
Home: 'Inici',

View File

@ -2,16 +2,6 @@
// so you can safely delete all default props below
export default {
failed: 'Action failed',
success: 'Action was successful',
internalServerError: 'Internal server error',
somethingWentWrong: 'Something went wrong',
loginFailed: 'Login failed',
authenticationRequired: 'Authentication required',
notFound: 'Not found',
today: 'Today',
yesterday: 'Yesterday',
tomorrow: 'Tomorrow',
language: 'Language',
langs: {
en: 'English',
@ -61,7 +51,17 @@ export default {
'Dec'
]
},
startOrder: 'Start order',
failed: 'Action failed',
success: 'Action was successful',
internalServerError: 'Internal server error',
somethingWentWrong: 'Something went wrong',
loginFailed: 'Login failed',
authenticationRequired: 'Authentication required',
notFound: 'Not found',
today: 'Today',
yesterday: 'Yesterday',
tomorrow: 'Tomorrow',
// Sections titles
titles: {
Home: 'Home',

View File

@ -1,14 +1,4 @@
export default {
failed: 'Acción fallida',
success: 'Acción exitosa',
internalServerError: 'Error interno del servidor',
somethingWentWrong: 'Algo salió mal',
loginFailed: 'Usuario o contraseña incorrectos',
authenticationRequired: 'Autenticación requerida',
notFound: 'No encontrado',
today: 'Hoy',
yesterday: 'Ayer',
tomorrow: 'Mañana',
language: 'Idioma',
langs: {
en: 'Inglés',
@ -58,6 +48,16 @@ export default {
'Dic'
]
},
failed: 'Acción fallida',
success: 'Acción exitosa',
internalServerError: 'Error interno del servidor',
somethingWentWrong: 'Algo salió mal',
loginFailed: 'Usuario o contraseña incorrectos',
authenticationRequired: 'Autenticación requerida',
notFound: 'No encontrado',
today: 'Hoy',
yesterday: 'Ayer',
tomorrow: 'Mañana',
// Sections titles
titles: {
@ -128,7 +128,6 @@ export default {
delete: 'Borrar',
confirmDelete: '¿Estás seguro de que quieres borrar la línea?',
emptyList: 'Lista vacía',
orders: 'Pedidos',
order: 'Pedido pendiente',
ticket: 'Pedido',
@ -149,6 +148,7 @@ export default {
remindMe: 'Recuérdame',
logInAsGuest: 'Entrar como invitado',
logIn: 'Iniciar sesión',
logOut: 'Cerrar sesión',
loginMail: "{'info'}{'@'}{'verdnatura.es'}",
loginPhone: '+34 963 242 100',
haveForgottenPassword: '¿Has olvidado tu contraseña?',
@ -161,6 +161,7 @@ export default {
cancel: 'Cancelar',
of: 'de',
modify: 'Modificar',
startOrder: 'Empezar pedido',
shoppingCart: 'Cesta de la compra',
available: 'Disponible',
minQuantity: 'Cantidad mínima',

View File

@ -49,7 +49,7 @@ export default {
]
},
of: 'de',
startOrder: 'Lancer commande',
// Sections titles
titles: {
Home: 'Accueil',

View File

@ -49,6 +49,7 @@ export default {
]
},
of: 'de',
startOrder: 'Comece uma encomenda',
// Sections titles
titles: {
Home: 'Início',

View File

@ -97,7 +97,9 @@ const logoutSupplantedUser = async () => {
alt="_Exit"
@click="logout()"
data-testid="logoutButton"
/>
>
<QTooltip>{{ $t('logOut') }}</QTooltip>
</QBtn>
</div>
<div
v-if="supplantedUser"

View File

@ -20,8 +20,9 @@
icon="add_shopping_cart"
color="accent"
to="/ecomerce/catalog"
:title="$t('startOrder')"
/>
>
<QTooltip>{{ $t('startOrder') }}</QTooltip></QBtn
>
</QPageSticky>
</div>
</template>
@ -62,16 +63,3 @@ export default {
}
};
</script>
<i18n lang="yaml">
en-US:
startOrder: Start order
es-ES:
startOrder: Empezar pedido
ca-ES:
startOrder: Començar comanda
fr-FR:
startOrder: Lancer commande
pt-PT:
startOrder: Comece uma encomenda
</i18n>

View File

@ -20,16 +20,9 @@ onMounted(async () => await fetchData());
<template>
<div style="padding: 0">
<div class="q-pa-sm row items-start">
<div
class="new-card q-pa-sm"
v-for="myNew in news"
:key="myNew.id"
>
<div class="new-card q-pa-sm" v-for="myNew in news" :key="myNew.id">
<QCard>
<VnImg
:id="myNew.image"
storage="news"
/>
<VnImg :id="myNew.image" storage="news" />
<QCardSection>
<div class="text-h5">
@ -37,10 +30,7 @@ onMounted(async () => await fetchData());
</div>
</QCardSection>
<QCardSection class="new-body">
<div
v-html="myNew.text"
class="card-text"
/>
<div v-html="myNew.text" class="card-text" />
</QCardSection>
</QCard>
</div>
@ -51,14 +41,12 @@ onMounted(async () => await fetchData());
icon="add_shopping_cart"
color="accent"
to="/ecomerce/catalog"
:title="$t('startOrder')"
/>
>
<QTooltip>{{ $t('startOrder') }}</QTooltip></QBtn
>
</QPageSticky>
</div>
<QDialog
v-model="showPreview"
@hide="selectedImageSrc = ''"
>
<QDialog v-model="showPreview" @hide="selectedImageSrc = ''">
<QImg :src="selectedImageSrc" />
</QDialog>
</template>

View File

@ -118,8 +118,9 @@ const onConfirmPay = async () => {
icon="add_shopping_cart"
color="accent"
:to="{ name: 'catalog' }"
:title="t('startOrder')"
/>
>
<QTooltip>{{ t('startOrder') }}</QTooltip></QBtn
>
</QPageSticky>
<VnConfirm
v-model="showAmountToPayDialog"