diff --git a/deploy_spa_on_production.sh b/deploy_spa_on_production.sh new file mode 100755 index 00000000..94305151 --- /dev/null +++ b/deploy_spa_on_production.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +source ./.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 buildspa + + echo "Sincronizzazione in remoto..." + + echo "Sincronizzazione in remoto $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/deploy_spa_test_server.sh b/deploy_spa_test_server.sh new file mode 100755 index 00000000..d699ef43 --- /dev/null +++ b/deploy_spa_test_server.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +source ./.env.test + +msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + risposta=$1 +fi + +cd /home/paolo/myproject/$DIRECTORY_LOCAL/ +cp .env.production .env.prod.bak +cp .env.test .env.production + +sleep 1 + +npm run buildspa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/inizia_kolibrilab.it.sh b/inizia_kolibrilab.it.sh new file mode 100755 index 00000000..0ed87dd9 --- /dev/null +++ b/inizia_kolibrilab.it.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +site=kolibrilab.it + +if [ -d "__freeplanet.app" ]; then + rmdir __freeplanet.app +fi + +if [ -d "__kolibrilab.it" ]; then + rmdir __kolibrilab.it +fi + +if [ -d "__arcadei.it" ]; then + rmdir __arcadei.it +fi + +if [ -d "__riso.app" ]; then + rmdir __riso.app +fi + +if [ -d "__popolodelnuovomondo.app" ]; then + rmdir __popolodelnuovomondo.app +fi + +if [ -d "__terradellavisione.app" ]; then + rmdir __terradellavisione.app +fi + + +source __inizia.sh diff --git a/send_to_production.sh b/send_pwa_to_production.sh similarity index 100% rename from send_to_production.sh rename to send_pwa_to_production.sh diff --git a/send_to_test.sh b/send_pwa_to_test.sh similarity index 100% rename from send_to_test.sh rename to send_pwa_to_test.sh diff --git a/send_spa_to_production.sh b/send_spa_to_production.sh new file mode 100755 index 00000000..cab43286 --- /dev/null +++ b/send_spa_to_production.sh @@ -0,0 +1,14 @@ +#!/bin/bash + + +source ./.env.production + +read -p "*** IN PRODUZIONE !!!!! SEI SICURO DI INVIARE GLI AGGIORNAMENTI SUL SERVER DI PRODUZIONE ?? $SERVERDIR_WEBSITE (Y/N) ? " risposta + +if [[ $risposta == "Y" || $risposta == "y" ]]; then + + + echo "Sincronizzazione in remoto $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/send_spa_to_test.sh b/send_spa_to_test.sh new file mode 100755 index 00000000..565424d3 --- /dev/null +++ b/send_spa_to_test.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source ./.env.test + +cp .env.test .env.production + +echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +echo "Finito $SERVERDIR_WEBSITE" + +cp .env.prod.bak .env.production diff --git a/src/components/CMyElem/CMyElem.scss b/src/components/CMyElem/CMyElem.scss index 252b6c61..14ed7a2c 100755 --- a/src/components/CMyElem/CMyElem.scss +++ b/src/components/CMyElem/CMyElem.scss @@ -443,3 +443,22 @@ body.mobile .landing:before { color: #999; letter-spacing: 0.093rem; } + +.clEditDiv { + border: #c8c9cb solid 2px; + padding: 2px; +} + +.clEditNotActive { + background-color: #e6e6e6; +} + +.clEdit { + border: #f69f09 solid 2px; + padding: 2px; +} + +.clEdit:hover { + border: #11f609 solid 2px; + cursor: pointer; +} diff --git a/src/components/CMyElem/CMyElem.ts b/src/components/CMyElem/CMyElem.ts index f4ad0674..133cf9ea 100755 --- a/src/components/CMyElem/CMyElem.ts +++ b/src/components/CMyElem/CMyElem.ts @@ -16,6 +16,7 @@ import { CMyPage } from '@src/components/CMyPage' import { CMyPageIntro } from '@src/components/CMyPageIntro' import { CEventsCalendar } from '@src/components/CEventsCalendar' import { CMyEditor } from '@src/components/CMyEditor' +import { CMyFieldRec } from '@src/components/CMyFieldRec' import MixinMetaTags from '@/mixins/mixin-metatags' import { useQuasar } from 'quasar' @@ -23,12 +24,17 @@ import { useI18n } from '@/boot/i18n' export default defineComponent({ name: 'CMyElem', - components: { CImgTitle, CTitle, LandingFooter, CEventsCalendar, CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro, CMyEditor }, + components: { CImgTitle, CTitle, LandingFooter, CEventsCalendar, CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro, CMyEditor, CMyFieldRec }, props: { myelem: { type: Object as PropType, required: true, }, + path: { + type: String, + required: false, + default: '', + }, editOn: { type: Boolean, required: false, @@ -52,6 +58,8 @@ export default defineComponent({ const slide = ref(0) const slide2 = ref(0) const disableSave = ref(true) + const enableEdit = ref(false) + const enableAdd = ref(true) const neworder = ref(0) @@ -73,7 +81,7 @@ export default defineComponent({ return '600px' } - function saveElem() { + function saveElem(exit?: boolean) { // Save Elem record const myelem = props.myelem myelem.order = neworder.value @@ -81,6 +89,8 @@ export default defineComponent({ if (ris) { // OK disableSave.value = true + if (exit) + enableEdit.value = false } }) } @@ -96,6 +106,11 @@ export default defineComponent({ container: '' } + if (newrec.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS) { + newrec.container2 = '8' + newrec.height = 600 + } + globalStore.addNewElem($q, t, newrec) } @@ -134,6 +149,12 @@ export default defineComponent({ newtype.value = props.myelem.type } + function clickOnElem() { + if (props.editOn) { + enableEdit.value = true + } + } + onMounted(mounted) return { @@ -154,6 +175,9 @@ export default defineComponent({ addNewElem, newtype, neworder, + enableEdit, + enableAdd, + clickOnElem, } }, diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 524128a5..20161cf1 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -1,6 +1,25 @@ diff --git a/src/components/CMyFieldRec/CMyFieldRec.vue b/src/components/CMyFieldRec/CMyFieldRec.vue index 04f806fc..e8feefd4 100755 --- a/src/components/CMyFieldRec/CMyFieldRec.vue +++ b/src/components/CMyFieldRec/CMyFieldRec.vue @@ -1,7 +1,5 @@