diff --git a/.env.development b/.env.development index 5448c8d9..07160cf9 100755 --- a/.env.development +++ b/.env.development @@ -1,12 +1,12 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="1" +APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" SERVERPW_WEBSITE="" APP_URL="http://localhost" -URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +URL_FACEBOOK="https://www.facebook.com/" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" diff --git a/.env.production b/.env.production index dbb92e9a..eb362a07 100755 --- a/.env.production +++ b/.env.production @@ -1,12 +1,12 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="1" +APP_ID="12" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=www.freeplanet.app +SERVERDIR_WEBSITE=popolodelnuovomondo.app SERVERPW_WEBSITE=pwdadmin@1AOK -APP_URL="https://www.freeplanet.app" -URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +APP_URL="https://popolodelnuovomondo.insiemesipuo.app" +URL_FACEBOOK="https://www.facebook.com/" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" diff --git a/.env.test b/.env.test index 38299c3c..755c5c9b 100755 --- a/.env.test +++ b/.env.test @@ -1,12 +1,12 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="1" +APP_ID="12" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="test.freeplanet.app" +SERVERDIR_WEBSITE="testpopolodelnuovomondo.app" SERVERPW_WEBSITE="pwdadmin@1AOK" -APP_URL="https://test.freeplanet.app" -URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +APP_URL="https://testpopolodelnuovomondo.insiemesipuo.app" +URL_FACEBOOK="https://www.facebook.com/" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index e17f0096..5448c8d9 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.5" +APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/.env.production b/_ALL_SITES/freeplanet.app/.env.production index b7997ae0..dbb92e9a 100755 --- a/_ALL_SITES/freeplanet.app/.env.production +++ b/_ALL_SITES/freeplanet.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.1.5" +APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/freeplanet.app/.env.test b/_ALL_SITES/freeplanet.app/.env.test index e9d588ba..38299c3c 100755 --- a/_ALL_SITES/freeplanet.app/.env.test +++ b/_ALL_SITES/freeplanet.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.1.5" +APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index 07aeb8ff..07279110 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -11,16 +11,15 @@ const functionality: IFunctionality = { SHOW_PROFILE: true, SHOW_REG_BUTTON: false, ENABLE_REGISTRATION: true, // Cambiare con true - ENABLE_REG_AYNI: false, SHOW_NEWSLETTER: false, SHOW_ONLY_POLICY: false, - ENABLE_TODOS_LOADING: true, + ENABLE_TODOS_LOADING: false, ENABLE_PROJECTS_LOADING: false, SHOW_IF_IS_SERVER_CONNECTION: false, SHOW_MESSAGES: false, BOOKING_EVENTS: true, - ENABLE_ECOMMERCE: true, - ENABLE_REG_CNM: true, + ENABLE_ECOMMERCE: false, + ENABLE_REG_ISP: true, } // const SHOW_PROJINTHEMENU = false diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.test b/_ALL_SITES/popolodelnuovomondo.app/.env.test index 6fd88238..755c5c9b 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.test +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.test @@ -3,7 +3,7 @@ SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="testpopolodelnuovomondo.insiemesipuo.app" +SERVERDIR_WEBSITE="testpopolodelnuovomondo.app" SERVERPW_WEBSITE="pwdadmin@1AOK" APP_URL="https://testpopolodelnuovomondo.insiemesipuo.app" URL_FACEBOOK="https://www.facebook.com/" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index fa0dbceb..e1f1d818 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -11,16 +11,15 @@ const functionality: IFunctionality = { SHOW_PROFILE: true, SHOW_REG_BUTTON: false, ENABLE_REGISTRATION: true, // Cambiare con true - ENABLE_REG_AYNI: false, SHOW_NEWSLETTER: false, SHOW_ONLY_POLICY: false, - ENABLE_TODOS_LOADING: true, + ENABLE_TODOS_LOADING: false, ENABLE_PROJECTS_LOADING: false, SHOW_IF_IS_SERVER_CONNECTION: false, SHOW_MESSAGES: false, BOOKING_EVENTS: true, - ENABLE_ECOMMERCE: true, - ENABLE_REG_CNM: true, + ENABLE_ECOMMERCE: false, + ENABLE_REG_ISP: true, } // const SHOW_PROJINTHEMENU = false diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts index 8c114348..0727d751 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts @@ -12,6 +12,7 @@ import { CVerifyTelegram } from '@src/components/CVerifyTelegram' import { useGlobalStore } from '@store/globalStore' import { useUserStore } from '@store/UserStore' import { static_data } from '@/db/static_data' +import MixinBase from '@/mixins/mixin-base' export default defineComponent({ @@ -20,6 +21,7 @@ export default defineComponent({ setup() { const globalStore = useGlobalStore() const userStore = useUserStore() + const { getValDb } = MixinBase() function isEmailVerified() { return userStore.my.verified_email @@ -44,6 +46,10 @@ export default defineComponent({ return userStore.isUserOk() } + function getLinkBotTelegram(): string { + return getValDb('TELEG_BOT_LINK', false) + } + return { tools, static_data, @@ -53,6 +59,7 @@ export default defineComponent({ isLogged, openrighttoolbar, isUserOk, + getLinkBotTelegram, } }, }) diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue index 5da75fbf..8c0df873 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue +++ b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue @@ -29,7 +29,7 @@ per vedere tutti i Menu e le chat ! diff --git a/package.json b/package.json index 3b208847..5dca3eb4 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "freeplanet", - "version": "0.0.7", - "description": "FreePlanet", - "productName": "FreePlanet", + "name": "popolodelnuovomondo", + "version": "0.0.8", + "description": "Popolo Del Nuovo Mondo", + "productName": "Popolo Del Nuovo Mondo", "author": "Paolo Arena", "private": true, "keywords": [ diff --git a/quasar.conf.js b/quasar.conf.js index 1060c9a4..1df8eb8f 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -146,7 +146,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8082, + port: 8083, open: false, // opens browser window automatically }, @@ -284,9 +284,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'FreePlanet', - short_name: 'FreePlanet', - description: 'New Free Social', + name: 'PopoloDelNuovoMondo', + short_name: 'PdNM', + description: 'Popolo del Nuovo Mondo', display: 'standalone', orientation: 'portrait', background_color: '#ffffff', diff --git a/send_to_production.sh b/send_to_production.sh index 97249572..0effc4e5 100755 --- a/send_to_production.sh +++ b/send_to_production.sh @@ -9,7 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync --port=8822 -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " - fi diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 85224b26..39b37d71 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -1,8 +1,8 @@ const msg_website_it = { ws: { - sitename: 'FreePlanet', - siteshortname: 'FreePlanet', - botname: 'il Bot di FreePlanet', + sitename: 'PopoloDelNuovoMondo', + siteshortname: 'PDNM', + botname: 'il Bot di PdNM', }, products: { quantity: 'Quantità', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 07aeb8ff..e1f1d818 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -11,16 +11,15 @@ const functionality: IFunctionality = { SHOW_PROFILE: true, SHOW_REG_BUTTON: false, ENABLE_REGISTRATION: true, // Cambiare con true - ENABLE_REG_AYNI: false, SHOW_NEWSLETTER: false, SHOW_ONLY_POLICY: false, - ENABLE_TODOS_LOADING: true, + ENABLE_TODOS_LOADING: false, ENABLE_PROJECTS_LOADING: false, SHOW_IF_IS_SERVER_CONNECTION: false, SHOW_MESSAGES: false, BOOKING_EVENTS: true, - ENABLE_ECOMMERCE: true, - ENABLE_REG_CNM: true, + ENABLE_ECOMMERCE: false, + ENABLE_REG_ISP: true, } // const SHOW_PROJINTHEMENU = false @@ -366,7 +365,7 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true, }, - { + /*{ active: true, order: 100, path: '/presentazione', @@ -376,7 +375,7 @@ const baseroutes: IListRoutes[] = [ reqauth: false, inmenu: true, infooter: true, - }, + },*/ { active: true, order: 120, @@ -558,7 +557,7 @@ const baseroutes: IListRoutes[] = [ isseparator: true, inmenu: true, }, - { + /*{ active: true, order: 80, path: '/calendario-eventi', @@ -568,7 +567,7 @@ const baseroutes: IListRoutes[] = [ extraclass: 'isCalendar', inmenu: true, infooter: true - }, + },*/ { active: true, order: 1000, diff --git a/src/root/home/home.ts b/src/root/home/home.ts index 8c114348..0727d751 100755 --- a/src/root/home/home.ts +++ b/src/root/home/home.ts @@ -12,6 +12,7 @@ import { CVerifyTelegram } from '@src/components/CVerifyTelegram' import { useGlobalStore } from '@store/globalStore' import { useUserStore } from '@store/UserStore' import { static_data } from '@/db/static_data' +import MixinBase from '@/mixins/mixin-base' export default defineComponent({ @@ -20,6 +21,7 @@ export default defineComponent({ setup() { const globalStore = useGlobalStore() const userStore = useUserStore() + const { getValDb } = MixinBase() function isEmailVerified() { return userStore.my.verified_email @@ -44,6 +46,10 @@ export default defineComponent({ return userStore.isUserOk() } + function getLinkBotTelegram(): string { + return getValDb('TELEG_BOT_LINK', false) + } + return { tools, static_data, @@ -53,6 +59,7 @@ export default defineComponent({ isLogged, openrighttoolbar, isUserOk, + getLinkBotTelegram, } }, }) diff --git a/src/root/home/home.vue b/src/root/home/home.vue index fe517573..8c0df873 100755 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -11,6 +11,7 @@ +
@@ -21,15 +22,17 @@
- -
- Ora Accedi al Bot Telegram
- per vedere tutti i Menu e le chat ! -
- -
+
+ +
+ Ora Accedi al Bot Telegram
+ per vedere tutti i Menu e le chat ! +
+ +
+
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index f46d8a9d..dd8ba9bd 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -463,6 +463,7 @@ export const colTableSites = [ AddCol({ name: 'host', label_trans: 'sites.host', fieldtype: costanti.FieldType.string }), AddCol({ name: 'host_test', label_trans: 'sites.host_test', fieldtype: costanti.FieldType.string }), AddCol({ name: 'portapp', label_trans: 'sites.portapp', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'dir', label_trans: 'sites.dir' }), AddCol({ name: 'dir_test', label_trans: 'sites.dir_test', fieldtype: costanti.FieldType.string }), AddCol({ name: 'email_from', label_trans: 'sites.email_from', fieldtype: costanti.FieldType.string }), AddCol({ name: 'email_pwd', label_trans: 'sites.email_pwd', fieldtype: costanti.FieldType.string }),