surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "nuova veste grafica: myskills, mygoods, mybachecas, myhosps,"

Browse Source 
This reverts commit 6fad472211.
This commit is contained in:
Surya Paolo
2023-04-07 18:24:15 +02:00
parent 6e6e363059
commit 799a8a0e15
75 changed files with 395 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.risosrv
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

BIN
_ALL_SITES/comunitanuovomondo.app/logo_nuovomondo.jpeg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.85"
APP_VERSION="0.5.84"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

1
public/upload
View File

@@ -1 +0,0 @@
/Users/suryapaolo/backups/upload

2
send_pwa_to_production.sh
View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

2
send_spa_to_production.sh
View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

39
src/common/shared_vuejs.ts
View File

@@ -99,7 +99,6 @@ export const shared_consts = {
OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
OPTIONS_SEARCH_USER_ALL_WORDS: 4,
OPTIONS_ADD_COUNT_FAVORITE: 8,
FRIENDSCMD: {
SETTRUST: 121,
@@ -190,7 +189,6 @@ export const shared_consts = {
TABLES_WITH_DATE: ['mybachecas', 'myhosps'],
TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'],
// costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP, VISUTABLE_USER_TABCIRCUIT, VISUTABLE_GROUP_CIRCUIT
VERTIC_SHOW_GRID: [-1, 2, -3, -4, -5, -6],
@@ -1548,41 +1546,4 @@ export const shared_consts = {
return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
},
getProjectForAll(proj_add: string) {
let proj = {
idContribType: 1,
idCity: 1,
pub_to_share: 1,
adType: 1,
photos: 1,
note: 1,
descr: 1,
date_created: 1,
date_updated: 1,
userId: 1,
username: 1,
name: 1,
surname: 1,
lasttimeonline: 1,
comune: 1,
mycities: 1,
'profile.img': 1,
'profile.mygroups': 1,
'profile.mycircuits': 1,
'profile.qualifica': 1,
'profile.resid_province': 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
reported: 1,
date_report: 1,
username_who_report: 1,
};
if (proj_add)
proj = Object.assign({}, proj, proj_add);
return proj;
},
}

2
src/components/CAccomodation/CAccomodation.ts
View File

@@ -68,7 +68,7 @@ export default defineComponent({
})
function created() {
// console.log('created CAccomodation', props.mylist)
console.log('created CAccomodation', props.mylist)
if (isValid(props.mylist)) {
// @ts-ignore
let myarr: any = props.mylist

4
src/components/CAccomodation/CAccomodation.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="">
<div class="bordo_stondato_blu">
<CTitleBanner class="column" title="Tipi di ospitalità"></CTitleBanner>
<div class="">
<q-btn

11
src/components/CFinder/CFinder.ts
View File

@@ -81,7 +81,6 @@ export default defineComponent({
const myoptions = ref(<any>[])
const col = ref(<IColGridTable>{})
/*
@@ -150,7 +149,7 @@ export default defineComponent({
else if (props.table === toolsext.TABUSER)
return userStore.getMypaginationMembers()
else if (shared_consts.TABLES_ORDER_DATE_UPDATED.includes(props.table))
return { sortBy: 'date_updated', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
else if (shared_consts.TABLES_ORDER_DESCR.includes(props.table))
return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
@@ -1160,8 +1159,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -1231,8 +1228,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
dateTimeStart: 1,
@@ -1310,8 +1305,6 @@ export default defineComponent({
preferences: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
photos: 1,
idCity: 1,
pub_to_share: 1,
@@ -1359,8 +1352,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,

1
src/components/CFinder/CFinder.vue
View File

@@ -34,7 +34,6 @@
<CGridTableRec
v-if="searchList.length > 0"
:prop_mytable="table"
:options="tools.optionsTable(table)"
prop_mytitle=""
:prop_mycolumns="col"
:prop_colkey="prop_colkey"

65
src/components/CGalleryImages/CGalleryImages.scss
View File

@@ -1,65 +0,0 @@
$heightBtn: 100%;
$grayshadow: #555;
.text-subtitle-gallery {
font-size: 1rem;
font-weight: 400;
line-height: 1.75rem;
letter-spacing: .00937em;
text-shadow: .1rem .1rem .1rem $grayshadow;
}
@media (max-width: 718px) {
// PER VERSIONE MOBILE
.text-subtitle-gallery {
font-size: 1rem;
}
}
.myimg {
border-radius: 10px !important;
height: 200px;
cursor: pointer;
}
.myimg-modify {
cursor: grab;
}
.barwidth{
width: 250px !important;
}
.q-img {
&__image {
border-radius: 10px !important;
}
}
.my-card-gallery {
width: 100%;
max-width: 300px;
min-width: 200px;
padding: 0.5rem 0.5rem;
height: 350px;
margin: auto;
}
.my-card-gallery-noModif {
width: 100%;
max-width: 300px;
min-width: 200px;
padding: 1rem 1rem;
height: 220px;
}
.my-card-gallery-view {
width: 100px;
height: 100px;
padding: 0.25rem 0.25rem;
margin: auto;
}

40
src/components/CGalleryImages/CGalleryImages.ts
View File

@@ -1,40 +0,0 @@
import { defineComponent, ref, PropType, watch, onMounted, computed } from 'vue'
import { useI18n } from '@src/boot/i18n'
import { useUserStore } from '@store/UserStore'
import { useQuasar } from 'quasar'
import { IGallery, IImgGallery } from 'model'
import { CMyPage } from '@/components/CMyPage'
import { tools } from '@store/Modules/tools'
import { useGlobalStore } from '@store/globalStore'
import { costanti } from '@costanti'
export default defineComponent({
name: 'CGalleryImages',
props: {
imgGallery: {
type: Object as PropType<IImgGallery[] | string | undefined | null>,
required: true,
},
directory: {
type: String,
required: true,
}
},
components: { CMyPage },
setup(props, { emit }) {
const $q = useQuasar()
const { t } = useI18n()
const userStore = useUserStore()
const globalStore = useGlobalStore()
const slide = ref(0)
const autoplay = ref(5000)
return {
tools,
costanti,
slide,
autoplay,
}
}
})

30
src/components/CGalleryImages/CGalleryImages.vue
View File

@@ -1,30 +0,0 @@
<template>
<q-carousel
swipeable
animated
:autoplay="autoplay"
transition-prev="slide-right"
transition-next="slide-left"
@mouseenter="autoplay = false"
@mouseleave="autoplay = 5000"
:arrows="imgGallery.length > 1"
v-model="slide"
:thumbnails="imgGallery.length > 1"
infinite
>
<q-carousel-slide
v-for="(myimg, index) in imgGallery"
:name="index"
:key="index"
:img-src="directory + '/' + myimg.imagefile"
>
</q-carousel-slide>
</q-carousel>
</template>
<script lang="ts" src="./CGalleryImages.ts">
</script>
<style lang="scss" scoped>
@import './CGalleryImages.scss';
</style>

1
src/components/CGalleryImages/index.ts
View File

@@ -1 +0,0 @@
export {default as CGalleryImages} from './CGalleryImages.vue'

3
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -36,7 +36,6 @@ import { costanti } from '@costanti'
import translate from '@/globalroutines/util'
import { toolsext } from '@store/Modules/toolsext'
import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CMyCardGood } from '@/components/CMyCardGood'
import { CMyCardService } from '@/components/CMyCardService'
import { CMyCardGrpPopup } from '@/components/CMyCardGrpPopup'
import { CMyCardCircuitPopup } from '@/components/CMyCardCircuitPopup'
@@ -289,7 +288,7 @@ export default defineComponent({
components: {
CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
CMyRecCircuitCard, CMyCardService, CMyCardGood
CMyRecCircuitCard, CMyCardService
},
setup(props, { emit }) {
const $q = useQuasar()

7
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -1088,7 +1088,6 @@
<q-dialog
v-model="visupagedialog"
@hide="hidewindow"
class="q-ma-sm"
:maximized="$q.screen.lt.sm"
>
@@ -1107,12 +1106,6 @@
<CMyCardService v-else-if="mytable === 'myskills'"
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardService v-else-if="mytable === 'mygoods'"
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardService v-else-if="mytable === 'myhosps'"
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">
</CMyCardPopup>
</q-dialog>

25
src/components/CMyActivities/CMyActivities.ts
View File

@@ -24,7 +24,7 @@ import { useI18n } from '@/boot/i18n'
import { toolsext } from '@store/Modules/toolsext'
import { useQuasar } from 'quasar'
import { costanti } from '@costanti'
import { IBookmark, ICircuit, IFavorite, IMyCircuit, IMyGroup, IUserFields } from 'model'
import { ICircuit, IMyCircuit, IMyGroup, IUserFields } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { static_data } from '@/db/static_data'
import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -53,7 +53,6 @@ export default defineComponent({
const { getRefLink } = MixinUsers()
const animation = ref('fade')
const mytab = ref('my')
const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username)
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
@@ -181,25 +180,6 @@ export default defineComponent({
return ''
}
function filtrofavorite(table: string) {
const tab = tools.getNumTabByTable(table)
if (myuser.value && myuser.value.profile.favorite) {
let arrfav = myuser.value.profile.favorite.filter((rec: IBookmark) => rec.tab === tab)
if (arrfav)
return myuser.value.profile.favorite ? [{ _id: { $in: arrfav.map((rec: any) => rec.id) } }] : []
}
return []
}
function filtrobookmark(table: string) {
const tab = tools.getNumTabByTable(table)
if (myuser.value && myuser.value.profile.bookmark) {
let arrfav = myuser.value.profile.bookmark.filter((rec: IBookmark) => rec.tab === tab)
if (arrfav)
return myuser.value.profile.bookmark ? [{ _id: { $in: arrfav.map((rec: any) => rec.id) } }] : []
}
return []
}
onMounted(mounted)
return {
@@ -214,8 +194,6 @@ export default defineComponent({
getLinkUserTelegram,
getLinkWebSite,
filtroutente,
filtrofavorite,
filtrobookmark,
showPic,
myusername,
userStore,
@@ -234,7 +212,6 @@ export default defineComponent({
listcircuitsfiltered,
optionsMainCards,
getlinkpage,
mytab,
}
}
})

69
src/components/CMyActivities/CMyActivities.vue
View File

@@ -91,31 +91,7 @@
myclass="myshad"
:canopen="true"
>
<q-tabs
v-model="mytab"
inline-label
dense
class="text-black shadow-2"
>
<q-tab name="my" icon="far fa-user" />
<q-tab name="favorite" icon="far fa-heart" />
<q-tab name="bookmark" icon="far fa-bookmark" />
</q-tabs>
<q-tab-panels
v-model="mytab"
animated
swipeable
vertical
transition-prev="jump-up"
transition-next="jump-up"
>
<q-tab-panel name="my">
<div
v-for="(card, ind) of mycards"
:key="ind"
:name="card.table"
>
<div v-for="(card, ind) of mycards" :key="ind" :name="card.table">
<q-card class="q-my-md">
<div v-if="card.table === 'mygroups'">
<q-list>
@@ -164,49 +140,6 @@
</div>
</q-card>
</div>
</q-tab-panel>
<q-tab-panel name="favorite">
<div
v-for="(card, ind) of mycards"
:key="ind"
:name="card.table"
>
<q-card class="q-my-md">
<div v-if="card.showfavorite && filtrofavorite(card.table)">
<CSkill
:table="card.table"
:filtercustom="filtrofavorite(card.table)"
:butt_modif_new="false"
:visuinpage="true"
:noaut="false"
:title="card.title"
/>
</div>
</q-card>
</div>
</q-tab-panel>
<q-tab-panel name="bookmark">
<div
v-for="(card, ind) of mycards"
:key="ind"
:name="card.table"
>
<q-card class="q-my-md">
<div v-if="card.showfavorite && filtrobookmark(card.table)">
<CSkill
:table="card.table"
:filtercustom="filtrobookmark(card.table)"
:butt_modif_new="isMyRecord(myuser.username)"
:visuinpage="true"
:noaut="true"
:title="card.title"
/>
</div>
</q-card>
</div>
</q-tab-panel>
</q-tab-panels>
</CTitleBanner>
</div>
</div>

2
src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts
View File

@@ -61,7 +61,7 @@ export default defineComponent({
function load() {
// Carica il profilo di quest'utente
if (props.idRec) {
if (props.idRec && props.idRec > 0) {
userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
myrec.value = ris
notifStore.setAsRead(idnotif.value)

127
src/components/CMyCardGood/CMyCardGood.scss
View File

@@ -1,127 +0,0 @@
.profile {
width: 100%;
margin: 0 auto;
max-width: 450px;
}
.myrow{
display: flex;
@media (max-width: 600px) {
flex-flow: column;
}
}
.qualifica{
border: solid 2px #4198ef;
border-radius: 1rem;
padding: 5px;
}
.text-bacheca{
margin: 10px;
border: solid 2px #4198ef;
border-radius: 1rem;
padding: 10px;
}
.note-bacheca{
border: solid 2px #C10015;
border-radius: 1rem;
padding: 10px;
}
.img {
margin-left: auto;
margin-right: auto;
max-height: 500px;
max-width: 350px;
@media (max-width: 500px) {
max-height: 500px;
max-width: 400px;
}
}
$graytext: #555;
.cal {
color: black;
font-size: 1rem;
font-weight: 400;
line-height: 1.25rem;
letter-spacing: 0.03333em;
&__title {
color: white;
font-weight: 700;
font-size: 1rem;
padding-bottom: 10px;
}
&__details {
color: black;
}
&__hours {
color: blue;
&-title {
color: $graytext;
}
&-content {
font-weight: 400;
}
}
&__where {
margin-top: 5px;
color: blue;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;
}
}
&__when {
margin-top: 5px;
color: blue;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;;
}
}
&__teacher {
margin-top: 5px;
&-title {
color: $graytext;
}
&-content {
color: darkblue !important;;
}
}
&__quota {
margin-top: 5px;
&-title {
color: $graytext;
}
&-content {
}
}
&__img {
width: 100px;
height: 100px;
padding: 10px;
}
}

136
src/components/CMyCardGood/CMyCardGood.ts
View File

@@ -1,136 +0,0 @@
import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue'
import { CMyFieldDb } from '@/components/CMyFieldDb'
import { CTitleBanner } from '@/components/CTitleBanner'
import { CProfile } from '@/components/CProfile'
import { CDateTime } from '@/components/CDateTime'
import { CMyPage } from '@/components/CMyPage'
import { CMyFieldRec } from '@/components/CMyFieldRec'
import { CMyUser } from '@/components/CMyUser'
import { CGalleryImages } from '@/components/CGalleryImages'
import { CAccomodation } from '@/components/CAccomodation'
import { tools } from '@store/Modules/tools'
import { useUserStore } from '@store/UserStore'
import { useCalendarStore } from '@store/CalendarStore'
import { useGlobalStore } from '@store/globalStore'
import { useI18n } from '@/boot/i18n'
import { toolsext } from '@store/Modules/toolsext'
import { useQuasar } from 'quasar'
import { costanti } from '@costanti'
import { IColGridTable, IImgGallery, IUserFields } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
import { useRoute } from 'vue-router'
import { useNotifStore } from '@store/NotifStore'
export default defineComponent({
name: 'CMyCardGood',
components: { CProfile, CTitleBanner,
CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
CMyUser, CGalleryImages },
props: {
table: {
type: String,
required: true,
},
prop_myrec: {
type: Object as PropType<any>,
required: false,
default: null,
},
idRec: {
type: Number,
required: false,
default: 0
},
nopopup: {
type: Boolean,
required: false,
default: false
},
},
setup(props) {
const userStore = useUserStore()
const calendarStore = useCalendarStore()
const notifStore = useNotifStore()
const globalStore = useGlobalStore()
const $q = useQuasar()
const $route = useRoute()
const { t } = useI18n()
const showPic = ref(false)
const myrec = ref(<any>{})
const col = ref(<IColGridTable>{})
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
function profile() {
return userStore.my.profile
}
function load() {
// Carica il profilo di quest'utente
if (props.idRec) {
userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
myrec.value = ris
notifStore.setAsRead(idnotif.value)
})
} else {
myrec.value = props.prop_myrec
}
col.value = fieldsTable.getArrColsByTable(props.table)
}
watch(() => props.idRec, (to: any, from: any) => {
load()
})
function mounted() {
load()
}
function getlinkpage() {
return self.location.host + tools.getPathByTable(props.table, myrec.value._id)
}
function condividipag() {
const mystr = getlinkpage()
tools.copyStringToClipboard($q, mystr, true)
tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
return true
}
function showBadge() {
if (shared_consts.TABLES_SHOW_ADTYPE.includes(props.table)) {
return true
}
return false
}
onMounted(mounted)
return {
profile,
tools,
costanti,
myrec,
shared_consts,
globalStore,
showPic,
userStore,
t,
fieldsTable,
colCitys,
toolsext,
col,
condividipag,
showBadge,
getlinkpage,
calendarStore,
}
}
})

252
src/components/CMyCardGood/CMyCardGood.vue
View File

@@ -1,252 +0,0 @@
<template>
<div v-if="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>
<CGalleryImages
v-if="myrec.photos.length > 0"
:imgGallery="myrec.photos"
:directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
>
</CGalleryImages>
<q-card-actions align="right">
<q-btn
flat
round
:color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
icon="favorite"
@click="
userStore.setFavorite($q, t, myrec._id, toolsext.TABMYGOODS)
"
/>
<q-btn
flat
round
:color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
icon="bookmark"
@click="
userStore.setBookmark($q, t, myrec._id, toolsext.TABMYGOODS)
"
/>
<q-btn
flat
round
color="primary"
icon="share"
@click="tools.copyToClip($q, getlinkpage(), true)"
/>
</q-card-actions>
<q-separator />
<q-list>
<q-item clickable>
<q-item-section avatar>
<div v-if="showBadge()" class="text-center">
<q-chip
dense
:color="fieldsTable.getColByAdType(myrec.adType)"
text-color="white"
>{{
fieldsTable.getValByTabAndId(table, 'adType', myrec.adType)
}}
</q-chip>
</div>
</q-item-section>
<q-item-section>
<q-item-label class="text-bold text-h7">{{
myrec.descr
}}</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section avatar>
<q-icon color="blue" name="category" />
</q-item-section>
<q-item-section>
<q-item-label>
<q-chip
v-if="myrec.sectorGood && myrec.sectorGood[0].descr"
class="glossy"
color="blue"
text-color="white"
dense
>
<span class="cal__quota-content">{{
myrec.sectorGood[0].descr
}}</span>
</q-chip>
<q-chip
v-if="myrec.recGood.length > 0 && myrec.recGood[0].descr"
class="glossy"
dense
color="blue"
text-color="white"
>
<span class="cal__quota-content">{{
myrec.recGood[0].descr
}}</span>
</q-chip>
</q-item-label>
</q-item-section>
</q-item>
<q-item-label v-if="myrec.note"
><div v-html="myrec.note" class="clBorderService"></div
></q-item-label>
<q-card class="my-card clBorderUser" bordered>
<CMyUser
:mycontact="myrec"
:visu="costanti.FIND_PEOPLE"
@setCmd="tools.setCmd"
>
</CMyUser>
</q-card>
<q-item v-if="myrec.mycities[0].comune">
<q-item-section avatar>
<q-icon color="amber" name="fas fa-map-marker-alt" />
</q-item-section>
<q-item-section>
<q-item-label>
<span v-for="(city, index) in myrec.mycities" :key="index">
<span v-if="city.comune">
{{ city.comune }} ({{ city.prov }})</span
><span v-if="myrec.mycities.length > 1"> - </span>
</span>
</q-item-label>
<q-item-label v-if="myrec.profile.qualifica" caption>{{
myrec.biografia
}}</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-if="myrec.website">
<q-item-section avatar>
<q-icon color="blue" name="fas fa-globe" />
</q-item-section>
<q-item-section>
<q-item-label lines="1">
<span v-html="tools.getlinkhref(myrec.website, 'Visita il Sito Web')"
/></q-item-label>
</q-item-section>
</q-item>
<q-item v-if="myrec.idContribType && myrec.idContribType.length > 0">
<q-item-section avatar>
<q-icon color="green" name="fas fa-hand-holding" />
</q-item-section>
<q-item-section>
<q-item-label>
<span
v-for="(reccontr, index) in myrec.idContribType"
:key="index"
>
<q-chip
dense
:color="calendarStore.getColByContribType(reccontr)"
text-color="white"
>
{{ calendarStore.getContribtypeById(reccontr) }}
</q-chip>
</span>
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section avatar>
<q-icon color="blue" name="far fa-edit" />
</q-item-section>
<q-item-section>
<q-item-label
><span v-if="myrec.date_updated">{{
tools.getstrDateMonthLong(myrec.date_updated)
}}</span
><span v-else>{{
tools.getstrDateMonthLong(myrec.date_created)
}}</span></q-item-label
>
</q-item-section>
</q-item>
<q-item clickable v-if="false">
<q-item-section avatar>
<q-icon color="red" name="local_gas_station" />
</q-item-section>
<q-item-section>
<q-item-label></q-item-label>
<q-item-label caption>Fill your gas tank.</q-item-label>
</q-item-section>
</q-item>
</q-list>
<q-separator />
<div class="q-mb-xl"></div>
<q-card-actions
v-if="$q.screen.gt.sm"
class="text-center justify-center"
>
<q-btn
v-if="myrec.profile.username_telegram"
:label="$t('dialog.contact')"
color="primary"
icon="far fa-comment"
target="_blank"
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:href="
tools.isUserOk()
? tools.getHttpForTelegram(myrec.profile.username_telegram)
: null
"
/>
<q-btn
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
v-close-popup
/>
</q-card-actions>
</q-card>
<div
v-if="!$q.screen.gt.sm"
class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
>
<q-btn
v-if="myrec.profile.username_telegram"
:label="$t('dialog.contact')"
color="primary"
icon="far fa-comment"
target="_blank"
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:href="
tools.isUserOk()
? tools.getHttpForTelegram(myrec.profile.username_telegram)
: null
"
/>
<q-btn
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
v-close-popup
/>
</div>
</div>
</div>
</template>
<script lang="ts" src="./CMyCardGood.ts">
</script>
<style lang="scss" scoped>
@import './CMyCardGood.scss';
</style>

1
src/components/CMyCardGood/index.ts
View File

@@ -1 +0,0 @@
export { default as CMyCardGood } from './CMyCardGood.vue'

2
src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts
View File

@@ -61,7 +61,7 @@ export default defineComponent({
function load() {
// Carica il profilo di quest'utente
if (props.idRec) {
if (props.idRec && props.idRec > 0) {
userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
myrec.value = ris
notifStore.setAsRead(idnotif.value)

70
src/components/CMyCardService/CMyCardService.ts
View File

@@ -5,10 +5,8 @@ import { CTitleBanner } from '@/components/CTitleBanner'
import { CProfile } from '@/components/CProfile'
import { CDateTime } from '@/components/CDateTime'
import { CMyPage } from '@/components/CMyPage'
import { CMyChipList } from '@/components/CMyChipList'
import { CMyFieldRec } from '@/components/CMyFieldRec'
import { CMyUser } from '@/components/CMyUser'
import { CGalleryImages } from '@/components/CGalleryImages'
import { CAccomodation } from '@/components/CAccomodation'
import { tools } from '@store/Modules/tools'
import { useUserStore } from '@store/UserStore'
@@ -21,16 +19,14 @@ import { costanti } from '@costanti'
import { IColGridTable, IImgGallery, IUserFields } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
import { useRoute, useRouter } from 'vue-router'
import { useRoute } from 'vue-router'
import { useNotifStore } from '@store/NotifStore'
export default defineComponent({
name: 'CMyCardService',
components: {
CProfile, CTitleBanner,
components: { CProfile, CTitleBanner,
CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
CMyUser, CGalleryImages, CMyChipList
},
CMyUser },
props: {
table: {
type: String,
@@ -64,10 +60,6 @@ export default defineComponent({
const showPic = ref(false)
const $router = useRouter()
const usersList = ref({ show: false, title: '', list: [] })
const myrec = ref(<any>{})
const col = ref(<IColGridTable>{})
@@ -79,7 +71,7 @@ export default defineComponent({
function load() {
// Carica il profilo di quest'utente
if (props.idRec) {
if (props.idRec > 0) {
userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
myrec.value = ris
notifStore.setAsRead(idnotif.value)
@@ -118,54 +110,6 @@ export default defineComponent({
return false
}
function getRecGoodSkillByRec(rec: any) {
if (props.table === 'myskills')
return rec.recSkill
else if (props.table === 'mygoods')
return rec.recGood
return null
}
function getSectorByRec(rec: any) {
if (props.table === 'myskills')
return rec.sector
else if (props.table === 'mygoods')
return rec.sectorGood
return null
}
function clicca(tipo: any, set: any, title: string) {
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
}
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
}
if (!set) {
usersList.value.show = true;
usersList.value.title = title;
usersList.value.list = myrec.value.myfav;
}
}
function naviga(path: string) {
$router.push(path)
}
function getTypeHosps() {
let obj = null
if (myrec.value.typeHosp) {
obj = globalStore.getRecordByTableSingle(toolsext.TABTYPEHOSP, myrec.value.typeHosp)
if (obj)
return obj.label
}
return obj
}
onMounted(mounted)
return {
@@ -186,12 +130,6 @@ export default defineComponent({
showBadge,
getlinkpage,
calendarStore,
getSectorByRec,
getRecGoodSkillByRec,
usersList,
clicca,
naviga,
getTypeHosps,
}
}
})

413
src/components/CMyCardService/CMyCardService.vue
View File

@@ -1,50 +1,16 @@
<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>
<CGalleryImages
<div v-if="myrec._id">
<div class="q-pa-sm row items-start q-gutter-sm">
<q-card class="my-card" bordered>
<q-img
v-if="myrec.photos.length > 0"
:imgGallery="myrec.photos"
:directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
>
</CGalleryImages>
:src="myrec.photos[0].imagefile"
class="imgautosize"
:alt="myrec.descr">
</q-img>
<q-card-actions align="right">
<div class="">
<q-btn
flat
round
:color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
icon="favorite"
@click="clicca(costanti.TIPOFAVBOOK.FAVORITE, true)"
>
<q-badge
v-if="myrec.myfav"
color="primary"
:label="myrec.myfav.length"
floating
transparent
/>
</q-btn>
</div>
<div class="">
<q-btn
flat
round
:color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
icon="bookmark"
@click="clicca(costanti.TIPOFAVBOOK.BOOKMARK, true)"
>
<q-badge
v-if="myrec.mybook"
color="primary"
:label="myrec.mybook.length"
floating
transparent
/>
</q-btn>
</div>
<div>
<q-btn flat round :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''" icon="favorite" @click="userStore.setFavorite($q, t, myrec._id, shared_consts.TABMYSKILLS)" />
<q-btn flat round :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''" icon="bookmark" @click="userStore.setBookmark($q, t, myrec._id, shared_consts.TABMYSKILLS)"/>
<q-btn
flat
round
@@ -52,65 +18,6 @@
icon="share"
@click="tools.copyToClip($q, getlinkpage(), true)"
/>
</div>
<div>
<q-btn flat round icon="fas fa-ellipsis-h">
<q-menu>
<q-list v-if="true" style="min-width: 150px">
<q-item
v-if="!nopopup"
clickable
v-close-popup
@click="naviga(tools.getPathByTableAndRec(table, myrec))"
>
<q-item-section avatar>
<q-icon color="blue" name="fas fa-globe" />
</q-item-section>
<q-item-section>
{{ $t('event.openpage') }}
</q-item-section>
</q-item>
<q-separator />
<q-item
clickable
v-close-popup
@click="
clicca(
costanti.TIPOFAVBOOK.FAVORITE,
false,
$t('cmd.favorite')
)
"
>
<q-item-section avatar>
<q-icon color="red" name="favorite" />
</q-item-section>
<q-item-section>
{{ $t('cmd.favorite') }}
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="
clicca(
costanti.TIPOFAVBOOK.BOOKMARK,
false,
$t('cmd.bookmark')
)
"
>
<q-item-section avatar>
<q-icon color="teal" name="bookmark" />
</q-item-section>
<q-item-section>
{{ $t('cmd.bookmark') }}
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</div>
</q-card-actions>
<q-separator />
@@ -130,19 +37,12 @@
</q-item-section>
<q-item-section>
<q-item-label v-if="myrec.typeHosp" class="text-bold text-h7">
<q-chip dense color="green" text-color="white"
>{{ getTypeHosps() }}
</q-chip>
</q-item-label>
<q-item-label class="text-bold text-h7">{{
myrec.descr
}}</q-item-label>
</q-item-section>
</q-item>
<q-item v-if="getSectorByRec(myrec)">
<q-item>
<q-item-section avatar>
<q-icon color="blue" name="category" />
</q-item-section>
@@ -150,88 +50,30 @@
<q-item-section>
<q-item-label>
<q-chip
v-if="getSectorByRec(myrec) && getSectorByRec(myrec)[0].descr"
v-if="myrec.sector && myrec.sector[0].descr"
class="glossy"
color="blue"
text-color="white"
dense
>
<span class="cal__quota-content">{{
getSectorByRec(myrec)[0].descr
myrec.sector[0].descr
}}</span>
</q-chip>
<q-chip
v-if="
getRecGoodSkillByRec(myrec) &&
getRecGoodSkillByRec(myrec).length > 0 &&
getRecGoodSkillByRec(myrec)[0].descr
"
v-if="myrec.recSkill.length > 0 && myrec.recSkill[0].descr"
class="glossy"
dense
color="blue"
text-color="white"
>
<span class="cal__quota-content">{{
getRecGoodSkillByRec(myrec)[0].descr
myrec.recSkill[0].descr
}}</span>
</q-chip>
</q-item-label>
</q-item-section>
</q-item>
<q-item v-if="myrec.numMaxPeopleHosp" class="q-mt-sm">
<q-item-section avatar>
<q-icon color="blue" name="fas fa-users" />
</q-item-section>
<q-item-section>
<q-item-label class="q-px-xs q-ma-xs">
<span class="accom_maxosp">{{ myrec.numMaxPeopleHosp }}</span
>{{ t('hosps.numMaxPeopleHosp') }}
</q-item-label>
</q-item-section>
</q-item>
<q-item v-if="!!myrec.accomodation && myrec.accomodation.length > 0">
<q-item-section avatar>
<q-icon color="orange" name="fas fa-bed" />
</q-item-section>
<q-item-section>
<q-item-label>
<CAccomodation
v-if="!!myrec.accomodation"
:mylist="myrec.accomodation"
:isInModif="false"
:edit="false"
:canModify="false"
>
</CAccomodation>
</q-item-label>
</q-item-section>
</q-item>
<q-item v-if="!!myrec.preferences && myrec.preferences.length > 0">
<q-item-section avatar>
<q-icon color="red" name="fas fa-asterisk" />
</q-item-section>
<q-item-section>
<q-item-label>
<CMyChipList
:rec="myrec"
:type="costanti.FieldType.multiselect"
:value="myrec.preferences"
:options="
globalStore.getTableJoinByName(
toolsext.TABPREF,
false,
false,
null
)
"
:optval="fieldsTable.getKeyByTable(toolsext.TABPREF)"
:optlab="fieldsTable.getLabelByTable(toolsext.TABPREF)"
:opticon="fieldsTable.getIconByTable(toolsext.TABPREF)"
></CMyChipList>
</q-item-label>
</q-item-section>
</q-item>
<q-separator />
<q-item-label v-if="myrec.note"
><div v-html="myrec.note" class="clBorderService"></div
></q-item-label>
@@ -267,26 +109,7 @@
</q-item-section>
<q-item-section>
<q-item-label lines="1">
<span
v-html="
tools.getlinkhref(myrec.website, 'Visita il Sito Web')
"
/></q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-if="myrec.link_maplocation">
<q-item-section avatar>
<q-icon color="blue" name="fas fa-map-marker-alt" />
</q-item-section>
<q-item-section>
<q-item-label lines="1">
<span
v-html="
tools.getlinkhref(myrec.link_maplocation, 'Apri Mappa')
"
/></q-item-label>
<q-item-label>{{ myrec.website }}</q-item-label>
</q-item-section>
</q-item>
<q-item v-if="myrec.idContribType && myrec.idContribType.length > 0">
@@ -339,11 +162,7 @@
</q-item>
</q-list>
<q-separator />
<div class="q-mb-xl"></div>
<q-card-actions
v-if="$q.screen.gt.sm || nopopup"
class="text-center justify-center"
>
<q-card-actions align="center">
<q-btn
v-if="myrec.profile.username_telegram"
:label="$t('dialog.contact')"
@@ -353,14 +172,9 @@
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:href="
tools.isUserOk()
? tools.getHttpForTelegram(myrec.profile.username_telegram)
: null
"
:href="tools.isUserOk() ? tools.getHttpForTelegram(myrec.profile.username_telegram) : null"
/>
<q-btn
v-if="!nopopup"
rounded
outline
:label="$t('dialog.close')"
@@ -370,58 +184,169 @@
/>
</q-card-actions>
</q-card>
<div
v-if="!$q.screen.gt.sm || !nopopup"
class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
</div>
</div>
<q-card class="dialog_card q-mb-lg" v-if="myrec._id && false">
<q-footer
v-if="!nopopup"
:class="
($q.dark.isActive ? `bg-black` : `bg-white`) +
` small-screen-only text-center`
"
bordered
>
<q-btn
v-if="myrec.profile.username_telegram"
:label="$t('dialog.contact')"
color="primary"
icon="far fa-comment"
target="_blank"
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
push
rounded
:href="
tools.isUserOk()
? tools.getHttpForTelegram(myrec.profile.username_telegram)
: null
"
/>
<q-btn
v-if="!nopopup"
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
label="Chiudi"
v-close-popup
></q-btn>
</q-footer>
<q-bar v-if="!nopopup" dense class="bg-primary text-white">
{{ myrec.username }}
<q-space />
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>
<q-card-section class="inset-shadow">
<!-- Per ora visualizzo solo la Prima Immagine -->
<div class="text-center">
<q-img
v-if="tools.getValue(myrec, 'photos', '')"
:src="
tools.getFullFileName(
tools.getValue(myrec, 'photos', ''),
table,
myrec.username,
myrec.groupname
)
"
class="img"
alt="immagine bene"
></q-img>
</div>
<div v-if="showBadge()" class="text-center">
<q-chip
:icon="fieldsTable.getIconByAdType(myrec.adType)"
:color="fieldsTable.getColByAdType(myrec.adType)"
text-color="white"
>{{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
</q-chip>
</div>
<!--:title="t(mycol.label_trans)"-->
<div v-for="(mycol, index) of col" :key="index">
<div
v-if="
mycol.visible &&
tools.checkIfShowField(
mycol,
tools.TIPOVIS_SHOW_RECORD,
false,
tools.getValue(myrec, mycol.field, mycol.subfield)
)
"
>
<div v-if="mycol.fieldtype === costanti.FieldType.html">
<div
class="note-bacheca"
v-html="tools.getValue(myrec, mycol.field, mycol.subfield)"
></div>
</div>
<div v-else-if="mycol.name === 'descr'">
<div class="text-bacheca">
{{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
</div>
</div>
<div v-else-if="mycol.name === 'numMaxPeopleHosp'">
<div class="text-bacheca">
<span class="accom_maxosp">{{
tools.getValue(myrec, mycol.field, mycol.subfield)
}}</span
>{{ t('hosps.numMaxPeopleHosp') }}
</div>
</div>
<div
v-else-if="mycol.name === 'dateTimeStart'"
class="text-center cal"
>
<div v-if="myrec.dateTimeStart" class="cal__when">
<span class="cal__where-title">{{ $t('cal.when') }}:</span>
<span v-html="tools.getstrDateTimeEvent(t, myrec, true)"></span>
</div>
<!--
<span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{
tools.getstrVeryShortDate(myrec.dateTimeStart)
}}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateTimeEnd) }}</span>
</span>--->
</div>
<div v-else-if="mycol.name === 'accomodation'">
<CAccomodation
v-if="!!myrec.accomodation"
:mylist="myrec.accomodation"
:isInModif="false"
:edit="false"
:canModify="false"
>
</CAccomodation>
</div>
<div v-else-if="mycol.name === 'dateTimeEnd'"></div>
<CMyFieldRec
v-else
:table="table"
:id="myrec._id"
:rec="myrec"
:field="mycol.field"
:canEdit="false"
:canModify="false"
>
</CMyFieldRec>
</div>
</div>
<br />
<div v-if="myrec.date_created" class="row justify-center">
<span class="cal__where-title"> {{ $t('reg.pub_created') }}:</span>
<span v-html="tools.getstrDate(myrec.date_created)"></span>
</div>
<div
v-if="
tools.getstrDate(myrec.date_updated) !==
tools.getstrDate(myrec.date_created)
"
class="row justify-center"
>
<span class="cal__where-title"> {{ $t('reg.pub_updated') }}:</span>
<span v-html="tools.getstrDate(myrec.date_updated)"></span>
</div>
<div v-if="!nopopup" class="row q-ma-sm q-pa-sm justify-center">
<div class="q-ma-sm">
<q-btn
icon="far fa-file-alt"
label="Apri"
color="primary"
text-color="white"
:to="tools.getToByCol(col, table, myrec)"
/>
</div>
<div class="q-ma-sm">
<q-btn
v-if="myrec._id"
:text-color="$q.dark.isActive ? `white` : `black`"
icon="fas fa-link"
label="Condividi"
@click="condividipag"
></q-btn>
</div>
</div>
<q-dialog v-model="usersList.show">
<q-card class="dialog_card">
<q-toolbar class="bg-primary text-white">
<q-toolbar-title>
{{ usersList.title }}
</q-toolbar-title>
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-toolbar>
<q-card-section class="inset-shadow">
<div v-for="(rec, i) in usersList.list" :key="i">
<CMyUser
:mycontact="rec"
:visu="costanti.FIND_PEOPLE"
@setCmd="tools.setCmd"
>
</CMyUser>
</div>
<br /><br />
myrec: {{ myrec }}
</q-card-section>
</q-card>
</q-dialog>
</template>
<script lang="ts" src="./CMyCardService.ts">

2
src/components/CMyUser/CMyUser.vue
View File

@@ -43,7 +43,7 @@
<q-item-label v-if="labelFooter" lines="1"
><em>{{ labelFooter }}</em></q-item-label
>
<span v-if="contact.profile && contact.profile.resid_province" class="show_province_title">Prov: <span class="show_province">{{ contact.profile.resid_province }}</span></span>
<span v-if="contact.profile.resid_province" class="show_province_title">Prov: <span class="show_province">{{ contact.profile.resid_province }}</span></span>
<q-item-label v-if="contact.account" caption lines="2">
<CSaldo
:small="true"

12
src/components/CSkill/CSkill.ts
View File

@@ -115,8 +115,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -157,8 +155,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -199,8 +195,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -265,8 +259,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -308,8 +300,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,
@@ -351,8 +341,6 @@ export default defineComponent({
idStatusSkill: 1,
idContribType: 1,
'profile.username_telegram': 1,
'profile.favorite': 1,
'profile.bookmark': 1,
idCity: 1,
pub_to_share: 1,
numLevel: 1,

1
src/components/CSkill/CSkill.vue
View File

@@ -7,7 +7,6 @@
:prop_mytitle="title"
:prop_mycolumns="col"
:prop_colkey="prop_colkey"
:options="tools.optionsTable(table)"
:col_title="col_title"
:col_footer="col_footer"
:vertical="costanti.VISUTABLE_LISTA"

261
src/css/app.scss
View File

@@ -2,18 +2,11 @@ body {
font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #333333;
line-height: 1.5;
//font-size: 1rem;
}
body.body--light {
color: #333333;
}
body.body--dark {
color: #AAAAAA;
}
.text-mycol {
color: #333333 !important;
}
@@ -330,8 +323,8 @@ h3 {
min-width: 250px;
padding: 1rem 1rem;
@media (max-width: 800px) {
max-width: 600px;
@media (max-width: 500px) {
max-width: 400px;
min-width: 250px;
}
@@ -691,7 +684,6 @@ h3 {
font-size: 1rem;
padding: 6px;
}
.clBorderUser {
border-radius: 16px;
font-size: 1rem;
@@ -828,8 +820,7 @@ h3 {
border: solid 2px #49b502;
}
.bordo_stondato_pending,
.bordo_quadrato_pending {
.bordo_stondato_pending, .bordo_quadrato_pending {
margin: 4px;
padding-left: 14px;
padding-right: 14px;
@@ -1026,8 +1017,7 @@ h3 {
place-content: center;
}
.combowidth,
.comboselector {
.combowidth, .comboselector {
min-width: 190px;
@media (max-width: 450px) {
@@ -1399,7 +1389,6 @@ h3 {
.anim_toBottom {
animation: moveToBottom 2s ease-in-out;
}
.anim_toRight {
animation: moveToRight 2s ease-in-out;
}
@@ -1425,15 +1414,13 @@ h3 {
}
.film,
.effect {
.film, .effect {
width: 100%;
height: 100%;
filter: blur(0.45px) drop-shadow(0px 0px 0px #fff1);
}
.film:after,
.effect:after {
.film:after, .effect:after {
content: '';
width: 120%;
height: 100%;
@@ -1470,173 +1457,53 @@ h3 {
}
@keyframes grain {
0%,
100% {
transform: translate(0, 0);
}
10% {
transform: translate(-1%, -1%);
}
20% {
transform: translate(1%, 1%);
}
30% {
transform: translate(-2%, -2%);
}
40% {
transform: translate(3%, 3%);
}
50% {
transform: translate(-3%, -3%);
}
60% {
transform: translate(4%, 4%);
}
70% {
transform: translate(-4%, -4%);
}
80% {
transform: translate(2%, 2%);
}
90% {
transform: translate(-3%, -3%);
}
0%, 100% { transform: translate(0, 0); }
10% { transform: translate(-1%, -1%); }
20% { transform: translate(1%, 1%); }
30% { transform: translate(-2%, -2%); }
40% { transform: translate(3%, 3%); }
50% { transform: translate(-3%, -3%); }
60% { transform: translate(4%, 4%); }
70% { transform: translate(-4%, -4%); }
80% { transform: translate(2%, 2%); }
90% { transform: translate(-3%, -3%); }
}
@keyframes film-scratch {
0%,
100% {
transform: translateX(0);
opacity: 0.5;
}
10% {
transform: translateX(-1%);
}
20% {
transform: translateX(1%);
}
30% {
transform: translateX(-2%);
opacity: 0.75;
}
40% {
transform: translateX(3%);
}
50% {
transform: translateX(-3%);
opacity: 0.5;
}
60% {
transform: translateX(8%);
}
70% {
transform: translateX(-3%);
}
80% {
transform: translateX(10%);
opacity: 0.25;
}
90% {
transform: translateX(-2%);
}
0%, 100% { transform: translateX(0); opacity: 0.5; }
10% { transform: translateX(-1%); }
20% { transform: translateX(1%); }
30% { transform: translateX(-2%); opacity: 0.75; }
40% { transform: translateX(3%); }
50% { transform: translateX(-3%); opacity: 0.5; }
60% { transform: translateX(8%); }
70% { transform: translateX(-3%); }
80% { transform: translateX(10%); opacity: 0.25; }
90% { transform: translateX(-2%); }
}
@keyframes effect-scratch {
0% {
transform: translateX(0);
opacity: 0.75;
}
10% {
transform: translateX(-1%);
}
20% {
transform: translateX(1%);
}
30% {
transform: translateX(-2%);
}
40% {
transform: translateX(3%);
}
50% {
transform: translateX(-3%);
opacity: 0.5;
}
60% {
transform: translateX(8%);
}
70% {
transform: translateX(-3%);
}
80% {
transform: translateX(10%);
opacity: 0.25;
}
90% {
transform: translateX(20%);
}
100% {
transform: translateX(30%);
}
0% { transform: translateX(0); opacity: 0.75; }
10% { transform: translateX(-1%); }
20% { transform: translateX(1%); }
30% { transform: translateX(-2%); }
40% { transform: translateX(3%); }
50% { transform: translateX(-3%); opacity: 0.5; }
60% { transform: translateX(8%); }
70% { transform: translateX(-3%); }
80% { transform: translateX(10%); opacity: 0.25; }
90% { transform: translateX(20%); }
100% { transform: translateX(30%); }
}
/**** OLD FILM EFFECT END ****/
@keyframes zoomImg {
0% {
transform: translate(-75%, 10%) scale(1.5);
opacity: 0.6;
}
20% {
transform: translate(-15%, 10%) scale(1.5);
opacity: 1;
}
50% {
transform: translate(-15%, 25%) scale(1.4);
opacity: 1;
}
80% {
transform: translate(-65%, 25%) scale(1.4);
opacity: 1;
}
100% {
transform: translate(-75%, 10%) scale(1.5);
opacity: 0.6;
}
0% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
20% { transform: translate(-15%, 10%) scale(1.5); opacity: 1; }
50% { transform: translate(-15%, 25%) scale(1.4); opacity: 1; }
80% { transform: translate(-65%, 25%) scale(1.4); opacity: 1; }
100% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
}
.zoomImg {
@@ -1649,28 +1516,24 @@ h3 {
-webkit-animation-duration: calc(var(--animate-duration) * 3);
animation-duration: calc(var(--animate-duration) * 3);
}
.animate__animated.animate__slow4 {
-webkit-animation-duration: calc(1s * 4);
animation-duration: calc(1s * 4);
-webkit-animation-duration: calc(var(--animate-duration) * 4);
animation-duration: calc(var(--animate-duration) * 4);
}
.animate__animated.animate__slow5 {
-webkit-animation-duration: calc(1s * 5);
animation-duration: calc(1s * 5);
-webkit-animation-duration: calc(var(--animate-duration) * 5);
animation-duration: calc(var(--animate-duration) * 5);
}
.animate__animated.animate__slow10 {
-webkit-animation-duration: calc(1s * 10);
animation-duration: calc(1s * 10);
-webkit-animation-duration: calc(var(--animate-duration) * 10);
animation-duration: calc(var(--animate-duration) * 10);
}
.animate__animated.animate__slow20 {
-webkit-animation-duration: calc(1s * 20);
animation-duration: calc(1s * 20);
@@ -1681,19 +1544,15 @@ h3 {
.animate__animated.animate__ease-in-out {
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
}
.animate__animated.animate__linear {
transition-timing-function: linear;
}
.animate__animated.animate__ease-in {
transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
}
.animate__animated.animate__ease-out {
transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
}
.animate__animated.animate__ease {
transition-timing-function: ease;
}
@@ -1730,43 +1589,9 @@ h3 {
text-align: right;
color:#A0A0A0;
}
.show_province{
font-size: 0.85rem;
font-style: italic;
text-align: right;
color: grey;
}
.buttons_bottom {
max-width: 400px;
margin-left: auto;
justify-content: space-around;
margin-right: auto;
text-align: center;
padding-top: 8px;
padding-bottom: 8px;
}
.body--light {
.buttons_bottom {
background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(255, 255, 255, .7)));
background: linear-gradient(180deg, transparent, rgba(255, 255, 255, .7) 15%)
}
}
.body--dark {
.buttons_bottom {
background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6)));
background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%)
}
}
.fulldiv {
min-height: 100% !important;
}
.numfav_text{
text-align: center;
color: grey;
font-size: 0.8rem;
}

5
src/model/UserStore.ts
View File

@@ -67,9 +67,6 @@ export interface IFavorite {
tab: number
}
export interface IFavBook {
username: string
}
export interface IUserProfile {
img?: string
@@ -132,8 +129,6 @@ export interface IUserProfile {
noFoto: boolean
bookmark: IBookmark[]
favorite: IFavorite[]
myfav: IFavBook[]
mybook: IFavBook[]
// in memory
asked_friends: any[]

2
src/statics/lang/it.js
View File

@@ -1488,8 +1488,6 @@ const msg_it = {
favorite_unset: 'Rimosso dai Preferiti',
bookmark_set: 'Aggiunto ai Segnalibri',
bookmark_unset: 'Rimosso dai Segnalibri',
favorite: 'Utenti Favoriti',
bookmark: 'Utenti Segnalibri',
},
},

9
src/store/Modules/costanti.ts
View File

@@ -17,11 +17,6 @@ export const costanti = {
CERCO: 2,
},
TIPOFAVBOOK: {
FAVORITE: 1,
BOOKMARK: 2,
},
ENABLE_FRIENDS: false,
ENABLE_CONTI_COLLETTIVI: true,
@@ -110,7 +105,6 @@ export const costanti = {
table: 'mygoods',
visuonstat: true,
small: false,
showfavorite: true,
},
{
visible: true,
@@ -124,7 +118,6 @@ export const costanti = {
table: 'myskills',
visuonstat: true,
small: false,
showfavorite: true,
},
{
visible: true,
@@ -140,7 +133,6 @@ export const costanti = {
small: false,
table: 'myhosps',
visuonstat: true,
showfavorite: true,
},
{
visible: false,
@@ -194,7 +186,6 @@ export const costanti = {
table: 'mybachecas',
visuonstat: true,
small: false,
showfavorite: true,
},
{
visible: false,

63
src/store/Modules/tools.ts
View File

@@ -12,7 +12,7 @@ import {
ITodo,
IUserFields,
Privacy,
TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam, IUserExport, ISpecialField, IAccount, IMyCircuit, ISendCoin, IMovement, IMovVisu, INotif, IMyElem, IMyCard, ILabelValue, ILabelValueStr, IAnim, ILang, IGroupShort, IPagination, IFavorite, IBookmark,
TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam, IUserExport, ISpecialField, IAccount, IMyCircuit, ISendCoin, IMovement, IMovVisu, INotif, IMyElem, IMyCard, ILabelValue, ILabelValueStr, IAnim, ILang, IGroupShort, IPagination,
} from '@model'
import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -116,19 +116,7 @@ export const tools = {
'teal',
'lime',
'orange',
'deep-orange',
'yellow',
'blue',
'green',
'purple',
'deep-purple',
'indigo',
'light-blue',
'cyan',
'teal',
'lime',
'orange',
'deep-orange',
'deeporange',
'yellow',
],
@@ -4524,16 +4512,7 @@ export const tools = {
},
getlinkhref(mylink: string, text: string) {
if (mylink) {
if (!mylink.startsWith('http')) {
mylink = 'https://' + mylink
}
return '<a href="' + mylink + '" target="_blank">' + text + '</a>'
} else {
return ''
}
},
getNationsByNationality(nat: string) {
@@ -5036,7 +5015,7 @@ export const tools = {
}
let add = ''
if (aportador_solidario) {
add = '?start=inv#' + aportador_solidario + '#ex#' + regexpire
add = '?start=inv_' + aportador_solidario + '_ex_' + regexpire
}
return mylink + add
@@ -7057,7 +7036,6 @@ export const tools = {
},
getPathByTableAndRec(table: string, rec: any) {
if (shared_consts.TABLES_REC_ID.includes(table)) {
return '/' + tools.getDirectoryByTable(table) + '/' + rec['_id']
} else if (table === toolsext.TABMYGROUPS) {
@@ -7779,8 +7757,7 @@ export const tools = {
},
getNumTabByTable(table: string) {
const myrec = shared_consts.MYTABS.find((rec: any) => rec.table === table)
return myrec ? myrec.id : -1
return shared_consts.MYTABS.findIndex((rec: any) => rec.table === table)
},
removeItemOnce(arr: any, value: any) {
@@ -7789,39 +7766,7 @@ export const tools = {
arr.splice(index, 1)
}
return arr;
},
indexOfObject(arr: any, obj: any) {
let l = arr.length, i, k, ok;
for (let i = 0; i < l; i++) {
ok = true;
for (k in obj) if (obj.hasOwnProperty(k)) {
if (arr[i][k] !== obj[k]) {
ok = false;
break;
}
}
if (ok) return i;
}
return -1; // no match
},
removeIObjectOnce(arr: any, obj: IBookmark | IFavorite) {
const index = this.indexOfObject(arr, obj)
if (index > -1) {
arr.splice(index, 1)
}
return arr;
},
optionsTable(table: string) {
if (shared_consts.TABLES_FAVORITE_BOOKMARK.includes(table))
return shared_consts.OPTIONS_ADD_COUNT_FAVORITE
return 0
},
// FINE !

44
src/store/UserStore.ts
View File

@@ -35,7 +35,7 @@ import { Router } from 'vue-router'
import { useProjectStore } from '@store/Projects'
import { shared_consts } from '@/common/shared_vuejs'
import { costanti } from '@costanti'
import { IBookmark, IFavBook, IFavorite, IGroupShort, IMyGroup, IUserAdmins } from '@model/UserStore'
import { IBookmark, IGroupShort, IMyGroup, IUserAdmins } from '@model/UserStore'
import globalroutines from '../globalroutines/index'
import { useNotifStore } from '@store/NotifStore'
@@ -83,8 +83,6 @@ export const DefaultUser: IUserFields = {
notifs: [],
bookmark: [],
favorite: [],
myfav: [],
mybook: [],
notif_idCities: [],
notif_provinces: [],
notif_regions: [],
@@ -152,8 +150,6 @@ export const DefaultProfile: IUserProfile = {
notifs: [],
bookmark: [],
favorite: [],
myfav: [],
mybook: [],
notif_idCities: [],
notif_provinces: [],
notif_regions: [],
@@ -1478,7 +1474,6 @@ export const useUserStore = defineStore('UserStore', {
return Api.SendReq('/myskills/page', 'POST', data)
.then((res) => {
console.log('res.data', res)
return res.data
}).catch((error) => {
return {}
@@ -1497,7 +1492,6 @@ export const useUserStore = defineStore('UserStore', {
.then((res) => {
return res.data
}).catch((error) => {
console.error('err', error)
return {}
})
@@ -1646,28 +1640,19 @@ export const useUserStore = defineStore('UserStore', {
},
async setFavorite($q: any, t: any, id: any, table: string, myrec: any) {
let value = false
async setFavorite($q: any, t: any, id: any, table: string) {
let value = {}
console.log('table', table)
const tab = tools.getNumTabByTable(table)
value = this.isFavorite(id, table) ? false : true
return await Api.SendReq('/users/cmd', 'POST', { cmd: CMD_USER.SET_FAVORITE, id, tab, value })
.then((res) => {
if (res && res.data.state === 1) {
if (!myrec.myfav)
myrec.myfav = []
this.my.profile.favorite.push({ id, tab })
if (myrec)
myrec.myfav.push({ username: this.my.username })
tools.showPositiveNotif($q, t('cmd.favorite_set'))
} else if (res && res.data.state === -1) {
this.my.profile.favorite = tools.removeIObjectOnce(this.my.profile.favorite, { id, tab })
if (myrec && myrec.myfav)
myrec.myfav = myrec.myfav.filter((rec: IFavBook) => rec.username !== this.my.username)
tools.showPositiveNotif($q, t('cmd.favorite_unset'))
this.my.profile.favorite = tools.removeItemOnce(this.my.profile.favorite, { id, tab })
tools.showPositiveNotif($q, t('db.favorite_unset'))
}
}).catch((error) => {
tools.showNegativeNotif($q, t('db.recfailed'))
@@ -1684,34 +1669,23 @@ export const useUserStore = defineStore('UserStore', {
isFavorite(id: string, table: string) {
const tab = tools.getNumTabByTable(table)
const myfavorite = this.my.profile.favorite.find((rec: IFavorite) => ((rec.id === id) && (rec.tab === tab)))
const myfavorite = this.my.profile.favorite.find((rec: IBookmark) => ((rec.id === id) && (rec.tab === tab)))
return myfavorite
},
async setBookmark($q: any, t: any, id: any, table: string, myrec: any) {
let value = false
async setBookmark($q: any, t: any, id: any, table: string) {
let value = {}
const tab = tools.getNumTabByTable(table)
value = this.isBookmarked(id, table) ? false : true
return await Api.SendReq('/users/cmd', 'POST', { cmd: CMD_USER.SET_BOOKMARK, id, tab, value })
.then((res) => {
if (res && res.data.state === 1) {
if (!myrec.mybook)
myrec.mybook = []
this.my.profile.bookmark.push({ id, tab })
if (myrec)
myrec.mybook.push({ username: this.my.username })
tools.showPositiveNotif($q, t('cmd.bookmark_set'))
} else if (res && res.data.state === -1) {
this.my.profile.bookmark = tools.removeIObjectOnce(this.my.profile.bookmark, { id, tab })
if (myrec && myrec.mybook)
myrec.mybook = myrec.mybook.filter((rec: IFavBook) => rec.username !== this.my.username)
tools.showPositiveNotif($q, t('cmd.bookmark_unset'))
tools.showPositiveNotif($q, t('db.bookmark_unset'))
}
}).catch((error) => {
console.error('error', error)
tools.showNegativeNotif($q, t('db.recfailed'))
return {}
})

16
src/views/admin/dbop/dbop.vue
View File

@@ -397,22 +397,6 @@
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Converti Tabelle: myskills, mygoods da INT a STRING"
color="primary"
@click="EseguiFunz('ConvTablesFromIntToString', '', '')"
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Removeinteger"
color="primary"
@click="EseguiFunz('Removeinteger', '', '')"
></q-btn>
<br />
</div>
<q-field stack-label dense>
<template v-slot:control>

4
src/views/user/mypagegood/mypagegood.ts
View File

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
import { useRoute, useRouter } from 'vue-router'
import { useI18n } from '@/boot/i18n'
import { useQuasar } from 'quasar'
import { CMyCardService } from '@/components/CMyCardService'
import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CMyPage } from '@/components/CMyPage'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
export default defineComponent({
name: 'mypagegood',
components: { CMyCardService, CMyPage, CCheckIfIsLogged },
components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
props: {},
setup() {
const userStore = useUserStore()

23
src/views/user/mypagegood/mypagegood.vue
View File

@@ -1,24 +1,23 @@
<template>
<CMyPage
title="Bene"
<CMyPage title="Bene"
imgbackground="images/calendario_eventi.jpg"
sizes="max-height: 120px"
styleadd="bottom: -20px !important;"
>
sizes="max-height: 120px" styleadd="bottom: -20px !important;">
<div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
<CMyCardService
v-if="idGood"
<CMyCardPopup
v-if="!!idGood"
:table="toolsext.TABMYGOODS"
:nopopup="true"
:idRec="idGood"
>
</CMyCardService>
:idRec="idGood">
</CMyCardPopup>
<br>
<br>
<br />
<br />
</CMyPage>
</template>

4
src/views/user/mypagehosp/mypagehosp.ts
View File

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
import { useRoute, useRouter } from 'vue-router'
import { useI18n } from '@/boot/i18n'
import { useQuasar } from 'quasar'
import { CMyCardService } from '@/components/CMyCardService'
import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CMyPage } from '@/components/CMyPage'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
export default defineComponent({
name: 'mypagehosp',
components: { CMyCardService, CMyPage, CCheckIfIsLogged },
components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
props: {},
setup() {
const userStore = useUserStore()

4
src/views/user/mypagehosp/mypagehosp.vue
View File

@@ -7,13 +7,13 @@
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
<CMyCardService
<CMyCardPopup
v-if="!!idHosp"
:table="toolsext.TABMYHOSPS"
:nopopup="true"
:idRec="idHosp">
</CMyCardService>
</CMyCardPopup>
<br>
<br>

29
src/views/user/myservice/myservice.ts
View File

@@ -5,7 +5,7 @@ import { CDateTime } from '@/components/CDateTime'
import { CMyPage } from '@/components/CMyPage'
import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { CMyCardService } from '@/components/CMyCardService'
import { CSkill } from '@/components/CSkill'
import { tools } from '@store/Modules/tools'
import { computed, defineComponent, onMounted, ref, watch } from 'vue'
import { useUserStore } from '@store/UserStore'
@@ -24,7 +24,7 @@ import { colCitys } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'myservice',
components: { CProfile, CTitleBanner, CMyFieldDb, CMyCardService, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
props: {},
setup() {
const userStore = useUserStore()
@@ -54,12 +54,37 @@ export default defineComponent({
return userStore.my.username
}
function loadSkill() {
// Carica il profilo di quest'utente
if (idSkill.value) {
userStore.loadSkill(idSkill.value).then((ris) => {
myskill.value = ris
if (ris.userId) {
filtroutente.value = [{ userId: ris.userId , _id: ris._id }]
}
})
}
}
watch(() => idSkill.value, (to: any, from: any) => {
loadSkill()
})
function mounted() {
loadSkill()
}
function checkifShow(col: string) {
//++Todo: checkifShow Permessi !
return true
}
onMounted(mounted)
return {
profile,
tools,

6
src/views/user/myservice/myservice.vue
View File

@@ -7,11 +7,13 @@
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
<div v-else>
<CMyCardService v-if="idSkill"
<CMyCardPopup
v-if="!!idSkill"
:table="toolsext.TABMYSKILLS"
:nopopup="true"
:idRec="idSkill">
</CMyCardService>
</CMyCardPopup>
</div>
<!--

BIN
upload/gallery/vendemmia.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
upload/pages/chisiamo/DSCF2355.JPG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
upload/pages/chisiamo/DSC_0521.JPG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 MiB

BIN
upload/pages/chisiamo/IMG-20210928-WA0012.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 KiB

BIN
upload/pages/chisiamo/IMG_0497.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 925 KiB

BIN
upload/pages/chisiamo/IMG_0510.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 KiB

BIN
upload/pages/chisiamo/IMG_0535.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
upload/pages/chisiamo/_LEM9173.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 MiB

BIN
upload/pages/chisiamo/_LEM9190.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 MiB

BIN
upload/pages/chisiamo/_LEM9195.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 MiB

BIN
upload/pages/chisiamo/_LEM9212.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 MiB

BIN
upload/pages/chisiamo/_LEM9230.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 MiB

BIN
upload/pages/chisiamo/foggia_evento.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 KiB

BIN
upload/pages/home/DSCF2355.JPG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
upload/pages/home/DSC_0521.JPG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 MiB

BIN
upload/pages/home/IMG-20210928-WA0012.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 KiB

BIN
upload/pages/home/IMG_0497.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 925 KiB

BIN
upload/pages/home/IMG_0510.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 KiB

BIN
upload/pages/home/IMG_0535.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
upload/pages/home/_LEM9173.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 MiB

BIN
upload/pages/home/_LEM9190.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 MiB

BIN
upload/pages/home/_LEM9195.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 MiB

BIN
upload/pages/home/_LEM9212.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 MiB

BIN
upload/pages/home/_LEM9230.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 MiB

BIN
upload/pages/home/nuda_e_cruda.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 311 KiB

BIN
upload/pages/home/sfondo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 KiB

BIN
upload/profile/Petravale/file_832.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB

BIN
upload/profile/paoloar77/file_803.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB