From 2b6411eb77805449b5e178a9a5d8728e285f4b24 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Sat, 9 Dec 2023 00:19:48 +0100 Subject: [PATCH] - Installazione primo Sito Web del server - Creazione prima pagina Home --- .env.prod.pcb | 54 +++++++++---------- .env.test.pcb | 2 +- .env.test_riso.pcb | 2 +- .vscode/settings.json | 15 ++++-- deploy_on_prod_pcb.sh | 26 +++++++++ src/components/CContactUser/CContactUser.ts | 5 +- src/components/CContactUser/CContactUser.vue | 1 + src/components/CMyInnerPage/CMyInnerPage.ts | 6 ++- src/components/CMyPage/CMyPage.ts | 3 ++ src/components/CMyPageElem/CMyPageElem.ts | 6 +++ src/components/CMyPageElem2/CMyPageElem2.ts | 3 ++ src/components/CSignIn/CSignIn.vue | 4 +- src/db/lang/ws_enUs.js | 1 + src/db/lang/ws_es.js | 1 + src/db/static_data.ts | 6 +-- src/model/GlobalStore.ts | 2 + src/model/Products.ts | 1 + src/rootgen/admin/confsite/confsite.vue | 20 +++++++ src/router/routesAdmin.ts | 4 +- src/statics/lang/it.js | 7 ++- src/store/Modules/fieldsTable.ts | 5 ++ src/store/Modules/tools.ts | 7 +-- src/store/Products.ts | 1 + src/store/UserStore.ts | 15 +++++- src/store/globalStore.ts | 2 + .../install_site/install_site-validate.ts | 2 +- src/views/admin/install_site/install_site.ts | 1 + 27 files changed, 152 insertions(+), 50 deletions(-) create mode 100755 deploy_on_prod_pcb.sh diff --git a/.env.prod.pcb b/.env.prod.pcb index e068be66..15d522f5 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,30 +1,26 @@ -DATABASE=PiuCheBuono -UDB=paofreeplanet -PDB=suerteFreePlanet@1A -SEND_EMAIL=1 -PORT=3000 -appTelegram_TEST=["17"] -appTelegram=["17"] -ENABLE_PUSHNOTIFICATION=1 +APP_VERSION="1.0.22" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="17" +DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=www.freeplanet_server -PORT_APP1="0" -DOMAIN=mongodb://localhost:32001/ -AUTH_MONGODB=1 -MONGODB_USER=admin -MONGODB_PWD=mypwadminREAL@1A -SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB -DEBUG=0 -LOCALE=0 -DELAY_SENDEMAIL=1000 -VAPI_KEY_SUBJECT="mailto:surya@riso.app" -PUBLIC_VAPI_KEY="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" -PRIVATE_VAPI_KEY="LVpFDJuKscdHuQr5pe20dFuYuWX1-ZRb6x72PP-Pp4I" -GCM_API_KEY="AIzaSyD7w1jztfVV05mX1iyxoI-r1pZWxuxdUK8" -PATH_CERT_KEY=key.pem -PATH_SERVER_CRT=cert.pem -PATH_SSL_ROOT_PEM=root.pem -PATH_SSL_CHAIN_PEM=chain.pem -PROD=0 -PROJECT_DESCR_MAIN='__PROJECTS' -SECRK=iUUb38v23jjDFaosWj92axkBOXCQ +SERVERDIR_WEBSITE="/var/customers/webs/paolouser/piuchebuono.app/" +APP_URL="https://piuchebuono.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://srv.piuchebuono.app:3000" +LOGO_REG='piuchebuono-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="------" +PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=0 diff --git a/.env.test.pcb b/.env.test.pcb index 458a9abf..13f3f910 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -11,7 +11,7 @@ LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://srv.piuchebuono.app:3001" -LOGO_REG='riso-logo-full.png' +LOGO_REG='piuchebuono-logo-full.png' TEST_NAME="" TEST_SURNAME="" TEST_EMAIL="" diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 733f826f..49f1cbb1 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -3,7 +3,7 @@ SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="/var/customers/webs/paolouser/testriso/" +SERVERDIR_WEBSITE="/var/customers/webs/paolouser/test.piuchebuono.app/" APP_URL="https://testriso.piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" diff --git a/.vscode/settings.json b/.vscode/settings.json index d4af05c8..47665f56 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,16 @@ { "vetur.validation.template": false, "vetur.format.enable": false, - "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"], + "eslint.validate": [ + "javascript", + "javascriptreact", + "typescript", + "vue" + ], "typescript.tsdk": "node_modules/typescript/lib", - "vetur.experimental.templateInterpolationService": true -} + "vetur.experimental.templateInterpolationService": true, + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/node_modules/**": true + }, +} \ No newline at end of file diff --git a/deploy_on_prod_pcb.sh b/deploy_on_prod_pcb.sh new file mode 100755 index 00000000..1eaec88a --- /dev/null +++ b/deploy_on_prod_pcb.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +source ./.env.prod.pcb + +cp .env.prod.pcb .env.production + +msg="*** IN PRODUZIONE !!!!! SEI SICURO DI INVIARE GLI AGGIORNAMENTI SUL SERVER DI PRODUZIONE ?? $SERVERDIR_WEBSITE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + echo $msg + risposta=$1 +fi + + +if [[ $risposta == "Y" || $risposta == "y" ]]; then + + npm run buildpwa + + echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." + rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE + + echo "Finito $SERVERDIR_WEBSITE " + +fi diff --git a/src/components/CContactUser/CContactUser.ts b/src/components/CContactUser/CContactUser.ts index fcdb1b81..19dc7c1b 100755 --- a/src/components/CContactUser/CContactUser.ts +++ b/src/components/CContactUser/CContactUser.ts @@ -3,7 +3,7 @@ import { useQuasar } from 'quasar' import { useI18n } from '@src/boot/i18n' import { useUserStore } from '@store/UserStore' import { useGlobalStore } from '@store/globalStore' -import { defineComponent, PropType, ref } from 'vue' +import { defineComponent, computed, PropType, ref } from 'vue' import { IUserFields } from 'model' import { shared_consts } from '@/common/shared_vuejs' import { CLabel } from '@/components/CLabel' @@ -35,6 +35,8 @@ export default defineComponent({ const showsendCoinTo = ref(false) const showingtooltip = ref(false) + const site = computed(() => globalStore.site) + function myusername() { return userStore.my.username } @@ -84,6 +86,7 @@ export default defineComponent({ myusername, showingtooltip, clickOpenSendCoin, + site, } }, }) diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 64241bae..67ea5f05 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -22,6 +22,7 @@ > {}) const globalStore = useGlobalStore() + const $router = useRouter() + function mounted() { // console.log('$route.path', $route.path) rec.value = globalStore.getPage(props.path) - console.log(rec) + + console.log('rec', rec) } onMounted(mounted) diff --git a/src/components/CMyPage/CMyPage.ts b/src/components/CMyPage/CMyPage.ts index 8b7603ec..6227b528 100755 --- a/src/components/CMyPage/CMyPage.ts +++ b/src/components/CMyPage/CMyPage.ts @@ -8,6 +8,7 @@ import { LandingFooter } from '@/components/LandingFooter' import { CImgTitle } from '../CImgTitle/index' import { CTitle } from '../CTitle/index' +import { useRouter } from 'vue-router' export default defineComponent({ name: 'CMyPage', @@ -51,10 +52,12 @@ export default defineComponent({ const mypath = toRef(props, 'mypath') const globalStore = useGlobalStore() + const $router = useRouter() const load = async (): Promise => { // console.log('load', mypath.value) if (mypath.value !== '') rec.value = await globalStore.loadPage('/' + mypath.value, 'cmypage') + } watch(() => props.mypath, async (to: string, from: string) => { diff --git a/src/components/CMyPageElem/CMyPageElem.ts b/src/components/CMyPageElem/CMyPageElem.ts index 27ac93cc..4be6c946 100755 --- a/src/components/CMyPageElem/CMyPageElem.ts +++ b/src/components/CMyPageElem/CMyPageElem.ts @@ -17,6 +17,7 @@ import { useQuasar } from 'quasar' import { useI18n } from '@/boot/i18n' import { shared_consts } from '@/common/shared_vuejs' import objectId from '@src/js/objectId' +import { useRouter } from 'vue-router' export default defineComponent({ name: 'CMyPageElem', @@ -62,6 +63,7 @@ export default defineComponent({ const { t } = useI18n() const globalStore = useGlobalStore() + const $router = useRouter() const editOn = computed({ get (): boolean { @@ -96,6 +98,10 @@ export default defineComponent({ }) } + if (mypathin.value === 'home_logout' && globalStore.site.name === 'local' && !rec.value) { + $router.replace('/install_site') + } + if (tools.isManager()) { // console.log('getcookie: ', editOn.value, mypathin.value) } diff --git a/src/components/CMyPageElem2/CMyPageElem2.ts b/src/components/CMyPageElem2/CMyPageElem2.ts index 526091e2..7d611021 100755 --- a/src/components/CMyPageElem2/CMyPageElem2.ts +++ b/src/components/CMyPageElem2/CMyPageElem2.ts @@ -17,6 +17,8 @@ import { useI18n } from '@/boot/i18n' import { shared_consts } from '@/common/shared_vuejs' import objectId from '@src/js/objectId' +import { useRouter } from 'vue-router' + export default defineComponent({ name: 'CMyPageElem2', components: { LandingFooter, CImgTitle, CTitle, CMyElem, CMyEditElem }, @@ -61,6 +63,7 @@ export default defineComponent({ const { t } = useI18n() const globalStore = useGlobalStore() + const $router = useRouter() const visuEditor = ref(false) const addOn = ref(false) diff --git a/src/components/CSignIn/CSignIn.vue b/src/components/CSignIn/CSignIn.vue index 4232473e..963b74c7 100755 --- a/src/components/CSignIn/CSignIn.vue +++ b/src/components/CSignIn/CSignIn.vue @@ -21,8 +21,8 @@ :rules="[ (val) => !!val || $t('reg.err.required'), (val) => - val.length >= 6 || - $t('reg.err.atleast') + ' 6 ' + $t('reg.err.char'), + val.length >= 5 || + $t('reg.err.atleast') + ' 5 ' + $t('reg.err.char'), ]" >