diff --git a/Dockerfile b/Dockerfile
index b4c00c2d..e5dbcd3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,11 @@
-# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
-FROM debian:bookworm-slim
+FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1
ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
- curl \
- ca-certificates \
- gnupg2
-
# Apache
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
apache2 \
libapache2-mod-php \
&& . /etc/apache2/envvars \
@@ -21,11 +15,6 @@ RUN apt-get install -y --no-install-recommends \
RUN a2dissite 000-default
-# NodeJs
-
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
- && apt-get install -y --no-install-recommends nodejs
-
# Hedera
RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
diff --git a/Jenkinsfile b/Jenkinsfile
index ed52bdc5..8bc98b01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
}
agent {
docker {
- image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn8'
+ image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn9'
registryUrl 'https://registry.verdnatura.es/'
registryCredentialsId 'docker-registry'
}
diff --git a/back/package.json b/back/package.json
index 2459d049..67f9a87f 100644
--- a/back/package.json
+++ b/back/package.json
@@ -1,6 +1,6 @@
{
"name": "hedera-web-back",
- "version": "24.50.16",
+ "version": "25.8.3",
"description": "Verdnatura web page backend",
"license": "GPL-3.0",
"author": "Verdnatura Levante SL"
diff --git a/debian/changelog b/debian/changelog
index 8ca433ba..d912b774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (24.50.16) stable; urgency=low
+hedera-web (25.8.3) stable; urgency=low
* Initial Release.
diff --git a/debian/rules b/debian/rules
index c752a06c..dc695974 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,15 @@
%:
dh $@
-clean:
- npm run clean
+override_dh_clean:
+ pnpm run clean
+ rm -rf build-deps
dh_clean $@
-build:
+override_dh_auto_build:
pnpm install --prefer-offline
pnpm exec quasar build
mkdir -p build-deps
- cp package.json build-deps
- (cd build-deps && npm install --omit=dev --no-audit --prefer-offline)
+ cp package.json pnpm-lock.yaml build-deps
+ (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline)
diff --git a/package.json b/package.json
index 7ef79e86..64004f37 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "hedera-web",
- "version": "24.50.18",
+ "version": "25.8.3",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"productName": "Verdnatura",
diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 3a09fc17..456795a5 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -104,7 +104,6 @@ export default {
Account: 'Compte',
Addresses: 'Adreces'
},
- //
orderLoadedIntoBasket: 'Comanda carregada a la cistella!',
loadAnOrder:
'Si us plau carrega una comanda pendent a la cistella o en comença una de nova',
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index 668ebcf9..3e21b66d 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -116,8 +116,6 @@ export default {
Account: 'Account',
Addresses: 'Addresses'
},
-
- //
orderLoadedIntoBasket: 'Order loaded into basket!',
loadAnOrder: 'Please load a pending order to the cart or start a new one',
at: 'at',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 6cd7f59d..5034ff70 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -113,8 +113,6 @@ export default {
Account: 'Cuenta',
Addresses: 'Direcciones'
},
-
- //
orderLoadedIntoBasket: '¡Pedido cargado en la cesta!',
loadAnOrder:
'Por favor carga un pedido pendiente en la cesta o empieza uno nuevo',
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index 1550c61f..d30dee52 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -49,7 +49,7 @@ export default {
]
},
of: 'de',
- startOrder: 'Lancer commande',
+ startOrder: 'Lancer une commande',
// Sections titles
titles: {
Home: 'Accueil',
@@ -104,8 +104,6 @@ export default {
Account: 'Compte',
Addresses: 'Adresses'
},
-
- //
orderLoadedIntoBasket: 'Commande chargée dans le panier!',
loadAnOrder:
'Veuillez télécharger une commande en attente dans le panier ou en démarrer une nouvelle',
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index ce5a4f5a..39bbe5de 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -104,7 +104,6 @@ export default {
Account: 'Conta',
Addresses: 'Moradas'
},
- //
orderLoadedIntoBasket: 'Pedido carregado na cesta!',
loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo',
at: 'às',
diff --git a/src/pages/Cms/Home.vue b/src/pages/Cms/Home.vue
index 77d7ab25..6ad42b89 100644
--- a/src/pages/Cms/Home.vue
+++ b/src/pages/Cms/Home.vue
@@ -63,3 +63,16 @@ export default {
}
};
+
+
+en-US:
+ startOrder: Start order
+es-ES:
+ startOrder: Empezar pedido
+ca-ES:
+ startOrder: Començar comanda
+fr-FR:
+ startOrder: Lancer une commande
+pt-PT:
+ startOrder: Comece uma encomenda
+
diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue
index a9931ca9..442dfbc9 100644
--- a/src/pages/Cms/HomeView.vue
+++ b/src/pages/Cms/HomeView.vue
@@ -57,7 +57,9 @@ onMounted(async () => await fetchData());
color="accent"
to="/ecomerce/catalog"
>
- {{ $t('startOrder') }}
+ {{ $t('startOrder') }}
+
@@ -99,7 +101,7 @@ es-ES:
ca-ES:
startOrder: Començar comanda
fr-FR:
- startOrder: Lancer commande
+ startOrder: Lancer une commande
pt-PT:
startOrder: Comece uma encomenda
diff --git a/src/stores/app.js b/src/stores/app.js
index a7703e4b..d5183dc8 100644
--- a/src/stores/app.js
+++ b/src/stores/app.js
@@ -59,9 +59,17 @@ export const useAppStore = defineStore('hedera', {
this.menuEssentialLinks = sectionTree;
},
+
async loadConfig() {
- const imageUrl = await jApi.getValue('SELECT url FROM imageConfig');
- this.$patch({ imageUrl });
+ try {
+ const { data } = await api.get('ImageConfigs');
+
+ if (!data) return;
+
+ this.imageUrl = data[0]?.url;
+ } catch (err) {
+ console.error(err);
+ }
},
async init() {
diff --git a/src/stores/user.js b/src/stores/user.js
index 91278afa..97c8d6fe 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -248,11 +248,10 @@ export const useUserStore = defineStore('user', () => {
const fetchUser = async (userType = 'user') => {
try {
- const userData = await jApi.getObject(
- 'SELECT id, nickname, name, lang FROM account.myUser'
- );
- if (userType === 'user') mainUser.value = userData;
- else supplantedUser.value = userData;
+ const userData = await api.get('VnUsers/getCurrentUserData');
+
+ if (userType === 'user') mainUser.value = userData.data;
+ else supplantedUser.value = userData.data;
} catch (error) {
console.error('Error fetching user: ', error);
}