diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 4dd04bbb..3e46b6c6 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -74,7 +74,7 @@
diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index cf42c9e3..62a67bd3 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1227,7 +1227,7 @@ diff --git a/src/components/CMyActivities/CMyActivities.ts b/src/components/CMyActivities/CMyActivities.ts index 260e40bb..9f7d6d22 100755 --- a/src/components/CMyActivities/CMyActivities.ts +++ b/src/components/CMyActivities/CMyActivities.ts @@ -41,7 +41,7 @@ export default defineComponent({ }, props: { }, - setup() { + setup(props) { const userStore = useUserStore() const globalStore = useGlobalStore() const $route = useRoute() @@ -173,6 +173,13 @@ export default defineComponent({ return username === userStore.my.username } + function getlinkpage() { + if (myuser.value) + return self.location.host + '/attivita/' + myuser.value.username + else + return '' + } + onMounted(mounted) return { @@ -204,6 +211,7 @@ export default defineComponent({ site, listcircuitsfiltered, optionsMainCards, + getlinkpage, } } }) diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index a7e0da81..34c6fbf8 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -80,7 +80,7 @@

- + - + + + diff --git a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue index ea17cbf6..12a48960 100644 --- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue +++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue @@ -95,7 +95,7 @@
diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue index b1b36437..a3d7a453 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue @@ -79,7 +79,7 @@
diff --git a/src/components/CMyCardPopup/CMyCardPopup.ts b/src/components/CMyCardPopup/CMyCardPopup.ts index 73c525c3..7f1eb3b8 100644 --- a/src/components/CMyCardPopup/CMyCardPopup.ts +++ b/src/components/CMyCardPopup/CMyCardPopup.ts @@ -87,8 +87,11 @@ export default defineComponent({ load() } + function getlinkpage() { + return self.location.host + tools.getPathByTable(props.table, myrec.value._id) + } function condividipag() { - const mystr = self.location.host + tools.getPathByTable(props.table, myrec.value._id) + const mystr = getlinkpage() tools.copyStringToClipboard($q, mystr, true) tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr) return true @@ -120,6 +123,7 @@ export default defineComponent({ col, condividipag, showBadge, + getlinkpage, } } }) diff --git a/src/components/CMyCardPopup/CMyCardPopup.vue b/src/components/CMyCardPopup/CMyCardPopup.vue index ca7b1054..fe189308 100644 --- a/src/components/CMyCardPopup/CMyCardPopup.vue +++ b/src/components/CMyCardPopup/CMyCardPopup.vue @@ -112,11 +112,24 @@
+ + +

diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index acfe1605..c336e9d8 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -486,7 +486,7 @@
- + - {{ labelextra }} - {{ contact.name }} {{ contact.surname }} ({{ contact.username }}) + {{ labelextra }} + {{ contact.name }} + {{ contact.surname }} + ({{ contact.username }}) - {{ contact.username }} ({{ contact.name }} {{ contact.surname }}) + {{ contact.username }} + ({{ contact.name }} {{ contact.surname }}) - {{ $t('db.reporteduser', {date_report: tools.getstrDateTimeShort(contact.date_report)}) }} - {{ contact.profile.qualifica }} + {{ + $t('db.reporteduser', { + date_report: tools.getstrDateTimeShort(contact.date_report), + }) + }} + {{ contact.profile.qualifica }} - {{ labelFooter }} + {{ labelFooter }} - - - - - - {{ $t('friends.remove_from_myfriends') }} + + + + + + {{ + $t('handshake.accept_handshake') + }} - - {{ $t('friends.block_user') }} + + + + + {{ + $t('friends.remove_from_myfriends') + }} + + + + + + + + {{ + $t('friends.block_user') + }} + + + + + + + + {{ + $t('friends.report_user') + }} @@ -69,14 +174,43 @@ - - {{ $t('friends.accept_friend') }} + + {{ + $t('friends.accept_friend') + }} - - {{ $t('friends.reject_ask_friend') }} + + {{ + $t('friends.reject_ask_friend') + }} @@ -88,8 +222,22 @@ - - {{ $t('friends.accept_handshake') }} + + {{ + $t('friends.accept_handshake') + }} @@ -101,10 +249,13 @@ - - + - + {{ $t('groups.accept_group') }} @@ -112,70 +263,136 @@ - + - + {{ $t('shared.refuse_ask') }} - + - + - {{ $t('shared.cancel_ask_short') }} + {{ + $t('shared.cancel_ask_short') + }} - + - + - + {{ $t('groups.addasadmin') }} - + - + - {{ $t('groups.remove_as_admin') }} + {{ + $t('groups.remove_as_admin') + }} - + - + - {{ $t('groups.remove_from_mygroups') }} + {{ + $t('groups.remove_from_mygroups') + }} - + - + - {{ $t('friends.report_user') }} + {{ + $t('friends.report_user') + }} - + - - + - + {{ $t('circuit.accept') }} @@ -183,55 +400,127 @@ - + - + {{ $t('shared.refuse_ask') }} - + - + - {{ $t('shared.cancel_ask_short') }} + {{ + $t('shared.cancel_ask_short') + }} - + - + - + - {{ $t('circuit.addasadmin') }} + {{ + $t('circuit.addasadmin') + }} - + - + - {{ $t('circuit.remove_as_admin') }} + {{ + $t('circuit.remove_as_admin') + }} - + - + - {{ $t('circuit.remove_from_mycircuit') }} + {{ + $t('circuit.remove_from_mycircuit') + }} - + - + - {{ $t('friends.report_user') }} + {{ + $t('friends.report_user') + }} @@ -243,9 +532,24 @@ - - {{ $t('friends.cancel_ask_friend') }} + + {{ + $t('friends.cancel_ask_friend') + }} @@ -254,12 +558,34 @@ - + - + @@ -267,77 +593,218 @@ - - {{ $t('friends.ask_friend') }} + + {{ + $t('friends.ask_friend') + }} - - {{ $t('handshake.ask_handshake') }} + + {{ + $t('handshake.ask_handshake') + }} - - {{ $t('friends.reject_trust') }} + + {{ + $t('friends.reject_trust') + }} - + - - + - + - + - {{ $t('friends.ask_friend') }} + {{ + $t('friends.ask_friend') + }} - + - + - {{ $t('friends.cancel_ask_friend') }} + {{ + $t('friends.cancel_ask_friend') + }} - + - + - {{ $t('friends.remove_from_myfriends') }} + {{ + $t('friends.remove_from_myfriends') + }} - + - + - {{ $t('handshake.ask_handshake') }} + {{ + $t('handshake.ask_handshake') + }} - + - + - {{ $t('handshake.remove_from_myhandshake') }} + {{ + $t('handshake.remove_from_myhandshake') + }} - + - + - {{ $t('friends.report_user') }} + {{ + $t('friends.report_user') + }} @@ -349,9 +816,23 @@ - - {{ $t('friends.accept_trust') }} + + {{ + $t('friends.accept_trust') + }} @@ -367,7 +848,6 @@ :circuitname="circuitname" @close="showsendCoinTo = false" > -
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index dd41a49a..39a741a8 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -507,7 +507,7 @@ const msg_it = { click_per_copiare: 'Cliccaci sopra per copiarlo sugli appunti', invitante: 'Ti ha invitato qualcuno a far parte di RISO?', link_reg: 'Clicca per copiare il link da condividere agli Amici', - link_reg_and_msg: 'Condividi Link ad Amici', + link_reg_and_msg: 'Copia Link Registrazione', copia_messaggio: 'Copia Messaggio', teleg_torna_sul_bot: '1) Copia il codice cliccando sul bottone qui sopra
2) torna su {botname} cliccando qui sotto 👇 ed incolla (o scrivi) il codice', teleg_checkcode: 'Codice Telegram', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 6aabbd87..212b896d 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -4479,6 +4479,10 @@ export const tools = { }, + copyToClip(myq: any, mystr: string, show: boolean) { + this.copyStringToClipboard(myq, mystr, show) + }, + copyStringToClipboardSilent(mystr: string) { copyToClipboard(mystr) @@ -6983,6 +6987,7 @@ export const tools = { }, async sendMsgTelegramCmd($q: any, $t: any, cmd: number, showmsgsent: boolean, text?: string, title?: string) { + const userStore = useUserStore() let mydata: IMsgGlobParam = { typemsg: 0, @@ -6998,8 +7003,12 @@ export const tools = { showmsgsent = false } - return this.sendMsgTelegram($q, $t, mydata, showmsgsent) + if (cmd === shared_consts.CmdToSend.SHARE_MSGREG) { + const link = userStore.getRefLink(userStore.my.username) + tools.copyStringToClipboard($q, link, true) + } + return this.sendMsgTelegram($q, $t, mydata, showmsgsent) }, getFieldSearchByTable(mytable: string, tablejoin: string, field: string) { diff --git a/src/views/user/myfriends/myfriends.ts b/src/views/user/myfriends/myfriends.ts index ccdee44a..ea8e88d3 100755 --- a/src/views/user/myfriends/myfriends.ts +++ b/src/views/user/myfriends/myfriends.ts @@ -117,6 +117,7 @@ export default defineComponent({ 'profile.img': 1, 'profile.born_city_id': 1, 'profile.qualifica': 1, + 'profile.handshake': 1, reported: 1, date_report: 1, username_who_report: 1, @@ -143,6 +144,7 @@ export default defineComponent({ date_report: 1, username_who_report: 1, 'profile.born_city_id': 1, + 'profile.handshake': 1, } }, diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue index 9e49a26e..e6a3caa9 100755 --- a/src/views/user/myprofile/myprofile.vue +++ b/src/views/user/myprofile/myprofile.vue @@ -284,7 +284,7 @@ >
-
+
@@ -585,6 +590,7 @@ ) " icon="fas fa-user-minus" + dense :label="$t('friends.cancel_ask_friend_short')" @click=" tools.cancelReqFriends(