From 48f00a940032b2b0c8467ca3b45cecac178a1057 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 7 Apr 2025 09:03:31 +0200
Subject: [PATCH 1/4] Access log view migration

---
 src/pages/Admin/AccessLogView.vue | 58 +++++++++++++++++++------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/pages/Admin/AccessLogView.vue b/src/pages/Admin/AccessLogView.vue
index 45a71af2..47a8f6ed 100644
--- a/src/pages/Admin/AccessLogView.vue
+++ b/src/pages/Admin/AccessLogView.vue
@@ -7,8 +7,7 @@ import VnList from 'src/components/ui/VnList.vue';
 
 import { formatDateTitle } from 'src/lib/filters.js';
 
-const jApi = inject('jApi');
-
+const api = inject('api');
 const route = useRoute();
 
 const accessLogs = ref([]);
@@ -17,15 +16,32 @@ const user = ref(null);
 const getUser = async () => {
     try {
         if (!route.params.id) return;
-        const [data] = await jApi.query(
-            `SELECT u.id, u.name user, u.nickname, u.email, c.phone, r.name role
-            FROM account.user u
-            JOIN account.role r ON r.id = u.role
-            LEFT JOIN vn.client c ON c.id = u.id
-            WHERE u.id = #user`,
-            { user: route.params.id }
-        );
-        user.value = data;
+
+        const filter = {
+            where: { id: route.params.id },
+            include: [
+                {
+                    relation: 'role',
+                    scope: {
+                        fields: ['name']
+                    }
+                },
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['phone']
+                    }
+                }
+            ]
+        };
+        const { data } = await api.get('VnUsers/preview', {
+            params: {
+                filter: JSON.stringify(filter)
+            }
+        });
+
+        if (!data || !data.length) return;
+        user.value = data[0];
     } catch (error) {
         console.error('Error getting user:', error);
     }
