++ su "Friends" la ricerca per username Telegram e nome e cognome

This commit is contained in:
Surya Paolo
2022-12-15 21:57:44 +01:00
parent a5e86926e3
commit b1ec0b6a67
5 changed files with 66 additions and 48 deletions

View File

@@ -304,6 +304,7 @@
<div v-if="tools.isLogged()" class="text-weight-bold text-user">
{{ Username() }}<span v-if="myName()"> - {{ myName() }}</span>
<span v-if="mySurname()">&nbsp;{{ mySurname() }}</span>
</div>
<div class="row justify-evenly q-pa-xs-sm">
<div

View File

@@ -98,7 +98,7 @@ export default defineComponent({
if (path.value) {
circuit.value = null
users_in_circuit.value = []
await userStore.loadCircuit(path.value, idnotif.value).then(({ data, status }: {data: any, status: number}) => {
await userStore.loadCircuit(path.value, idnotif.value).then(({ data, status }: { data: any, status: number }) => {
console.log('data', data)
if (data) {
notifStore.setAsRead(idnotif.value)
@@ -131,9 +131,10 @@ export default defineComponent({
*/
{
$match: {idapp: process.env.APP_ID,
$match: {
idapp: process.env.APP_ID,
'profile.mycircuits': {
$elemMatch: {circuitname: {$eq: circuit.value.name}},
$elemMatch: { circuitname: { $eq: circuit.value.name } },
},
},
},
@@ -142,7 +143,7 @@ export default defineComponent({
$lookup: {
from: 'circuits',
as: 'circuit',
let: {circuitname: circuit.value.name, idapp: '$idapp'},
let: { circuitname: circuit.value.name, idapp: '$idapp' },
pipeline: [
{
$match:
@@ -151,8 +152,8 @@ export default defineComponent({
{
$and:
[
{$eq: ['$name', '$$circuitname']},
{$eq: ['$idapp', '$$idapp']},
{ $eq: ['$name', '$$circuitname'] },
{ $eq: ['$idapp', '$$idapp'] },
],
},
@@ -162,9 +163,14 @@ export default defineComponent({
},
},
{ $unwind: '$circuit'},
{ $unwind: '$circuit' },
{
$project: { username: 1, profile: 1, idapp: 1, 'circuit.name': 1, 'circuit._id': 1 }
$project: {
username: 1,
name: 1,
surname: 1,
profile: 1, idapp: 1, 'circuit.name': 1, 'circuit._id': 1
}
},
@@ -172,7 +178,7 @@ export default defineComponent({
$lookup: {
from: 'accounts',
as: 'account',
let: {username: '$username', idapp: '$idapp', circuitId: '$circuit._id'},
let: { username: '$username', idapp: '$idapp', circuitId: '$circuit._id' },
pipeline: [
{
$match:
@@ -181,9 +187,9 @@ export default defineComponent({
{
$and:
[
{$eq: ['$$username', '$username']},
{$eq: ['$$idapp', '$idapp']},
{$eq: ['$$circuitId', '$circuitId']},
{ $eq: ['$$username', '$username'] },
{ $eq: ['$$idapp', '$idapp'] },
{ $eq: ['$$circuitId', '$circuitId'] },
],
},
},
@@ -191,7 +197,7 @@ export default defineComponent({
],
},
},
{ $unwind: '$account'},
{ $unwind: '$account' },
]
}
arrfilterand.value = []
@@ -236,7 +242,9 @@ export default defineComponent({
lk_as,
af_objId_tab,
lk_proj: {
'username': 1,
username: 1,
name: 1,
surname: 1,
'profile.img': 1,
'profile.mycircuits': 1,
'profile.qualifica': 1,

View File

@@ -113,6 +113,7 @@ export default defineComponent({
lk_proj: {
username: 1,
name: 1,
surname: 1,
'profile.img': 1,
'profile.born_city_id': 1,
'profile.qualifica': 1,

View File

@@ -159,7 +159,9 @@ export default defineComponent({
lk_as,
af_objId_tab,
lk_proj: {
'username': 1,
username: 1,
name: 1,
surname: 1,
'profile.img': 1,
'profile.mygroups': 1,
'profile.qualifica': 1,

View File

@@ -1,9 +1,9 @@
<template>
<div v-if="isDebugOn" class="bg-red text-white">
<div v-if="!!tools.isLogged()">Logged: {{tools.isLogged()}}</div>
<div v-if="!!tools.isUserOk()">UserOk: {{tools.isUserOk()}}</div>
<div v-if="caricato">caricato: {{caricato}}</div>
<div v-if="myuser">myuser: {{myuser.username}}</div>
<div v-if="!!tools.isLogged()">Logged: {{ tools.isLogged() }}</div>
<div v-if="!!tools.isUserOk()">UserOk: {{ tools.isUserOk() }}</div>
<div v-if="caricato">caricato: {{ caricato }}</div>
<div v-if="myuser">myuser: {{ myuser.username }}</div>
</div>
<div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged>
@@ -36,7 +36,6 @@
<div v-if="myuser">
<CNotifAtTop />
<div class="q-gutter-sm q-pa-sm q-pb-md">
<div
v-if="myuser && myuser.date_reg"
class="fit column no-wrap justify-evenly items-center content-start"
@@ -61,7 +60,7 @@
</div>
<div class="last_access">
OnLine: {{tools.timeAgo(myuser.lasttimeonline)}}
OnLine: {{ tools.timeAgo(myuser.lasttimeonline) }}
</div>
<div v-if="myuser.reported">
@@ -75,8 +74,12 @@
<div v-if="site && site.confpages && site.confpages.showNameSurname">
<div class="text-h6">
<span v-if="checkifShow('name') && myuser.name"> {{ myuser.name }}</span>
<span v-if="checkifShow('surname') && myuser.surname">{{ myuser.surname }}</span>
<span v-if="checkifShow('name') && myuser.name">
{{ myuser.name }}</span
>
<span v-if="checkifShow('surname') && myuser.surname"
>&nbsp;{{ myuser.surname }}</span
>
</div>
</div>
<div class="col-12 text-h7 text-blue text-shadow-2">
@@ -249,17 +252,6 @@
/>
</div>
<q-btn
v-if="myuser.username === myusername()"
icon="fas fa-pencil-alt"
:color="$q.dark.isActive ? `black` : `white`"
:text-color="$q.dark.isActive ? `white` : `black`"
size="md"
:label="$t('otherpages.modifprof')"
to="/editprofile"
>
</q-btn>
<div class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
<div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
<q-btn
@@ -417,6 +409,20 @@
>
</CSendCoins>
</div>
<q-page-sticky
v-if="myuser.username === myusername()"
position="top-right"
:offset="[18, 18]"
>
<q-btn
fab
glossy
class="semi-transparent"
icon="fas fa-pencil-alt"
color="primary"
to="/editprofile"
/>
</q-page-sticky>
</div>
<div v-else-if="caricato">
<h2>Utente {{ username }} non trovato</h2>