Non funziona correttamente la richiesta di amicizia dalla ricerca Amici

This commit is contained in:
paoloar77
2022-02-14 10:25:09 +01:00
parent 4683edce53
commit 86cf158e27
24 changed files with 439 additions and 202 deletions

View File

@@ -1,4 +1,5 @@
import { CMyUser } from '@/components/CMyUser'
import { CUserNonVerif } from '@/components/CUserNonVerif'
import { computed, defineComponent, onMounted, PropType, ref, toRef } from 'vue'
import { useUserStore } from '@store/UserStore'
import { useI18n } from '@/boot/i18n'
@@ -11,7 +12,7 @@ import { tools } from '@store/Modules/tools'
export default defineComponent({
name: 'CMyFriends',
components: { CMyUser },
components: { CMyUser, CUserNonVerif },
emits: ['update:modelValue'],
props: {
modelValue: {
@@ -156,9 +157,6 @@ export default defineComponent({
userStore.loadFriends(username.value).then((ris) => {
// console.log('ris', ris)
if (ris) {
userStore.my.profile.friends = ris.listFriends ? ris.listFriends : []
userStore.my.profile.req_friends = ris.listRequestFriends ? ris.listRequestFriends : []
userStore.my.profile.asked_friends = ris.listSentRequestFriends ? ris.listSentRequestFriends : []
listTrusted.value = ris.listTrusted ? ris.listTrusted : []
filtroutente.value = [{ userId: userStore.my._id }]
}

View File

@@ -1,26 +1,27 @@
<template>
<div v-if="finder" class="q-gutter-sm q-pa-sm q-pb-sm">
<q-btn-toggle
:model-value="modelValue"
@update:model-value="updateValue"
class="my-custom-toggle"
no-caps
rounded
unelevated
push
toggle-color="primary"
color="white"
text-color="primary"
:options="myoptions"
/>
</div>
<div v-if="finder" class="">
<div v-if="modelValue === costanti.FIND_PEOPLE">
<slot></slot>
<div v-if="tools.isUserOk()">
<div v-if="finder" class="q-gutter-sm q-pa-sm q-pb-sm">
<q-btn-toggle
:model-value="modelValue"
@update:model-value="updateValue"
class="my-custom-toggle"
no-caps
rounded
unelevated
push
toggle-color="primary"
color="white"
text-color="primary"
:options="myoptions"
/>
</div>
<div v-else>
<q-list>
<div v-if="finder" class="">
<div v-if="modelValue === costanti.FIND_PEOPLE">
<slot></slot>
</div>
<div v-else>
<q-list>
<span v-for="(contact, index) in listfriendsfiltered" :key="index" class="q-my-sm" clickable>
<CMyUser
:mycontact="contact"
@@ -28,11 +29,11 @@
:visu="modelValue">
</CMyUser>
</span>
</q-list>
</q-list>
</div>
</div>
</div>
<div v-else>
<q-list class="width-container">
<div v-else>
<q-list class="width-container">
<span class="q-my-sm" clickable>
<CMyUser
:mycontact="mycontact"
@@ -42,7 +43,11 @@
:labelextra="labelextra">
</CMyUser>
</span>
</q-list>
</q-list>
</div>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</template>

View File

@@ -7,10 +7,12 @@ import { tools } from '@store/Modules/tools'
import { useQuasar } from 'quasar'
import { useI18n } from '@/boot/i18n'
import { useRoute, useRouter } from 'vue-router'
import { CUserNonVerif } from '@/components/CUserNonVerif'
export default defineComponent({
name: 'CMyGroup',
emits: ['setCmd'],
components: {CUserNonVerif},
props: {
mygrp: {
type: Object as PropType<IMyGroup | null>,
@@ -81,6 +83,7 @@ export default defineComponent({
setCmd,
shared_consts,
userStore,
tools,
$q,
}
},

View File

@@ -1,4 +1,5 @@
<template>
<div v-if="tools.isUserOk()">
<div v-if="grp">
<q-item class="q-my-sm" clickable>
<q-item-section avatar @click="naviga(`/grp/` + grp.groupname)">
@@ -85,6 +86,10 @@
</q-item-section>
</q-item>
</div>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</template>
<script lang="ts" src="./CMyGroup.ts">

View File

@@ -7,11 +7,12 @@ import { costanti } from '@costanti'
import { IMyGroup, ISearchList, IUserFields } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { tools } from '@store/Modules/tools'
import { CUserNonVerif } from '@/components/CUserNonVerif'
export default defineComponent({
name: 'CMyGroups',
components: { CMyGroup },
components: { CMyGroup, CUserNonVerif },
emits: ['update:modelValue'],
props: {
modelValue: {

View File

@@ -1,43 +1,48 @@
<template>
<div v-if="finder" class="q-gutter-sm q-pa-sm q-pb-sm">
<q-btn-toggle
:model-value="modelValue"
@update:model-value="updateValue"
class="my-custom-toggle"
no-caps
rounded
unelevated
push
toggle-color="primary"
color="white"
text-color="primary"
:options="myoptions"
/>
</div>
<div v-if="finder" class="">
<div v-if="modelValue === costanti.FIND_GROUP">
<slot></slot>
<div v-if="tools.isUserOk()">
<div v-if="finder" class="q-gutter-sm q-pa-sm q-pb-sm">
<q-btn-toggle
:model-value="modelValue"
@update:model-value="updateValue"
class="my-custom-toggle"
no-caps
rounded
unelevated
push
toggle-color="primary"
color="white"
text-color="primary"
:options="myoptions"
/>
</div>
<div v-else>
<q-list>
<div v-if="finder" class="">
<div v-if="modelValue === costanti.FIND_GROUP">
<slot></slot>
</div>
<div v-else>
<q-list>
<span v-for="(grp, index) in listgroupsfiltered" :key="index" class="q-my-sm" clickable>
<CMyGroup
:mygrp="grp"
:visu="modelValue">
</CMyGroup>
</span>
</q-list>
</q-list>
</div>
</div>
</div>
<div v-else>
<q-list class="width-container">
<div v-else>
<q-list class="width-container">
<span class="q-my-sm" clickable>
<CMyGroup
:mygrp="mygrp"
:visu="visu">
</CMyGroup>
</span>
</q-list>
</q-list>
</div>
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>
</div>
</template>

View File

@@ -1,8 +1,12 @@
<template>
<div class="q-ma-md">
<CTitleBanner title="Verifica">
La verifica è in corso. Ti arriverà un messaggio dal Bot quando sarai abilitato.
</CTitleBanner>
<q-banner inline-actions rounded class="bg-orange text-white">
<template v-slot:avatar>
<q-icon name="info" color="primary" />
</template>
<strong>La verifica è in corso. Ti arriverà un messaggio sul Bot Telegram quando verrai abilitato dal tuo invitante.</strong>
</q-banner>
</div>
</template>