@@ -33,16 +49,12 @@ const getUser = async () => {
 
 const getAccessLogs = async () => {
     try {
-        accessLogs.value = await jApi.query(
-            `SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies
-            FROM visitUser u
-            JOIN visitAccess c ON c.id = u.accessFk
-            JOIN visitAgent a ON a.id = c.agentFk
-            WHERE u.userFk = #user
-            ORDER BY u.stamp DESC
-            LIMIT 8`,
-            { user: route.params.id }
-        );
+        const { data } = await api.get('visitUsers/getUserVisits', {
+            params: {
+                userId: route.params.id
+            }
+        });
+        accessLogs.value = data;
     } catch (error) {
         console.error('Error getting access logs:', error);
     }
@@ -68,9 +80,9 @@ onMounted(async () => {
                     {{ user?.nickname }}
                 </span>
                 <span>#{{ user?.id }} - {{ user.user }} </span>
-                <span>{{ user?.role }} </span>
+                <span>{{ user?.role?.name }} </span>
                 <span>{{ user?.email }} </span>
-                <span>{{ user?.phone }} </span>
+                <span>{{ user?.worker?.phone }} </span>
             </template>
         </CardList>
         <VnList :rows="accessLogs">

From 9423bcb2117af9a963f185fd62fe25d25bbef40f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 23 Apr 2025 16:07:47 +0200
Subject: [PATCH 2/4] Remove unused things

---
 src/components/ui/VnSearchBar.vue    | 107 ---------------------------
 src/pages/Cms/HomeView.vue           |   5 +-
 src/pages/Ecomerce/PendingOrders.vue |  62 ++++++++--------
 3 files changed, 32 insertions(+), 142 deletions(-)
 delete mode 100644 src/components/ui/VnSearchBar.vue

diff --git a/src/components/ui/VnSearchBar.vue b/src/components/ui/VnSearchBar.vue
deleted file mode 100644
index 894ee7b8..00000000
--- a/src/components/ui/VnSearchBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<script setup>
-import { onMounted, ref, inject } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
-const props = defineProps({
-    searchFn: {
-        type: Function,
-        default: null
-    },
-    placeholder: {
-        type: String,
-        default: ''
-    },
-    sqlQuery: {
-        type: String,
-        default: null
-    },
-    searchField: {
-        type: String,
-        default: 'search'
-    }
-});
-
-const emit = defineEmits(['onSearch', 'onSearchError']);
-
-const jApi = inject('jApi');
-const { t } = useI18n();
-const router = useRouter();
-const route = useRoute();
-
-const searchTerm = ref('');
-
-const search = async () => {
-    try {
-        let data = null;
-        router.replace({
-            query: searchTerm.value ? { search: searchTerm.value } : {}
-        });
-
-        if (!searchTerm.value) {
-            emit('onSearchError');
-            return;
-        }
-
-        if (props.sqlQuery) {
-            data = await jApi.query(props.sqlQuery, {
-                [props.searchField]: searchTerm.value
-            });
-        } else if (props.searchFn) {
-            data = props.searchFn(searchTerm.value);
-        }
-
-        emit('onSearch', data);
-    } catch (error) {
-        console.error('Error searching:', error);
-        emit('onSearchError');
-    }
-};
-
-onMounted(() => {
-    if (route.query.search) {
-        searchTerm.value = route.query.search;
-        search();
-    }
-});
-</script>
-<template>
-    <VnInput
-        v-model="searchTerm"
-        @keyup.enter="search()"
-        :placeholder="props.placeholder || t('search')"
-        bg-color="white"
-        is-outlined
-        :clearable="false"
-        class="searchbar"
-        data-cy="searchBar"
-    >
-        <template #prepend>
-            <QIcon name="search" class="cursor-pointer" @click="search()" />
-        </template>
-    </VnInput>
-</template>
-
-<style lang="scss" scoped>
-@import 'src/css/responsive';
-
-.searchbar {
-    @include mobile {
-        max-width: 120px;
-    }
-}
-</style>
-<i18n lang="yaml">
-en-US:
-    search: Search
-es-ES:
-    search: Buscar
-ca-ES:
-    search: Cercar
-fr-FR:
-    search: Rechercher
-pt-PT:
-    search: Pesquisar
-</i18n>
diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue
index 7dff6165..25b4188f 100644
--- a/src/pages/Cms/HomeView.vue
+++ b/src/pages/Cms/HomeView.vue
@@ -1,15 +1,14 @@
 <script setup>
 import { ref, onMounted, inject } from 'vue';
-const jApi = inject('jApi');
 const api = inject('api');
 const news = ref([]);
 const showPreview = ref(false);
 const selectedImageSrc = ref('');
 
 const fetchData = async () => {
-  const newsResponse = await api.get('News');
+    const newsResponse = await api.get('News');
 
-  news.value = newsResponse.data;
+    news.value = newsResponse.data;
 };
 
 const showImagePreview = src => {
diff --git a/src/pages/Ecomerce/PendingOrders.vue b/src/pages/Ecomerce/PendingOrders.vue
index a8657174..61a51847 100644
--- a/src/pages/Ecomerce/PendingOrders.vue
+++ b/src/pages/Ecomerce/PendingOrders.vue
@@ -13,7 +13,6 @@ import { useAppStore } from 'stores/app';
 import { storeToRefs } from 'pinia';
 import { onUserId } from 'src/utils/onUserId';
 
-const jApi = inject('jApi');
 const api = inject('api');
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
@@ -25,44 +24,44 @@ const router = useRouter();
 const loading = ref(false);
 const orders = ref([]);
 
-const getOrders = async (clientFk) => {
+const getOrders = async clientFk => {
     try {
         loading.value = true;
 
         const filter = {
-          where: {
-            clientFk,
-            isConfirmed: false,
-            source_app: 'WEB',
-          },
-          include: [
-            {
-              relation: 'address',
-              scope: {
-                fields: ['nickname', 'city'],
-              }
+            where: {
+                clientFk,
+                isConfirmed: false,
+                source_app: 'WEB'
             },
-            {
-              relation: 'agencyMode',
-              scope: {
-                fields: ['description'],
-              }
-            },
-          ],
-          fields: [
-            'id',
-            'landed',
-            'delivery_method_id',
-            'taxableBase',
-            'addressFk',
-            'agencyModeFk'
-          ]
+            include: [
+                {
+                    relation: 'address',
+                    scope: {
+                        fields: ['nickname', 'city']
+                    }
+                },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['description']
+                    }
+                }
+            ],
+            fields: [
+                'id',
+                'landed',
+                'delivery_method_id',
+                'taxableBase',
+                'addressFk',
+                'agencyModeFk'
+            ]
         };
 
         const { data: salixOrders } = await api.get('Orders', {
-          params: {
-            filter: JSON.stringify(filter)
-          }
+            params: {
+                filter: JSON.stringify(filter)
+            }
         });
 
         orders.value = salixOrders;
@@ -89,7 +88,6 @@ const loadOrder = orderId => {
 };
 
 onUserId(getOrders);
-
 </script>
 
 <template>

From 6a405f1bedb2338ae50b88481b2e576630c13706 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 23 Apr 2025 16:20:24 +0200
Subject: [PATCH 3/4] Remove unused home

---
 src/pages/Cms/Home.vue | 78 ------------------------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 src/pages/Cms/Home.vue

diff --git a/src/pages/Cms/Home.vue b/src/pages/Cms/Home.vue
deleted file mode 100644
index 6ad42b89..00000000
--- a/src/pages/Cms/Home.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<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">
-                <QCard>
-                    <QImg :src="`${$app.imageUrl}/news/full/${myNew.image}`">
-                    </QImg>
-                    <QCardSection>
-                        <div class="text-h5">{{ myNew.title }}</div>
-                    </QCardSection>
-                    <QCardSection class="new-body">
-                        <div v-html="myNew.text" />
-                    </QCardSection>
-                </QCard>
-            </div>
-        </div>
-        <QPageSticky>
-            <QBtn
-                fab
-                icon="add_shopping_cart"
-                color="accent"
-                to="/ecomerce/catalog"
-            >
-                <QTooltip>{{ $t('startOrder') }}</QTooltip></QBtn
-            >
-        </QPageSticky>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.new-card {
-    width: 100%;
-
-    @media screen and (min-width: 800px) and (max-width: 1400px) {
-        width: 50%;
-    }
-    @media screen and (min-width: 1401px) and (max-width: 1920px) {
-        width: 33.33%;
-    }
-    @media screen and (min-width: 19021) {
-        width: 25%;
-    }
-}
-.new-body {
-    font-family: 'Open Sans';
-}
-</style>
-
-<script>
-export default {
-    name: 'PageIndex',
-    data() {
-        return {
-            news: []
-        };
-    },
-    async mounted() {
-        this.news = await this.$jApi.query(
-            `SELECT title, text, image, id
-        FROM news
-        ORDER BY priority, created DESC`
-        );
-    }
-};
-</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>

From a94d9da3b16da9657a568aa57089b677770ae96a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 23 Apr 2025 16:26:49 +0200
Subject: [PATCH 4/4] Remove unused import

---
 src/pages/Admin/NewsDetails.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Admin/NewsDetails.vue b/src/pages/Admin/NewsDetails.vue
index 15adb2a6..83f53e40 100644
--- a/src/pages/Admin/NewsDetails.vue
+++ b/src/pages/Admin/NewsDetails.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 
 import VnImg from 'src/components/ui/VnImg.vue';
-import VnForm from 'src/components/common/VnForm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'src/components/common/FormModel.vue';