Lista Amici

Richieste di Fiducia
Accettati
Rifiutati

src/views/user/myprofile/myprofile.scss

@@ -11,8 +11,3 @@
   }
 }
 
-.imgprofile{
-  border: 4px solid rgb(29, 118, 13);
-  border-radius: 16px;
-  box-shadow: 0 0 45px rgba(246, 246, 246, 0.2);
-}

src/views/user/myprofile/myprofile.ts

@@ -24,7 +24,7 @@ export default defineComponent({
     const $route = useRoute()
     const { t } = useI18n()
 
-    const username = computed(() => $route.params.username.toString())
+    const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username)
 
     const filtroutente = ref(<any[]>[])
     const showPic = ref(false)
@@ -35,6 +35,10 @@ export default defineComponent({
       return userStore.my.profile
     }
 
+    function myusername() {
+      return userStore.my.username
+    }
+
     function loadProfile() {
       // Carica il profilo di quest'utente
       if (username.value) {
@@ -46,7 +50,7 @@ export default defineComponent({
       }
     }
 
-    watch(() => username, (to: any, from: any) => {
+    watch(() => username.value, (to: any, from: any) => {
       loadProfile()
     })
 
@@ -83,6 +87,7 @@ export default defineComponent({
       getLinkUserTelegram,
       filtroutente,
       showPic,
+      myusername,
     }
   }
 })

src/views/user/myprofile/myprofile.vue

@@ -5,7 +5,7 @@
 
       <div class="">
         <q-avatar size="140px">
-          <img :src="getImgUser()" :alt="username" class="imgprofile" @click="showPic = true">
+          <q-img :src="getImgUser()" :alt="username" img-class="imgprofile" height="140px" @click="showPic = true" />
         </q-avatar>
       </div>
 
@@ -18,13 +18,21 @@
         {{ myuser.username }}
       </div>
       <div class="col-12 text-h7">
-        {{ myuser.profile.born_city }} ({{ myuser.profile.nationality }})
+        <span v-if="myuser.profile.born_city">{{ myuser.profile.born_city }}</span> <span v-if="myuser.profile.nationality">({{ myuser.profile.nationality }})</span>
       </div>
 
       <div class="col-12 text-h8 q-mt-sm">
         {{ myuser.profile.biografia }}
       </div>
 
+      <q-btn
+        v-if="myuser.username === myusername()" icon="fas fa-pencil-alt"
+        color="blue"
+        size="md"
+        :label="$t('otherpages.modifprof')"
+        to="/editprofile">
+      </q-btn>
+
       <div class="col-12 row justify-evenly q-mt-md">
         <q-btn
           v-if="getLinkUserTelegram()" icon="fab fa-telegram"
@@ -34,14 +42,6 @@
           :label="$t('msgs.message')"
           :href="getLinkUserTelegram()" target="__blank">
         </q-btn>
-        <q-btn
-          v-if="false"
-          icon="fab fa-telegram"
-          color="white"
-          text-color="black"
-          size="md"
-          rounded>
-        </q-btn>
 
       </div>
     </div>
@@ -54,16 +54,12 @@
 
         <div class="col-6 text-h6">
           <CDateTime
-            v-if="checkifShow('profile.dateofbirth')"
+            v-if="checkifShow('profile.dateofbirth') && !!myuser.profile.dateofbirth"
             v-model:value="myuser.profile.dateofbirth"
             :label="$t('reg.dateofbirth')"
             :canEdit="false">
           </CDateTime>
 
-          <div v-if="myuser.profile.born_city"
-               class="col-6 text-h7">
-            {{ myuser.profile.born_city }}
-          </div>
         </div>
 
       </div>
@@ -71,7 +67,7 @@
     </CTitleBanner>
 
     <CTitleBanner
-      class="" title="Competenze e Talenti" bgcolor="bg-primary" clcolor="text-white"
+      class="" title="Competenze e Talenti" bgcolor="bg-positive" clcolor="text-white"
       myclass="myshad" :canopen="true">
 
       <CSkill