From 44ee68f8c692a7aa24aaa8129656e884e80417c9 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Thu, 21 Mar 2024 22:58:52 +0100
Subject: [PATCH] - sistemato anche il users/profile ed aggiunto
 /users/activities

---
 src/components/CMyActivities/CMyActivities.ts |  4 ++--
 .../CMyActivities/CMyActivities.vue           |  6 +++---
 src/store/UserStore.ts                        | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/components/CMyActivities/CMyActivities.ts b/src/components/CMyActivities/CMyActivities.ts
index aa73d03e..8f59ac31 100755
--- a/src/components/CMyActivities/CMyActivities.ts
+++ b/src/components/CMyActivities/CMyActivities.ts
@@ -98,8 +98,8 @@ export default defineComponent({
 
         // Carica il profilo di quest'utente
         if (username.value) {
-          await userStore.loadUserProfile({ username: username.value, idnotif: idnotif.value }).then((ris) => {
-            console.log('loadUserProfile = ', ris)
+          await userStore.loadUserActivities({ username: username.value, idnotif: idnotif.value }).then((ris) => {
+            // console.log('loadUserProfile = ', ris)
             myuser.value = ris
             if (myuser.value) {
               // filtro_eventi.value = [{ userId: myuser.value._id }, { dateTimeStart: { $gte: today } }]
diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue
index 062aa6e8..6088b87b 100755
--- a/src/components/CMyActivities/CMyActivities.vue
+++ b/src/components/CMyActivities/CMyActivities.vue
@@ -30,7 +30,7 @@
       </div>
       <div class="q-gutter-sm q-pa-sm q-pb-md">
         <div
-          v-if="myuser && myuser.date_reg"
+          v-if="myuser && myuser.lang"
           class="fit column no-wrap justify-evenly items-center content-start"
         >
           <div class="">
@@ -116,7 +116,7 @@
                   :name="card.table"
                 >
                   <q-card class="q-my-md">
-                    <div v-if="card.table === 'mygroups' && tools.isUserOk()">
+                    <div v-if="(card.table === 'mygroups') && tools.isUserOk()">
                       <div class="row text-h6 text-bold">Gruppi:</div>
                       <q-list>
                         <span
@@ -153,7 +153,7 @@
                         </span>
                       </q-list>
                     </div>
-                    <div v-else>
+                    <div v-else-if="card.table !== 'mygroups' || myuser.email">
                       <CSkill
                         :table="card.table"
                         :filtercustom="card.table === 'mybachecas' ? filtro_eventi: filtroutente"
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index c676fa32..3002cefc 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1529,6 +1529,25 @@ export const useUserStore = defineStore('UserStore', {
 
     },
 
+    async loadUserActivities({ username, idnotif }: { username: string, idnotif?: string }) {
+      const data = {
+        username,
+        idnotif
+      }
+
+      return await Api.SendReq('/users/activities', 'POST', data)
+        .then((ris) => {
+          if (this.my.username === ris.data.user.username) {
+            // this.updateDataFr(ris.data.friends)
+          }
+
+          return ris.data.user
+        }).catch((error) => {
+          return {}
+        })
+
+    },
+
     async setUserNotifs(notifs: IUserNotifType[]) {
       const data = {
         notifs