diff --git a/.env.development b/.env.development index 5d6760a3..fce094d0 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 12f7331a..b30eec37 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 7de75ab5..5e6bbea0 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 5d6760a3..fce094d0 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 408ceb09..1a0869f9 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 41a8d289..eded4542 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.3" +APP_VERSION="0.6.4" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/deploy_on_production.sh b/deploy_on_production.sh index 9f17ff55..4f8e9d0d 100755 --- a/deploy_on_production.sh +++ b/deploy_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_on_test_server.sh b/deploy_on_test_server.sh index a1aa307c..1cd4855f 100755 --- a/deploy_on_test_server.sh +++ b/deploy_on_test_server.sh @@ -19,7 +19,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ cp .env.prod.bak .env.production diff --git a/deploy_spa_on_production.sh b/deploy_spa_on_production.sh index 94305151..148b657c 100755 --- a/deploy_spa_on_production.sh +++ b/deploy_spa_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_spa_test_server.sh b/deploy_spa_test_server.sh index d699ef43..8c245e33 100755 --- a/deploy_spa_test_server.sh +++ b/deploy_spa_test_server.sh @@ -19,7 +19,7 @@ sleep 1 npm run buildspa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ cp .env.prod.bak .env.production diff --git a/public/upload b/public/upload deleted file mode 120000 index 3272eb09..00000000 --- a/public/upload +++ /dev/null @@ -1 +0,0 @@ -../../IMGS/upload \ No newline at end of file diff --git a/send_pwa_to_production.sh b/send_pwa_to_production.sh index ed1ed271..5e500957 100755 --- a/send_pwa_to_production.sh +++ b/send_pwa_to_production.sh @@ -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 dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_pwa_to_risotest.sh b/send_pwa_to_risotest.sh index eef33578..eb41976b 100755 --- a/send_pwa_to_risotest.sh +++ b/send_pwa_to_risotest.sh @@ -5,7 +5,7 @@ source .env.test.risosrv cp .env.test.risosrv .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/ +rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/send_pwa_to_test.sh b/send_pwa_to_test.sh index 99974a2d..130a9976 100755 --- a/send_pwa_to_test.sh +++ b/send_pwa_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/send_spa_to_production.sh b/send_spa_to_production.sh index cab43286..80f4baac 100755 --- a/send_spa_to_production.sh +++ b/send_spa_to_production.sh @@ -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 dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_spa_to_test.sh b/send_spa_to_test.sh index 565424d3..7964dce9 100755 --- a/send_spa_to_test.sh +++ b/send_spa_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index bd620937..9ee53cc1 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -171,13 +171,13 @@ export const shared_consts = { TABLES_MYGOODS: 'mygoods', TABLES_MYEVENTS: 'myevents', - MYTABS: [{id: 0, table: 'none' }, - {id: 1, table: 'myskills'}, - {id: 2, table: 'mybachecas' }, - {id: 3, table: 'myhosps'} , - {id: 4, table: 'mygoods'}, - {id: 5, table: 'myevents'} -], + MYTABS: [{ id: 0, table: 'none' }, + { id: 1, table: 'myskills' }, + { id: 2, table: 'mybachecas' }, + { id: 3, table: 'myhosps' }, + { id: 4, table: 'mygoods' }, + { id: 5, table: 'myevents' } + ], TABLES_ENABLE_GETREC_BYID: ['mybachecas', 'myhosps'], @@ -1115,6 +1115,9 @@ export const shared_consts = { TYPEDIR_HANDSHAKE: 10, ID_HANDSHAKE_ACCEPTED: 2, + TYPEDIR_FAVORITE: 11, + ID_FAVORITE_ADDED: 1, + TYPEDIR_TEST: 444, ID_TEST_NEW_REC: 1, }, @@ -1151,6 +1154,18 @@ export const shared_consts = { } ], }, + { + value: 11, // + labeltrans: 'typenotifs.favorite', + descr: 'typenotifs.favorite_descr', + icon: 'far fa-heart', + list: [ + { + value: 1, // ID_FAVORITE_ADDED + labeltrans: 'notifsid.favorite_new', + } + ], + }, { value: 2, // labeltrans: 'typenotifs.events', @@ -1260,6 +1275,11 @@ export const shared_consts = { labeltrans: 'notifsid.circuits_new', directory: 5, }, + { + value: 1, // + labeltrans: 'notifsid.favorite_new', + directory: 11, + }, ], CIRCUIT_STATUS: { @@ -1585,6 +1605,8 @@ export const shared_consts = { reported: 1, date_report: 1, username_who_report: 1, + namecomplete: 1, + date_reg: 1, }; if (proj_add) @@ -1593,4 +1615,26 @@ export const shared_consts = { return proj; }, + getDirectoryByTable(table: string, barre?: boolean) { + let add = ''; + if (barre) + add = '/'; + + if (table === 'myskills') { + return add + 'myservice' + add + } else if (table === 'mybachecas') { + return add + 'mypage' + add + } else if (table === 'myhosps') { + return add + 'myhosps' + add + } else if (table === 'mygoods') { + return add + 'mygood' + add + } else if (table === 'mygroups') { + return add + 'grp' + add + } else if (table === 'circuits') { + return add + 'circuit' + add + } + + return '' + }, + } diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 2cc1b28e..78a01f0b 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -440,7 +440,7 @@ export default defineComponent({ watch(() => ordinam.value, (to: any, from: any) => { if (pagination.value.sortBy !== ordinam.value) { - tools.setCookie('s_ordinam_' + props.prop_mytable, ordinam.value) + tools.setCookie('s_ordinamnew_' + props.prop_mytable, ordinam.value) // pagination.value.sortBy = getObjSort(ordinam.value, ordinam_desc.value) // refresh() } @@ -628,6 +628,9 @@ export default defineComponent({ if ((field === 'date_reg') || (field === 'numMembers')) { return -1; } + if (field === 'namecomplete') { + return 1; + } return precorder ? precorder : 1; } @@ -1038,7 +1041,7 @@ export default defineComponent({ pagination.value.rowsPerPage = rowsPerPage //pagination.value.sortBy = getObjSort(sortBy, descending) pagination.value.sortBy = sortBy - ordinam.value = sortBy + // ordinam.value = sortBy ordinam_desc.value = descending pagination.value.descending = descending @@ -1115,7 +1118,7 @@ export default defineComponent({ pagination.value.page = page pagination.value.rowsPerPage = rowsPerPage pagination.value.sortBy = getObjSort(sortBy, descending) - ordinam.value = sortBy + // ordinam.value = sortBy ordinam_desc.value = descending pagination.value.descending = descending @@ -1159,7 +1162,7 @@ export default defineComponent({ } function refresh_infscroll(done: any) { - // console.log('refresh_infscroll') + // console.log('refresh_infscroll', 'pag', pagination.value.rowsNumber) rowclicksel.value = null onUpdateData(0, @@ -1511,10 +1514,10 @@ export default defineComponent({ if (!shared_consts.TABLES_ORDER_DATE_UPDATED.includes(tablesel.value) && !shared_consts.TABLES_ORDER_DESCR.includes(tablesel.value)) { console.log('get cookie)') - let v1 = tools.getCookie('s_ordinam_' + tablesel.value, null) + let v1 = tools.getCookie('s_ordinamnew_' + tablesel.value, null) if (v1) ordinam.value = v1 - let v2 = tools.getCookie('s_ordinam_des_' + tablesel.value, null) + let v2 = tools.getCookie('s_ordinamnew_des_' + tablesel.value, null) if (v2) ordinam_desc.value = v2 } @@ -2130,7 +2133,7 @@ export default defineComponent({ function onLoadScroll(index: number, done: any) { if (index > 1) { - // console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber) + // console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber, 'PAGE: ', pagination.value.page) if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) { if (pagination.value.rowsNumber === 0) { pagination.value.page = 0 @@ -2142,6 +2145,7 @@ export default defineComponent({ done(true) } } else { + // console.log('DONE .....................') done() } } diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index 824fd6de..4b517133 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -105,7 +105,6 @@ ' } + } else if (notif.typedir === shared_consts.TypeNotifs.TYPEDIR_FAVORITE) { + // if (notif.status === shared_consts.StatusNotifs.STATUS_HANDSHAKE_ACCEPTED) { + // descr += '
' + $t('handshake.accepted') + '' + // } } else if (notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS) { if (notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ) { // console.log('notif.extrarec', notif.extrarec) diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index d1b578ff..fd58b576 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -816,6 +816,7 @@ export interface IMsgGlobParam { text?: string typesend: number sendreally?: boolean + textaddTelegram?: string } export interface IDataToSet { diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 9b9af066..ee52cbcf 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -873,6 +873,8 @@ const msg_it = { booking: 'Prenotazioni', test: 'Test', test_descr: 'Test descr', + favorite: 'Preferiti', + favorite_descr: 'Notificami se una persona mette "Mi Piace" su un tuo annuncio o post', }, notifsid: { bacheca_new_good: 'Nuovo Bene', @@ -882,6 +884,7 @@ const msg_it = { groups_new: 'Si creano Nuovi Gruppi', circuits_new: 'Si creano Nuovi Circuiti', test_new: 'Nuovo Test', + favorite_new: '"Mi Piace" su un tuo annuncio o post', }, event: { _id: 'id', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index f186d016..49201135 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -6981,23 +6981,6 @@ export const tools = { } }, - getDirectoryByTable(table: string) { - if (table === toolsext.TABMYSKILLS) { - return 'myservice' - } else if (table === toolsext.TABMYBACHECAS) { - return 'mypage' - } else if (table === toolsext.TABMYHOSPS) { - return 'myhosps' - } else if (table === toolsext.TABMYGOODS) { - return 'mygood' - } else if (table === toolsext.TABMYGROUPS) { - return 'grp' - } else if (table === toolsext.TABCIRCUITS) { - return 'circuit' - } - - return '' - }, getFullFileName(arrimage: IImgGallery[], table: string, username: string, groupname: string) { // console.log('arrimage', arrimage) @@ -7052,21 +7035,21 @@ export const tools = { }, getPathByGroup(grp: any, table: string) { - return '/' + tools.getDirectoryByTable(table) + '/' + grp.groupname + return '/' + shared_consts.getDirectoryByTable(table) + '/' + grp.groupname }, getPathByCircuit(circuit: any, table: string) { - return '/' + tools.getDirectoryByTable(table) + '/' + circuit.path + return '/' + shared_consts.getDirectoryByTable(table) + '/' + circuit.path }, getPathByTable(table: string, pagename: string) { - return '/' + tools.getDirectoryByTable(table) + '/' + pagename + return '/' + shared_consts.getDirectoryByTable(table) + '/' + pagename }, getPathByTableAndRec(table: string, rec: any) { if (shared_consts.TABLES_REC_ID.includes(table)) { - return '/' + tools.getDirectoryByTable(table) + '/' + rec['_id'] + return '/' + shared_consts.getDirectoryByTable(table) + '/' + rec['_id'] } else if (table === toolsext.TABMYGROUPS) { return this.getPathByGroup(rec, table) } else if (table === toolsext.TABCIRCUITS) { diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 59fdc6e4..ce3f387b 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -246,10 +246,10 @@ export const useUserStore = defineStore('UserStore', { getMypaginationMembers(): any { - return { sortBy: 'name,username', descending: '1,1', page: 1, rowsNumber: 0, rowsPerPage: 10 } + return { sortBy: 'namecomplete', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 15 } }, getSortFieldsAvailable(): any[] { - return [{ label: 'Username', value: { 'username': 1, 'name': 1 } }, { label: 'Nome', value: { 'name': 1, 'username': 1 } }, { label: 'Ultimi reg.', value: { 'date_reg': -1, 'username': 1 } }] + return [{ label: 'Name e User', value: { 'namecomplete': 1 } }, { label: 'Ultimi entrati', value: { 'date_reg': -1} }] }, IsMyFriendByUsername(username: string): boolean { diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index c7686079..3248cbaa 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -339,6 +339,8 @@ export default defineComponent({ reported: 1, date_report: 1, username_who_report: 1, + namecomplete: 1, + date_reg: 1, } }, } diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 212a2faf..91552fb1 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -868,7 +868,6 @@ - + - - - + +