- Messo in Linea: Primo Test !

2022-01-05 00:39:13 +01:00
parent 1008f3a166
commit cb04da6861
19 changed files with 67 additions and 53 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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/"
--- 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
--- 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,
    }
  },
 })
--- 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 !
            </div>
            <template v-slot:action>
-              <q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" @click="getLinkBotTelegram()"/>
+              <q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" type="a" target="__blank" :href="getLinkBotTelegram()"/>
            </template>
          </q-banner>
        </div>
--- 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": [
--- 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',
--- 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
--- 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à',
--- 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,
--- 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,
    }
  },
 })
--- a/src/root/home/home.vue
+++ b/src/root/home/home.vue
@@ -11,6 +11,7 @@

    <!--<CMapsEsempio></CMapsEsempio>-->

+
    <div v-if="isLogged()">
      <CVerifyEmail v-if="!isEmailVerified()">

@@ -20,6 +21,7 @@

      </CVerifyTelegram>

+      <div v-if="isUserOk()">
        <div v-if="isUserOk()">
          <q-banner rounded class="bg-primary text-white">
            <div class="text-h6 text-center">
@@ -27,10 +29,11 @@
              per vedere tutti i Menu e le chat !
            </div>
            <template v-slot:action>
-            <q-btn flat color="white" label="Accedi al Bot Telegram" @click="getLinkBotTelegram()"/>
+              <q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" type="a" target="__blank" :href="getLinkBotTelegram()"/>
            </template>
          </q-banner>
        </div>
+      </div>

    </div>
    <div v-else>
--- 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 }),