Merge branch 'beta' into taro/pending-orders

Dockerfile

@@ -1,17 +1,11 @@
-# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
+FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1
-FROM debian:bookworm-slim
 
 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 - \

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'
                 }

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"

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (24.50.16) stable; urgency=low
+hedera-web (25.8.3) stable; urgency=low
 
   * Initial Release.
 

debian/rules

@@ -5,14 +5,15 @@
 %:
 	dh $@
 
-clean:
+override_dh_clean:
-	npm run 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
+	cp package.json pnpm-lock.yaml build-deps
-	(cd build-deps && npm install --omit=dev --no-audit --prefer-offline)
+	(cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "hedera-web",
-    "version": "24.50.17",
+    "version": "25.8.3",
     "description": "Verdnatura web page",
     "license": "GPL-3.0",
     "productName": "Verdnatura",
@@ -11,26 +11,22 @@
         "url": "https://git.verdnatura.es/hedera-web"
     },
     "devDependencies": {
-        "@babel/eslint-parser": "^7.13.14",
         "@babel/preset-env": "^7.20.2",
         "@intlify/vue-i18n-loader": "^4.2.0",
         "@quasar/app-webpack": "^3.0.0",
+        "@quasar/babel-preset-app": "^2.0.3",
         "@quasar/cli": "^2.4.1",
         "@quasar/vite-plugin": "^1.8.1",
+        "@vue/eslint-config-prettier": "^10.2.0",
+        "@vue/eslint-config-standard": "^9.0.0",
+        "autoprefixer": "^10.4.20",
         "babel-loader": "^9.2.1",
         "css-loader": "^7.1.2",
         "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
-        "eslint": "^8.57.0",
+        "eslint": "^9.19.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-config-standard": "^17.0.0",
         "eslint-plugin-cypress": "^2.13.3",
-        "eslint-plugin-import": "^2.19.1",
+        "eslint-plugin-vue": "^9.32.0",
-        "eslint-plugin-n": "^15.0.0",
-        "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-promise": "^6.0.0",
-        "eslint-plugin-vue": "^9.27.0",
-        "eslint-webpack-plugin": "^3.1.1",
         "file-loader": "^6.2.0",
         "happy-dom": "^15.11.7",
         "json-loader": "^0.5.7",
@@ -67,7 +63,7 @@
         "test:unit": "vitest",
         "build": "rm -rf dist/ ; quasar build",
         "clean": "rm -rf dist/",
-        "lint": "eslint --ext .js,.vue ./"
+        "lint": "eslint --ext .js,.vue src"
     },
     "browserslist": [
         "last 10 Chrome versions",

src/boot/axios.js

@@ -40,9 +40,9 @@ const onResponseError = error => {
 
         Router.push({ name: 'login' });
         userStore.destroy(false);
-    } else if (!userStore.isLoggedIn) {
-        return Promise.reject(error);
     }
+
+    return Promise.reject(error);
 };
 
 export default boot(({ app }) => {

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',

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',

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',

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',

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',

src/pages/Cms/Home.vue

@@ -63,3 +63,16 @@ 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 une commande
+pt-PT:
+    startOrder: Comece uma encomenda
+</i18n>

src/pages/Cms/HomeView.vue

@@ -57,7 +57,9 @@ onMounted(async () => await fetchData());
                 color="accent"
                 to="/ecomerce/catalog"
             >
-                <QTooltip>{{ $t('startOrder') }}</QTooltip></QBtn
+                <QTooltip class="text-no-wrap">
+                    {{ $t('startOrder') }}
+                </QTooltip></QBtn
             >
         </QPageSticky>
     </div>
@@ -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
 </i18n>

src/stores/app.js

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { jApi } from '@/boot/axios';
+import { jApi, api } from '@/boot/axios';
 import useNotify from '@/composables/useNotify.js';
 import { i18n } from '@/boot/i18n';
 import { useQuasar } from 'quasar';
@@ -56,9 +56,17 @@ export const useAppStore = defineStore('hedera', {
 
             this.menuEssentialLinks = sectionTree;
         },
+
         async loadConfig() {
-            const imageUrl = await jApi.getValue('SELECT url FROM imageConfig');
+            try {
-            this.$patch({ imageUrl });
+                const { data } = await api.get('ImageConfigs');
+
+                if (!data) return;
+
+                this.imageUrl = data[0]?.url;
+            } catch (err) {
+                console.error(err);
+            }
         },
 
         async init() {

src/stores/user.js

@@ -336,6 +336,7 @@ export const useUserStore = defineStore('user', () => {
         logoutSupplantedUser,
         updateUserLang,
         init,
-        $reset
+        $reset,
+        onLogin
     };
 });