diff --git a/.env.development b/.env.development index afaccfb1..1e360e6d 100755 --- a/.env.development +++ b/.env.development @@ -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" diff --git a/.env.example.production b/.env.example.production index 48ec60d6..988e6318 100755 --- a/.env.example.production +++ b/.env.example.production @@ -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 diff --git a/.env.test.risosrv b/.env.test.risosrv index c62be2ae..cdb610ed 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -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 diff --git a/_ALL_SITES/comunitanuovomondo.app/logo_nuovomondo.jpeg b/_ALL_SITES/comunitanuovomondo.app/logo_nuovomondo.jpeg deleted file mode 100644 index 4db1d40d..00000000 Binary files a/_ALL_SITES/comunitanuovomondo.app/logo_nuovomondo.jpeg and /dev/null differ diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index afaccfb1..1e360e6d 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -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" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 98fa7535..b277947d 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -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 diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 6d827020..20545fc3 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -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" diff --git a/public/upload b/public/upload deleted file mode 120000 index 27b9b359..00000000 --- a/public/upload +++ /dev/null @@ -1 +0,0 @@ -/Users/suryapaolo/backups/upload \ No newline at end of file diff --git a/send_pwa_to_production.sh b/send_pwa_to_production.sh index 5e500957..ed1ed271 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 --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 diff --git a/send_spa_to_production.sh b/send_spa_to_production.sh index 80f4baac..cab43286 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 --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 diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index f04ea625..44ece296 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -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; - }, - } diff --git a/src/components/CAccomodation/CAccomodation.ts b/src/components/CAccomodation/CAccomodation.ts index cf83ccfb..80048498 100755 --- a/src/components/CAccomodation/CAccomodation.ts +++ b/src/components/CAccomodation/CAccomodation.ts @@ -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 diff --git a/src/components/CAccomodation/CAccomodation.vue b/src/components/CAccomodation/CAccomodation.vue index 6ad7cd6f..60b5131a 100755 --- a/src/components/CAccomodation/CAccomodation.vue +++ b/src/components/CAccomodation/CAccomodation.vue @@ -1,6 +1,6 @@