From 86cf158e27eb2b65440a01f6a8c1733c9e3795c3 Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Mon, 14 Feb 2022 10:25:09 +0100 Subject: [PATCH] Non funziona correttamente la richiesta di amicizia dalla ricerca Amici --- .env.development | 2 +- _ALL_SITES/freeplanet.app/.env.development | 2 +- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- _ALL_SITES/insiemesipuo.app/quasar.conf.js | 2 +- .../popolodelnuovomondo.app/.env.development | 2 +- quasar.conf.js | 2 +- src/components/CMyFriends/CMyFriends.ts | 6 +- src/components/CMyFriends/CMyFriends.vue | 57 ++-- src/components/CMyGroup/CMyGroup.ts | 3 + src/components/CMyGroup/CMyGroup.vue | 5 + src/components/CMyGroups/CMyGroups.ts | 3 +- src/components/CMyGroups/CMyGroups.vue | 55 ++-- .../CUserNonVerif/CUserNonVerif.vue | 10 +- src/root/mainview/mainview.vue | 6 +- src/root/mobility/mobility.scss | 0 src/root/mobility/mobility.ts | 66 ++++ src/root/mobility/mobility.vue | 15 + src/root/scuola/scuola.scss | 0 src/root/scuola/scuola.ts | 66 ++++ src/root/scuola/scuola.vue | 15 + src/store/Modules/tools.ts | 7 +- src/store/UserStore.ts | 22 +- src/views/user/myprofile/myprofile.ts | 3 +- src/views/user/myprofile/myprofile.vue | 290 ++++++++++-------- 24 files changed, 439 insertions(+), 202 deletions(-) create mode 100755 src/root/mobility/mobility.scss create mode 100755 src/root/mobility/mobility.ts create mode 100755 src/root/mobility/mobility.vue create mode 100755 src/root/scuola/scuola.scss create mode 100755 src/root/scuola/scuola.ts create mode 100755 src/root/scuola/scuola.vue diff --git a/.env.development b/.env.development index 92271d9b..a79bf494 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.0" +APP_VERSION="0.2.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index e528ab93..270e00e8 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.0" +APP_VERSION="0.2.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 92271d9b..a79bf494 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.0" +APP_VERSION="0.2.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/quasar.conf.js b/_ALL_SITES/insiemesipuo.app/quasar.conf.js index eedeaf4e..3c2e42ee 100755 --- a/_ALL_SITES/insiemesipuo.app/quasar.conf.js +++ b/_ALL_SITES/insiemesipuo.app/quasar.conf.js @@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8082, + port: 8084, open: false, // opens browser window automatically }, diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 0bdba493..9a80b1d5 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.0" +APP_VERSION="0.2.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/quasar.conf.js b/quasar.conf.js index eedeaf4e..3c2e42ee 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8082, + port: 8084, open: false, // opens browser window automatically }, diff --git a/src/components/CMyFriends/CMyFriends.ts b/src/components/CMyFriends/CMyFriends.ts index dd2eb4ef..355c1948 100755 --- a/src/components/CMyFriends/CMyFriends.ts +++ b/src/components/CMyFriends/CMyFriends.ts @@ -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 }] } diff --git a/src/components/CMyFriends/CMyFriends.vue b/src/components/CMyFriends/CMyFriends.vue index baa9b534..b8b08c62 100755 --- a/src/components/CMyFriends/CMyFriends.vue +++ b/src/components/CMyFriends/CMyFriends.vue @@ -1,26 +1,27 @@ diff --git a/src/components/CMyGroup/CMyGroup.ts b/src/components/CMyGroup/CMyGroup.ts index 01429d53..063f3202 100755 --- a/src/components/CMyGroup/CMyGroup.ts +++ b/src/components/CMyGroup/CMyGroup.ts @@ -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, @@ -81,6 +83,7 @@ export default defineComponent({ setCmd, shared_consts, userStore, + tools, $q, } }, diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue index 4e2b069c..48afeee6 100755 --- a/src/components/CMyGroup/CMyGroup.vue +++ b/src/components/CMyGroup/CMyGroup.vue @@ -1,4 +1,5 @@ + diff --git a/src/root/scuola/scuola.scss b/src/root/scuola/scuola.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/root/scuola/scuola.ts b/src/root/scuola/scuola.ts new file mode 100755 index 00000000..8aae7949 --- /dev/null +++ b/src/root/scuola/scuola.ts @@ -0,0 +1,66 @@ +import { + defineComponent, ref, computed, +} from 'vue' + +import { tools } from '@src/store/Modules/tools' +import { CSkill } from '@/components/CSkill' +import { CFinder } from '@/components/CFinder' +import { CDashboard } from '@/components/CDashboard' +import { CTitleBanner } from '@/components/CTitleBanner' +import { CChartMap } from '@src/components/CChartMap' +import { CUserNonVerif } from '@/components/CUserNonVerif' +import { CMapsEsempio } from '@src/components/CMapsEsempio' +import { CVerifyEmail } from '@src/components/CVerifyEmail' +import { CVerifyTelegram } from '@src/components/CVerifyTelegram' +import { useGlobalStore } from '@store/globalStore' +import { useUserStore } from '@store/UserStore' +import { static_data } from '@/db/static_data' +import MixinBase from '@/mixins/mixin-base' +import MixinUsers from '@/mixins/mixin-users' + + +export default defineComponent({ + name: 'work', + components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitleBanner }, + setup() { + const globalStore = useGlobalStore() + const userStore = useUserStore() + const { getValDb } = MixinBase() + const { isEmailVerified, TelegVerificato } = MixinUsers() + + function TelegCode() { + return userStore.my.profile.teleg_checkcode + } + + function openrighttoolbar() { + globalStore.rightDrawerOpen = true + } + + function isLogged() { + return userStore.isLogged + } + function isUserOk() { + return userStore.isUserOk() + } + + function getLinkBotTelegram(): string { + if ( tools.isTest() && !process.env.DEV) { + return getValDb('TELEG_BOT_LINK_TEST', false) + } else{ + return getValDb('TELEG_BOT_LINK', false) + } + } + + return { + tools, + static_data, + isEmailVerified, + TelegCode, + TelegVerificato, + isLogged, + openrighttoolbar, + isUserOk, + getLinkBotTelegram, + } + }, +}) diff --git a/src/root/scuola/scuola.vue b/src/root/scuola/scuola.vue new file mode 100755 index 00000000..02cdb8ae --- /dev/null +++ b/src/root/scuola/scuola.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index fa3e421b..8590394a 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -4881,7 +4881,12 @@ export const tools = { } return '' - } + }, + + isUserOk(){ + const userStore = useUserStore() + return userStore.isUserOk() + }, // getLocale() { diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 2df77ea3..ff0c49f4 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -192,6 +192,13 @@ export const useUserStore = defineStore('UserStore', { return false }, + IsReqFriendByUsername(username: string): boolean { + if (this.my.profile.req_friends) + return this.my.profile.req_friends.findIndex((rec) => rec.username === username) >= 0 + else + return false + }, + IsAskedGroupByGroupname(groupname: string): boolean { if (this.my.profile.asked_groups) return this.my.profile.asked_groups.findIndex((rec: IMyGroup) => rec.groupname === groupname) >= 0 @@ -892,8 +899,12 @@ export const useUserStore = defineStore('UserStore', { } return Api.SendReq('/users/profile', 'POST', data) - .then((res) => { - return res.data + .then((ris) => { + this.my.profile.friends = ris.data.friends.listFriends ? ris.data.friends.listFriends : [] + this.my.profile.req_friends = ris.data.friends.listRequestFriends ? ris.data.friends.listRequestFriends : [] + this.my.profile.asked_friends = ris.data.friends.listSentRequestFriends ? ris.data.friends.listSentRequestFriends : [] + + return ris.data.user }).catch((error) => { return {} }) @@ -930,8 +941,11 @@ export const useUserStore = defineStore('UserStore', { async loadFriends(username: string) { return Api.SendReq('/users/friends', 'POST', null) - .then((res) => { - return res.data + .then((ris) => { + this.my.profile.friends = ris.data.listFriends ? ris.data.listFriends : [] + this.my.profile.req_friends = ris.data.listRequestFriends ? ris.data.listRequestFriends : [] + this.my.profile.asked_friends = ris.data.listSentRequestFriends ? ris.data.listSentRequestFriends : [] + return ris.data }).catch((error) => { return {} }) diff --git a/src/views/user/myprofile/myprofile.ts b/src/views/user/myprofile/myprofile.ts index 7f1ec60c..ebc7b4fe 100755 --- a/src/views/user/myprofile/myprofile.ts +++ b/src/views/user/myprofile/myprofile.ts @@ -4,6 +4,7 @@ import { CProfile } from '@/components/CProfile' import { CCopyBtn } from '@/components/CCopyBtn' import { CSkill } from '@/components/CSkill' import { CDateTime } from '@/components/CDateTime' +import { CUserNonVerif } from '@/components/CUserNonVerif' import { tools } from '@store/Modules/tools' import { computed, defineComponent, onMounted, ref, watch } from 'vue' import { useUserStore } from '@store/UserStore' @@ -21,7 +22,7 @@ import MixinUsers from '@/mixins/mixin-users' export default defineComponent({ name: 'myprofile', - components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn }, + components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif }, props: {}, setup() { const userStore = useUserStore() diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue index 33c638b9..58105e98 100755 --- a/src/views/user/myprofile/myprofile.vue +++ b/src/views/user/myprofile/myprofile.vue @@ -1,162 +1,194 @@