- Versione 1.0.28

- Bottone "Condividi" permette di creare un post Telegram con l'annuncio selezionato.
- migliorata grafica dell'annuncio.
This commit is contained in:
Surya Paolo
2024-02-27 22:08:16 +01:00
parent f91de26a9a
commit 9b4406c3ae
30 changed files with 673 additions and 298 deletions

View File

@@ -4,21 +4,22 @@
max-width: 450px;
}
.myrow{
.myrow {
display: flex;
@media (max-width: 600px) {
flex-flow: column;
}
}
.qualifica{
.qualifica {
border: solid 2px #4198ef;
border-radius: 1rem;
padding: 5px;
}
.text-bacheca{
.text-bacheca {
margin: 10px;
border: solid 2px #4198ef;
border-radius: 1rem;
@@ -26,7 +27,7 @@
}
.note-bacheca{
.note-bacheca {
border: solid 2px #C10015;
border-radius: 1rem;
padding: 10px;
@@ -39,6 +40,7 @@
max-height: 500px;
max-width: 350px;
@media (max-width: 500px) {
max-height: 500px;
max-width: 400px;
@@ -46,6 +48,7 @@
}
$graytext: #555;
.cal {
color: black;
font-size: 1rem;
@@ -66,9 +69,11 @@ $graytext: #555;
&__hours {
color: blue;
&-title {
color: $graytext;
}
&-content {
font-weight: 400;
}
@@ -81,6 +86,7 @@ $graytext: #555;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;
}
@@ -93,29 +99,34 @@ $graytext: #555;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;;
color: darkblue !important;
;
}
}
&__teacher {
margin-top: 5px;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;;
color: darkblue !important;
;
}
}
&__quota {
margin-top: 5px;
&-title {
color: $graytext;
}
&-content {
}
&-content {}
}
&__img {
@@ -125,3 +136,21 @@ $graytext: #555;
}
}
.badge-favbook {
font-weight: bold;
}
.buttonsfav{
display: flex;
}
.buttonsfav_left{
}
.on-left {
margin-right: 8px !important;
}
.container_butt{
display: flex;
justify-content: space-between;
}

View File

@@ -210,6 +210,8 @@ export default defineComponent({
const mystr = getlinkpage()
tools.copyStringToClipboard($q, mystr, true)
tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
// Apri il BOT RISO
tools.openUrl(tools.getLinkBotTelegram('', ''))
return true
}
@@ -584,6 +586,14 @@ export default defineComponent({
}
}
async function condividi() {
const mystr = "❇️ Ecco l'annuncio da condividere !\nPuoi copiarlo oppure inoltrarlo a chi vuoi.\n\nE\' utile pubblicarlo anche nel gruppo Telegram RISO territoriale o in <a href=\'https://t.me/riso_gruppo/1911\'>RISO RIevoluzione SOlidale</a> (Topic \'Annunci RISO\')\n\n👇🏻👇🏻👇🏻 "
await tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
tools.copyToClip($q, getlinkpage(), true)
await tools.sendMsgAnnuncioToTelegramCmd($q, t, props.table, myrec.value._id)
}
onMounted(mounted)
return {
@@ -631,6 +641,7 @@ export default defineComponent({
searchList,
filter,
extraparams,
condividi,
}
}
})

View File

@@ -1,115 +1,47 @@
<template>
<div v-if="myrec && myrec._id" class="fulldiv">
<div class="q-pa-sm row items-start q-gutter-sm full-height fulldiv">
<q-card class="my-card fulldiv" bordered>
<div class="row items-start q-gutter-xs full-height fulldiv">
<q-card class="my-card fulldiv visudialog padding-bott" bordered>
<CGalleryImages
v-if="myrec.photos.length > 0"
:imgGallery="myrec.photos"
:directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
>
</CGalleryImages>
<div v-else class="text-center">
<img
class="text-center"
:src="tools.getimglogo()"
height="50"
alt="Immagine Logo"
/>
</div>
<q-card-actions align="right">
<div v-if="table === shared_consts.TABLES_MYBACHECAS" class="">
<q-btn
flat
round
color="green"
:icon="
calendarStore.isPartecipero(myrec._id, table)
? 'fas fa-user-check'
: 'far fa-check-circle'
"
@click="EditBookEvent(true)"
>
<q-badge
v-if="myrec.mybookings"
color="primary"
:label="
calendarStore.getNumParticipants(
myrec,
true,
tools.peopleWhere.participants
)
"
floating
transparent
/>
</q-btn>
</div>
<div class="">
<q-btn flat round color="blue" icon="far fa-eye">
<q-badge
v-if="myrec"
color="primary"
:label="myrec.numseen ? myrec.numseen : 0"
floating
transparent
/>
</q-btn>
</div>
<div class="">
<q-btn
flat
round
color="red"
:icon="
userStore.isFavorite(myrec._id, table)
? 'favorite'
: 'far fa-heart'
"
@click="clicca(costanti.TIPOFAVBOOK.FAVORITE, true, '')"
>
<q-badge
v-if="myrec"
color="primary"
:label="myrec.numfav ? myrec.numfav : 0"
floating
transparent
/>
</q-btn>
</div>
<div class="">
<q-btn
flat
round
color="teal"
:icon="
userStore.isBookmarked(myrec._id, table)
? 'bookmark'
: 'far fa-bookmark'
"
@click="clicca(costanti.TIPOFAVBOOK.BOOKMARK, true, '')"
>
<q-badge
v-if="myrec"
color="primary"
:label="myrec.numbook ? myrec.numbook : 0"
floating
transparent
/>
</q-btn>
</div>
<div>
<q-btn
flat
round
color="primary"
icon="share"
@click="tools.copyToClip($q, getlinkpage(), true)"
/>
</div>
<div>
<q-btn flat round icon="fas fa-ellipsis-h">
<div class="absolute-top-right q-mr-sm q-my-md">
<div class="column">
<q-btn flat round icon="fas fa-ellipsis-h" style="z-index: 1">
<q-menu>
<q-list v-if="true" style="min-width: 200px">
<q-item
v-if="myrec.profile && myrec.profile.username_telegram"
clickable
v-close-popup
@click.stop="tools.copyToClip($q, getlinkpage(), true)"
>
<q-item-section avatar>
<q-icon color="blue" name="far fa-comment" />
<q-icon color="blue" name="fas fa-share" />
</q-item-section>
<q-item-section>
{{ $t('reaction.condividi') }}
</q-item-section>
</q-item>
<q-item
v-if="myrec.profile && myrec.profile.username_telegram"
clickable
v-close-popup
>
<q-item-section avatar>
<q-icon color="blue" name="telegram" />
</q-item-section>
<q-item-section>
<a
@@ -120,7 +52,7 @@
)
"
target="_blank"
>{{ $t('dialog.contact') }} -
>{{ $t('dialog.telegram') }} -
{{ tools.getNomeUtenteByRecUser(myrec) }}</a
>
</q-item-section>
@@ -129,7 +61,9 @@
v-if="!nopopup && myrec.myreact"
clickable
v-close-popup
@click="naviga(tools.getPathByTableAndRec(table, myrec))"
@click.stop="
naviga(tools.getPathByTableAndRec(table, myrec))
"
>
<q-item-section avatar>
<q-icon color="blue" name="fas fa-globe" />
@@ -143,7 +77,7 @@
v-if="myrec"
clickable
v-close-popup
@click="
@click.stop="
clicca(
costanti.TIPOFAVBOOK.SEEN,
false,
@@ -168,7 +102,7 @@
v-if="myrec"
clickable
v-close-popup
@click="
@click.stop="
clicca(
costanti.TIPOFAVBOOK.FAVORITE,
false,
@@ -193,7 +127,7 @@
v-if="table === shared_consts.TABLES_MYBACHECAS"
clickable
v-close-popup
@click="
@click.stop="
clicca(
costanti.TIPOFAVBOOK.ATTEND,
false,
@@ -226,7 +160,7 @@
v-if="myrec"
clickable
v-close-popup
@click="
@click.stop="
clicca(
costanti.TIPOFAVBOOK.BOOKMARK,
false,
@@ -250,12 +184,115 @@
</q-list>
</q-menu>
</q-btn>
<q-btn
flat
round
color="blue"
icon="share"
style="z-index: 1"
@click.stop="tools.copyToClip($q, getlinkpage(), true)"
>
</q-btn>
<q-btn
flat
round
color="blue"
icon="far fa-eye"
style="z-index: 1"
>
<q-badge
v-if="myrec"
text-color="primary"
color="white"
class="badge-favbook"
:label="myrec.numseen ? myrec.numseen : 0"
floating
transparent
/>
</q-btn>
<q-btn
style="z-index: 1"
v-if="table === shared_consts.TABLES_MYBACHECAS"
flat
round
color="green"
:icon="
calendarStore.isPartecipero(myrec._id, table)
? 'fas fa-user-check'
: 'far fa-check-circle'
"
@click.stop="EditBookEvent(true)"
>
<q-badge
v-if="myrec.mybookings"
style="z-index: 1"
text-color="primary"
color="white"
class="badge-favbook"
:label="
calendarStore.getNumParticipants(
myrec,
true,
tools.peopleWhere.participants
)
"
floating
transparent
/>
</q-btn>
<q-btn
style="z-index: 1"
flat
round
color="red"
:icon="
userStore.isFavorite(myrec._id, table)
? 'favorite'
: 'far fa-heart'
"
@click.stop="clicca(costanti.TIPOFAVBOOK.FAVORITE, true, '')"
>
<q-badge
v-if="myrec"
text-color="primary"
color="white"
class="badge-favbook"
:label="myrec.numfav ? myrec.numfav : 0"
floating
transparent
/>
</q-btn>
<div class="">
<q-btn
style="z-index: 1"
flat
round
color="teal"
:icon="
userStore.isBookmarked(myrec._id, table)
? 'bookmark'
: 'far fa-bookmark'
"
@click.stop="clicca(costanti.TIPOFAVBOOK.BOOKMARK, true, '')"
>
<q-badge
v-if="myrec"
text-color="primary"
color="white"
class="badge-favbook"
:label="myrec.numbook ? myrec.numbook : 0"
floating
transparent
/>
</q-btn>
</div>
</div>
</q-card-actions>
</div>
<q-separator />
<q-list>
<q-item clickable>
<q-list style="z-index: 5">
<q-item>
<q-item-section avatar>
<div v-if="showBadge()" class="text-center">
<q-chip
@@ -428,7 +465,10 @@
</q-item>
<q-separator />
<q-item-label v-if="myrec.note"
><div v-html="myrec.note" class="clBorderService"></div
><div
v-html="myrec.note"
class="q-my-sm clBorderService clDescrEstesa"
></div
></q-item-label>
<q-item clickable v-if="table === 'mybachecas'">
@@ -694,62 +734,109 @@
<div v-if="table === shared_consts.TABLES_MYBACHECAS" class="q-mb-sm">
&nbsp;
</div>
<div class="row text-shadow q-px-xs"></div>
</q-card>
<div
v-if="(!$q.screen.gt.sm && !nopopup) || true"
class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
class="row absolute-bottom text-shadow custom-caption q-px-xs buttons_bottom"
>
<q-btn
v-if="
(myrec.profile && myrec.profile.username_telegram) ||
myrec.contact_telegram
"
:label="$t('dialog.contact')"
color="primary"
icon="far fa-comment"
target="_blank"
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:href="
myrec.contact_telegram
? tools.getHttpForTelegram(myrec.contact_telegram)
: tools.getHttpForTelegram(myrec.profile.username_telegram)
"
/>
<q-btn
v-if="table === shared_consts.TABLES_MYBACHECAS"
rounded
:color="
calendarStore.isPartecipero(myrec._id, table) ? 'green' : 'grey'
"
:label="$t('event.attend')"
:icon="
calendarStore.isPartecipero(myrec._id, table)
? 'fas fa-user-check'
: 'far fa-check-circle'
"
@click="EditBookEvent(true)"
>
</q-btn>
<q-btn
rounded
outline
class="q-ma-sm"
v-if="isAlreadyBooked() && site.confpages.bookingEvents"
text-color="red"
@click="EditBookEvent(true)"
:label="$t('cal.modifybooking')"
>
</q-btn>
<q-btn
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
v-close-popup
/>
<div class="column">
<div class="row justify-evenly q-my-sm">
<div class="row q-mx-sm">
<q-btn
dense
class="q-mx-xxs"
rounded
:label="
userStore.isFavorite(myrec._id, table)
? $t('reaction.tipiace')
: $t('reaction.mipiace')
"
text-color="red"
color="white"
:icon="
userStore.isFavorite(myrec._id, table)
? 'favorite'
: 'far fa-heart'
"
@click="clicca(costanti.TIPOFAVBOOK.FAVORITE, true, '')"
>
</q-btn>
<q-btn
class="q-mx-xxs"
dense
rounded
:label="$t('reaction.condividi')"
text-color="blue"
color="white"
icon="fas fa-share"
@click="condividi()"
>
</q-btn>
<q-btn
v-if="
(myrec.profile && myrec.profile.username_telegram) ||
myrec.contact_telegram
"
class="q-mx-xxs"
dense
rounded
:label="$t('dialog.scrivi')"
text-color="primary"
color="white"
icon="telegram"
target="_blank"
@click="
tools.openUrl(
myrec.contact_telegram
? tools.getHttpForTelegram(myrec.contact_telegram)
: tools.getHttpForTelegram(
myrec.profile.username_telegram
)
)
"
/>
<q-btn
v-if="table === shared_consts.TABLES_MYBACHECAS"
dense
rounded
:color="
calendarStore.isPartecipero(myrec._id, table)
? 'green'
: 'grey'
"
:label="$t('event.attend')"
:icon="
calendarStore.isPartecipero(myrec._id, table)
? 'fas fa-user-check'
: 'far fa-check-circle'
"
@click="EditBookEvent(true)"
>
</q-btn>
<q-btn
dense
rounded
outline
class="q-ma-sm"
v-if="isAlreadyBooked() && site.confpages.bookingEvents"
text-color="red"
@click="EditBookEvent(true)"
:label="$t('cal.modifybooking')"
>
</q-btn>
</div>
</div>
<div class="row justify-center">
<q-btn
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
v-close-popup
/>
</div>
</div>
</div>
<q-inner-loading
:showing="loading"