diff --git a/.env.development b/.env.development index 3782e196..5448c8d9 100755 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="12" +APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" diff --git a/.env.production b/.env.production index eb362a07..dbb92e9a 100755 --- a/.env.production +++ b/.env.production @@ -1,12 +1,12 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="12" +APP_ID="1" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=popolodelnuovomondo.app +SERVERDIR_WEBSITE=www.freeplanet.app SERVERPW_WEBSITE=pwdadmin@1AOK -APP_URL="https://popolodelnuovomondo.insiemesipuo.app" -URL_FACEBOOK="https://www.facebook.com/" +APP_URL="https://www.freeplanet.app" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" diff --git a/.env.test b/.env.test index 3ed8acd4..38299c3c 100755 --- a/.env.test +++ b/.env.test @@ -1,12 +1,12 @@ APP_VERSION="0.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="12" +APP_ID="1" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside SERVERDIR_WEBSITE="test.freeplanet.app" SERVERPW_WEBSITE="pwdadmin@1AOK" -APP_URL="https://testpopolodelnuovomondo.insiemesipuo.app" -URL_FACEBOOK="https://www.facebook.com/" +APP_URL="https://test.freeplanet.app" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" 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 new file mode 100755 index 00000000..e17f0096 --- /dev/null +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -0,0 +1,28 @@ +APP_VERSION="0.1.5" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="1" +DIRECTORY_LOCAL="newfreeplanet" +DIRECTORY_SERVER="freeplanet_serverside" +SERVERDIR_WEBSITE="" +SERVERPW_WEBSITE="" +APP_URL="http://localhost" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="http://192.168.1.8:3000" +LOGO_REG="freeplanet-logo-full.svg" +TEST_NAME="Paolo" +TEST_SURNAME="Arena" +TEST_EMAIL="paolo@freeplanet.app" +TEST_USERNAME="paoloar773" +TEST_PASSWORD="passpao1fr@1A" +TEST_APORTADOR="" +PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/freeplanet.app/.env.production b/_ALL_SITES/freeplanet.app/.env.production new file mode 100755 index 00000000..b7997ae0 --- /dev/null +++ b/_ALL_SITES/freeplanet.app/.env.production @@ -0,0 +1,28 @@ +APP_VERSION="0.1.5" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="1" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=freeplanet_serverside +SERVERDIR_WEBSITE=www.freeplanet.app +SERVERPW_WEBSITE=pwdadmin@1AOK +APP_URL="https://www.freeplanet.app" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://www.freeplanet.app:3000" +LOGO_REG='freeplanet-logo-full.svg' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="------" +PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw" +IN_CONSTRUCTION="1" +DEBUG="1" +TELEGRAM_SUPPORT="https://t.me/freeplanet_supporto" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=0 diff --git a/_ALL_SITES/freeplanet.app/.env.test b/_ALL_SITES/freeplanet.app/.env.test new file mode 100755 index 00000000..e9d588ba --- /dev/null +++ b/_ALL_SITES/freeplanet.app/.env.test @@ -0,0 +1,28 @@ +APP_VERSION="0.1.5" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="1" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="test.freeplanet.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://test.freeplanet.app" +URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://test.freeplanet.app:3001" +LOGO_REG="freeplanet-logo-full.svg" +TEST_NAME="Paolo" +TEST_SURNAME="Arena" +TEST_EMAIL="paolo@freeplanet.app" +TEST_USERNAME="paoloar77" +TEST_PASSWORD="passpao1fr@1A" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BNRBtL3iaLVGW-aQckwQBmh5uKKzcizOZsMjnzCtSuHkssEhbyioEN2E_CwItDLDShMO-OQ1uhK51ty6zG_gCT8" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/freeplanet.app/root/home/home.scss b/_ALL_SITES/freeplanet.app/root/home/home.scss new file mode 100755 index 00000000..e69de29b diff --git a/_ALL_SITES/freeplanet.app/root/home/home.ts b/_ALL_SITES/freeplanet.app/root/home/home.ts new file mode 100755 index 00000000..8c114348 --- /dev/null +++ b/_ALL_SITES/freeplanet.app/root/home/home.ts @@ -0,0 +1,58 @@ +import { + defineComponent, ref, computed, +} from 'vue' + +import { tools } from '@src/store/Modules/tools' +import { CSkill } from '@/components/CSkill' +import { CFinder } from '@/components/CFinder' +import { CChartMap } from '@src/components/CChartMap' +import { CMapsEsempio } from '@src/components/CMapsEsempio' +import { CVerifyEmail } from '@src/components/CVerifyEmail' +import { CVerifyTelegram } from '@src/components/CVerifyTelegram' +import { useGlobalStore } from '@store/globalStore' +import { useUserStore } from '@store/UserStore' +import { static_data } from '@/db/static_data' + + +export default defineComponent({ + name: 'Home', + components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram }, + setup() { + const globalStore = useGlobalStore() + const userStore = useUserStore() + + function isEmailVerified() { + return userStore.my.verified_email + } + + function TelegCode() { + return userStore.my.profile.teleg_checkcode + } + + function TelegVerificato(): boolean { + return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false + } + + function openrighttoolbar() { + globalStore.rightDrawerOpen = true + } + + function isLogged() { + return userStore.isLogged + } + function isUserOk() { + return userStore.isUserOk() + } + + return { + tools, + static_data, + isEmailVerified, + TelegCode, + TelegVerificato, + isLogged, + openrighttoolbar, + isUserOk, + } + }, +}) diff --git a/_ALL_SITES/freeplanet.app/root/home/home.vue b/_ALL_SITES/freeplanet.app/root/home/home.vue new file mode 100755 index 00000000..fe517573 --- /dev/null +++ b/_ALL_SITES/freeplanet.app/root/home/home.vue @@ -0,0 +1,73 @@ + + + diff --git a/_ALL_SITES/freeplanet.app/statics/lang/it.js b/_ALL_SITES/freeplanet.app/statics/lang/it.js index d4fb7dc5..3e4b923b 100755 --- a/_ALL_SITES/freeplanet.app/statics/lang/it.js +++ b/_ALL_SITES/freeplanet.app/statics/lang/it.js @@ -760,12 +760,16 @@ const msg_it = { manageremail: 'Email Gestione', replyTo: 'Reply To', host: 'Host', + host_test: 'Host Test', portapp: 'Porta', - dir: 'Directory', + dir: 'Dir', + dir_test: 'Dir Test', email_from: 'Email From', email_pwd: 'Email Pwd', - telegram_key: 'Chiave Bot Telegram', - telegram_bot_name: 'Telegram BotName', + telegram_key: 'Chiave Bot', + telegram_bot_name: 'BotName', + telegram_key_test: 'Chiave Bot Test', + telegram_bot_name_test: 'BotName Test', pathreg_add: 'Suffisso', }, skill: { diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development new file mode 100755 index 00000000..07160cf9 --- /dev/null +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -0,0 +1,28 @@ +APP_VERSION="0.1.6" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="12" +DIRECTORY_LOCAL="newfreeplanet" +DIRECTORY_SERVER="freeplanet_serverside" +SERVERDIR_WEBSITE="" +SERVERPW_WEBSITE="" +APP_URL="http://localhost" +URL_FACEBOOK="https://www.facebook.com/" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="http://192.168.1.8:3000" +LOGO_REG="freeplanet-logo-full.svg" +TEST_NAME="Paolo" +TEST_SURNAME="Arena" +TEST_EMAIL="paolo@freeplanet.app" +TEST_USERNAME="paoloar773" +TEST_PASSWORD="passpao1fr@1A" +TEST_APORTADOR="" +PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.production b/_ALL_SITES/popolodelnuovomondo.app/.env.production new file mode 100755 index 00000000..eb362a07 --- /dev/null +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.production @@ -0,0 +1,28 @@ +APP_VERSION="0.1.6" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="12" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=freeplanet_serverside +SERVERDIR_WEBSITE=popolodelnuovomondo.app +SERVERPW_WEBSITE=pwdadmin@1AOK +APP_URL="https://popolodelnuovomondo.insiemesipuo.app" +URL_FACEBOOK="https://www.facebook.com/" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://www.freeplanet.app:3000" +LOGO_REG='freeplanet-logo-full.svg' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="------" +PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw" +IN_CONSTRUCTION="1" +DEBUG="1" +TELEGRAM_SUPPORT="https://t.me/freeplanet_supporto" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=0 diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.test b/_ALL_SITES/popolodelnuovomondo.app/.env.test new file mode 100755 index 00000000..6fd88238 --- /dev/null +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.test @@ -0,0 +1,28 @@ +APP_VERSION="0.1.6" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="12" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="testpopolodelnuovomondo.insiemesipuo.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://testpopolodelnuovomondo.insiemesipuo.app" +URL_FACEBOOK="https://www.facebook.com/" +PROVA_PAOLO="PROVA ENV FUNZIONA!" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://test.freeplanet.app:3001" +LOGO_REG="freeplanet-logo-full.svg" +TEST_NAME="Paolo" +TEST_SURNAME="Arena" +TEST_EMAIL="paolo@freeplanet.app" +TEST_USERNAME="paoloar77" +TEST_PASSWORD="passpao1fr@1A" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BNRBtL3iaLVGW-aQckwQBmh5uKKzcizOZsMjnzCtSuHkssEhbyioEN2E_CwItDLDShMO-OQ1uhK51ty6zG_gCT8" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js b/_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js index 85224b26..39b37d71 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js +++ b/_ALL_SITES/popolodelnuovomondo.app/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/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index 87fc6567..fa0dbceb 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -58,7 +58,7 @@ const routes_admin: IListRoutes[] = [ { active: true, order: 10, - path: '/admin', + path: '/admin/sites', materialIcon: 'event_seat', name: 'pages.Sites', component: () => import('@/rootgen/admin/sites/sites.vue'), @@ -366,7 +366,7 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true, }, - { + /*{ active: true, order: 100, path: '/presentazione', @@ -376,7 +376,7 @@ const baseroutes: IListRoutes[] = [ reqauth: false, inmenu: true, infooter: true, - }, + },*/ { active: true, order: 120, @@ -558,7 +558,7 @@ const baseroutes: IListRoutes[] = [ isseparator: true, inmenu: true, }, - { + /*{ active: true, order: 80, path: '/calendario-eventi', @@ -568,7 +568,7 @@ const baseroutes: IListRoutes[] = [ extraclass: 'isCalendar', inmenu: true, infooter: true - }, + },*/ { active: true, order: 1000, diff --git a/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js b/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js index d3186d33..1df8eb8f 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js +++ b/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js @@ -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/_ALL_SITES/popolodelnuovomondo.app/root/home/home.scss b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.scss new file mode 100755 index 00000000..e69de29b diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts new file mode 100755 index 00000000..8c114348 --- /dev/null +++ b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts @@ -0,0 +1,58 @@ +import { + defineComponent, ref, computed, +} from 'vue' + +import { tools } from '@src/store/Modules/tools' +import { CSkill } from '@/components/CSkill' +import { CFinder } from '@/components/CFinder' +import { CChartMap } from '@src/components/CChartMap' +import { CMapsEsempio } from '@src/components/CMapsEsempio' +import { CVerifyEmail } from '@src/components/CVerifyEmail' +import { CVerifyTelegram } from '@src/components/CVerifyTelegram' +import { useGlobalStore } from '@store/globalStore' +import { useUserStore } from '@store/UserStore' +import { static_data } from '@/db/static_data' + + +export default defineComponent({ + name: 'Home', + components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram }, + setup() { + const globalStore = useGlobalStore() + const userStore = useUserStore() + + function isEmailVerified() { + return userStore.my.verified_email + } + + function TelegCode() { + return userStore.my.profile.teleg_checkcode + } + + function TelegVerificato(): boolean { + return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false + } + + function openrighttoolbar() { + globalStore.rightDrawerOpen = true + } + + function isLogged() { + return userStore.isLogged + } + function isUserOk() { + return userStore.isUserOk() + } + + return { + tools, + static_data, + isEmailVerified, + TelegCode, + TelegVerificato, + isLogged, + openrighttoolbar, + isUserOk, + } + }, +}) diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue new file mode 100755 index 00000000..5da75fbf --- /dev/null +++ b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue @@ -0,0 +1,76 @@ + + + diff --git a/_ALL_SITES/popolodelnuovomondo.app/statics/lang/it.js b/_ALL_SITES/popolodelnuovomondo.app/statics/lang/it.js index d4fb7dc5..3e4b923b 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/statics/lang/it.js +++ b/_ALL_SITES/popolodelnuovomondo.app/statics/lang/it.js @@ -760,12 +760,16 @@ const msg_it = { manageremail: 'Email Gestione', replyTo: 'Reply To', host: 'Host', + host_test: 'Host Test', portapp: 'Porta', - dir: 'Directory', + dir: 'Dir', + dir_test: 'Dir Test', email_from: 'Email From', email_pwd: 'Email Pwd', - telegram_key: 'Chiave Bot Telegram', - telegram_bot_name: 'Telegram BotName', + telegram_key: 'Chiave Bot', + telegram_bot_name: 'BotName', + telegram_key_test: 'Chiave Bot Test', + telegram_bot_name_test: 'BotName Test', pathreg_add: 'Suffisso', }, skill: { diff --git a/__inizia.sh b/__inizia.sh new file mode 100644 index 00000000..47110ceb --- /dev/null +++ b/__inizia.sh @@ -0,0 +1,26 @@ + +if [ "$site" = "" ]; then + echo "Lancio senza Parametri !" +else + echo "INIZIO DI $site ... " + mkdir __$site + + cp -R src/db _BAK/1/ + cp -R src/statics _BAK/1/ + cp -R quasar.conf.js _BAK/1/ + cp -R package.json _BAK/1/ + cp -R .env.development _BAK/1/ + cp -R .env.production _BAK/1/ + cp -R .env.test _BAK/1/ + cp -R root/home _BAK/1/ + + cp -R _ALL_SITES/$site/db src/ + cp -R _ALL_SITES/$site/statics src/ + cp -R _ALL_SITES/$site/quasar.conf.js . + cp -R _ALL_SITES/$site/package.json . + cp -R _ALL_SITES/$site/.env.development . + cp -R _ALL_SITES/$site/.env.production . + cp -R _ALL_SITES/$site/.env.test . + cp -R _ALL_SITES/$site/root/home src/root/ + +fi diff --git a/__termine.sh b/__termine.sh new file mode 100644 index 00000000..ca9f99d1 --- /dev/null +++ b/__termine.sh @@ -0,0 +1,22 @@ + +if [ "$site" = "" ]; then + echo "Lancio senza Parametri !" +else + echo "TERMINA DI LAVORARE SU $site: (Sovrascrivo !)" + echo "TERMINA DI LAVORARE SU $site: (Sovrascrivo !)" > now.txt + + rmdir __$site + + cp -R _ALL_SITES/$site _BAK/4/ + + cp -R src/db _ALL_SITES/$site/ + cp -R src/statics _ALL_SITES/$site/ + cp -R ./quasar.conf.js _ALL_SITES/$site/ + cp -R ./package.json _ALL_SITES/$site/ + cp -R ./.env.development _ALL_SITES/$site/ + cp -R ./.env.production _ALL_SITES/$site/ + cp -R ./.env.test _ALL_SITES/$site/ + mkdir _ALL_SITES/$site/root + cp -R src/root/home _ALL_SITES/$site/root/ + +fi diff --git a/deploy_on_test_server.sh b/deploy_on_test_server.sh index e1fe20f3..072fc1b9 100755 --- a/deploy_on_test_server.sh +++ b/deploy_on_test_server.sh @@ -2,7 +2,7 @@ source ./.env.test -msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $DIRECTORY_SERVER (Y/N) ? " +msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? " if [ "$1" = "" ]; then read -p "$msg" risposta diff --git a/inizia_freeplanet.app.sh b/inizia_freeplanet.app.sh index bad7df45..063bbb0a 100755 --- a/inizia_freeplanet.app.sh +++ b/inizia_freeplanet.app.sh @@ -2,22 +2,6 @@ site=freeplanet.app -echo "INIZIA A LAVORARE SU $site: (Sovrascrivo !)" > now.txt - -mkdir NEWFREEPLANET -rmdir POPOLODELNUOVOMONDO - -cp -R src/sites _BAK/3/ -cp -R quasar.conf.js _BAK/3/ -cp -R package.json _BAK/3/ -cp -R .env.development _BAK/3/ -cp -R .env.production _BAK/3/ -cp -R .env.test _BAK/3/ - -cp -R _ALL_SITES/$site/statics src/ -cp -R _ALL_SITES/$site/db src/ -cp -R _ALL_SITES/$site/quasar.conf.js . -cp -R _ALL_SITES/$site/.env.development . -cp -R _ALL_SITES/$site/.env.production . -cp -R _ALL_SITES/$site/.env.test . +rmdir __popolodelnuovomondo.app +source __inizia.sh diff --git a/inizia_popolodelnuovomondo.app.sh b/inizia_popolodelnuovomondo.app.sh index cad25cc6..56613bf6 100755 --- a/inizia_popolodelnuovomondo.app.sh +++ b/inizia_popolodelnuovomondo.app.sh @@ -2,22 +2,6 @@ site=popolodelnuovomondo.app -echo "INIZIA A LAVORARE SU $site: (Sovrascrivo !)" > now.txt - -rmdir NEWFREEPLANET -mkdir POPOLODELNUOVOMONDO - -cp -R src/sites _BAK/1/ -cp -R quasar.conf.js _BAK/1/ -cp -R package.json _BAK/1/ -cp -R .env.development _BAK/1/ -cp -R .env.production _BAK/1/ -cp -R .env.test _BAK/1/ - -cp -R _ALL_SITES/$site/statics src/ -cp -R _ALL_SITES/$site/db src/ -cp -R _ALL_SITES/$site/quasar.conf.js . -cp -R _ALL_SITES/$site/.env.development . -cp -R _ALL_SITES/$site/.env.production . -cp -R _ALL_SITES/$site/.env.test . +rmdir __newfreeplanet.app +source __inizia.sh diff --git a/package.json b/package.json index 5dca3eb4..3b208847 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "popolodelnuovomondo", - "version": "0.0.8", - "description": "Popolo Del Nuovo Mondo", - "productName": "Popolo Del Nuovo Mondo", + "name": "freeplanet", + "version": "0.0.7", + "description": "FreePlanet", + "productName": "FreePlanet", "author": "Paolo Arena", "private": true, "keywords": [ diff --git a/quasar.conf.js b/quasar.conf.js index d3186d33..1060c9a4 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -146,7 +146,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8083, + port: 8082, open: false, // opens browser window automatically }, diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 56edd332..6202f31e 100755 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -196,9 +196,10 @@ }} -
- {{t('reg.verificato')}} - {{t('reg.non_verificato')}} +
+ + {{t('reg.non_verificato')}}
diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 87fc6567..07aeb8ff 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -58,7 +58,7 @@ const routes_admin: IListRoutes[] = [ { active: true, order: 10, - path: '/admin', + path: '/admin/sites', materialIcon: 'event_seat', name: 'pages.Sites', component: () => import('@/rootgen/admin/sites/sites.vue'), diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 916ad8f2..c19d29ef 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -123,12 +123,15 @@ export interface ISites { manageremail?: string replyTo?: string host?: string + host_test?: string portapp?: string dir?: string email_from?: string email_pwd?: string telegram_key?: string telegram_bot_name?: string + telegram_key_test?: string + telegram_bot_name_test?: string pathreg_add?: string } diff --git a/src/root/home/home.vue b/src/root/home/home.vue index 31c61989..fe517573 100755 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -21,12 +21,35 @@
- + +
+ Ora Accedi al Bot Telegram
+ per vedere tutti i Menu e le chat ! +
+ +
-
+
+ +
+ Accedi al menu inserendo le tue credenziali πŸ”‘

+ πŸ“ Non sei Registrato?
+ πŸ‘‰πŸ» Chiedi in chat il link a chi ti ha invitato.
+
+ + +
+ +
{{ $t('login.enter') }}
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index d4fb7dc5..3e4b923b 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -760,12 +760,16 @@ const msg_it = { manageremail: 'Email Gestione', replyTo: 'Reply To', host: 'Host', + host_test: 'Host Test', portapp: 'Porta', - dir: 'Directory', + dir: 'Dir', + dir_test: 'Dir Test', email_from: 'Email From', email_pwd: 'Email Pwd', - telegram_key: 'Chiave Bot Telegram', - telegram_bot_name: 'Telegram BotName', + telegram_key: 'Chiave Bot', + telegram_bot_name: 'BotName', + telegram_key_test: 'Chiave Bot Test', + telegram_bot_name_test: 'BotName Test', pathreg_add: 'Suffisso', }, skill: { diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 71dbb09d..f46d8a9d 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -461,12 +461,15 @@ export const colTableSites = [ AddCol({ name: 'manageremail', label_trans: 'sites.manageremail', fieldtype: costanti.FieldType.string }), AddCol({ name: 'replyTo', label_trans: 'sites.replyTo', fieldtype: costanti.FieldType.string }), 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', fieldtype: costanti.FieldType.string }), + 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 }), AddCol({ name: 'telegram_key', label_trans: 'sites.telegram_key', fieldtype: costanti.FieldType.string }), AddCol({ name: 'telegram_bot_name', label_trans: 'sites.telegram_bot_name', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'telegram_key_test', label_trans: 'sites.telegram_key_test', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'telegram_bot_name_test', label_trans: 'sites.telegram_bot_name_test', fieldtype: costanti.FieldType.string }), AddCol({ name: 'pathreg_add', label_trans: 'sites.pathreg_add', fieldtype: costanti.FieldType.string }), AddCol({ name: 'who', label_trans: 'sites.who', fieldtype: costanti.FieldType.string }), AddCol({ name: 'status', label_trans: 'sites.status', fieldtype: costanti.FieldType.string }), diff --git a/termina_freeplanet.app.sh b/termina_freeplanet.app.sh index 69f30309..a02a98d2 100755 --- a/termina_freeplanet.app.sh +++ b/termina_freeplanet.app.sh @@ -2,16 +2,6 @@ site=freeplanet.app -echo "TERMINA DI LAVORARE SU $site: (Sovrascrivo !)" > now.txt - -rmdir NEWFREEPLANET -rmdir POPOLODELNUOVOMONDO - -cp -R _ALL_SITES/$site _BAK/4/ - -cp -R src/statics _ALL_SITES/$site/ -cp -R src/db _ALL_SITES/$site/ -cp -R ./quasar.conf.js _ALL_SITES/$site/ -cp -R ./package.json _ALL_SITES/$site/ - +rmdir __popolodelnuovomondo.app +source __termine.sh diff --git a/termina_popolodelnuovomondo.app.sh b/termina_popolodelnuovomondo.app.sh index 37119431..a8f8d3ff 100755 --- a/termina_popolodelnuovomondo.app.sh +++ b/termina_popolodelnuovomondo.app.sh @@ -2,18 +2,6 @@ site=popolodelnuovomondo.app -echo "TERMINA A LAVORARE SU $site: (Sovrascrivo !)" > now.txt - -rmdir NEWFREEPLANET -rmdir POPOLODELNUOVOMONDO - -cp -R _ALL_SITES/$site _BAK/2/ - -cp -R src/statics _ALL_SITES/$site/ -cp -R src/db _ALL_SITES/$site/ -cp -R ./quasar.conf.js _ALL_SITES/$site/ -cp -R ./package.json _ALL_SITES/$site/ -cp -R ./.env.development _ALL_SITES/$site/ -cp -R ./.env.production _ALL_SITES/$site/ -cp -R ./.env.test _ALL_SITES/$site/ +rmdir __freeplanet.app +source __termine.sh