From e9ac281125461de1da9be4f755d54121e5857e3c Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 6 Sep 2024 19:57:17 +0200 Subject: [PATCH] - AbitaregliIblei.it - Server aggiornamenti agli script. - Editor HTML corretto un po'. - Record Mysql per server (appena iniziato) --- .env.development | 2 +- .env.example.production | 2 +- .env.prod.gruppomacro | 2 +- .env.prod.pcb | 2 +- .env.test.abitaregliiblei.it | 28 +++ .env.test.gruppomacro | 2 +- .env.test.pcb | 2 +- .env.test.risosrv | 2 +- .env.test2 | 2 +- .env.test_riso.pcb | 2 +- .../abitaregliiblei.it/.env.development | 2 +- _ALL_SITES/abitaregliiblei.it/.env.test | 2 +- _ALL_SITES/abitaregliiblei.it/package.json | 4 +- .../fioredellavita.riso.app/.env.development | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.test | 2 +- .../fioredellavita.riso.app/package.json | 4 +- _ALL_SITES/gruppomacro.app/.env.development | 2 +- _ALL_SITES/gruppomacro.app/.env.test | 2 +- _ALL_SITES/gruppomacro.app/package.json | 4 +- _ALL_SITES/piuchebuono.app/.env.development | 2 +- _ALL_SITES/piuchebuono.app/.env.test | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- _ALL_SITES/riso.app/package.json | 4 +- deploy_on_test_abitaregliiblei.it.sh | 28 +++ package.json | 4 +- send_pwa_to_test_abitaregliiblei.it.sh | 11 + src-pwa/custom-service-worker.js | 2 +- .../CMyCardService/CMyCardService.vue | 13 +- src/components/CMyEditElem/CMyEditElem.ts | 30 ++- src/components/CMyEditElem/CMyEditElem.vue | 121 ++++++----- src/components/CMyElem/CMyElem.ts | 6 +- src/components/CMyElem/CMyElem.vue | 30 +-- src/components/CMyImg/CMyImg.ts | 4 +- src/components/CMyPageElem/CMyPageElem.ts | 12 +- src/components/CMyPageElem/CMyPageElem.vue | 21 +- src/components/CMyPopupEdit/CMyPopupEdit.ts | 2 +- src/css/app.scss | 86 +++++--- src/index.template.html | 2 +- src/statics/lang/it.js | 1 + src/store/globalStore.ts | 29 +++ src/views/admin/server/server.scss | 4 + src/views/admin/server/server.ts | 193 +++++++++++++++++- src/views/admin/server/server.vue | 129 +++++++++++- src/views/admin/servermysql/index.ts | 1 + src/views/admin/servermysql/servermysql.scss | 47 +++++ src/views/admin/servermysql/servermysql.ts | 52 +++++ src/views/admin/servermysql/servermysql.vue | 38 ++++ src/views/user/myfriends/myfriends.ts | 2 +- 50 files changed, 797 insertions(+), 155 deletions(-) create mode 100755 .env.test.abitaregliiblei.it create mode 100755 deploy_on_test_abitaregliiblei.it.sh create mode 100755 send_pwa_to_test_abitaregliiblei.it.sh create mode 100755 src/views/admin/servermysql/index.ts create mode 100755 src/views/admin/servermysql/servermysql.scss create mode 100755 src/views/admin/servermysql/servermysql.ts create mode 100755 src/views/admin/servermysql/servermysql.vue diff --git a/.env.development b/.env.development index 9ab77409..ec161ecb 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index b884464d..4ca61c80 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index 1bd81dbc..8173f968 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index be9124a1..1d62a13a 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it new file mode 100755 index 00000000..95163069 --- /dev/null +++ b/.env.test.abitaregliiblei.it @@ -0,0 +1,28 @@ +APP_VERSION="1.0.56" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="19" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="/var/www/test.abitaregliiblei.it" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://test.abitaregliiblei.it" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://testapi.abitaregliiblei.it" +LOGO_REG='abitaregliiblei-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index cd60661a..680c55a4 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 94d2755d..c8d2f38c 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index f46278e5..29f28b25 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker_1.0.39.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index d8312ba8..05b36302 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index ebb104b6..5ad4a0e6 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/abitaregliiblei.it/.env.development b/_ALL_SITES/abitaregliiblei.it/.env.development index d30ec7e5..2054dc98 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/abitaregliiblei.it/.env.test b/_ALL_SITES/abitaregliiblei.it/.env.test index b63085a7..e67aa81a 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.test +++ b/_ALL_SITES/abitaregliiblei.it/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json index 313274df..e5383a03 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.0.55", + "version": "1.0.56", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", @@ -153,4 +153,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 89068fa9..d97f9f35 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.test b/_ALL_SITES/fioredellavita.riso.app/.env.test index a567cf73..661caa9c 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/package.json b/_ALL_SITES/fioredellavita.riso.app/package.json index d6d73265..b72a197d 100755 --- a/_ALL_SITES/fioredellavita.riso.app/package.json +++ b/_ALL_SITES/fioredellavita.riso.app/package.json @@ -1,6 +1,6 @@ { "name": "fioredellavita", - "version": "1.0.55", + "version": "1.0.56", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", "author": "Paolo Arena", @@ -140,4 +140,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index 49d6526a..9acaa7b7 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index a533a58d..2e22bd43 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index b3687753..12306180 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.0.55", + "version": "1.0.56", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Paolo Arena", @@ -157,4 +157,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 31f462d0..520dde8f 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 01464e66..1194bd23 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index ba1530e8..b7e70016 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 1614d7ea..a5dc3d6c 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index a533a58d..2e22bd43 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.55" +APP_VERSION="1.0.56" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index b20a6dcd..c6be183b 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.0.55", + "version": "1.0.56", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", @@ -153,4 +153,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/deploy_on_test_abitaregliiblei.it.sh b/deploy_on_test_abitaregliiblei.it.sh new file mode 100755 index 00000000..4f38b8f5 --- /dev/null +++ b/deploy_on_test_abitaregliiblei.it.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +source ./.env.test.abitaregliiblei.it + +msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + risposta=$1 +fi + +cp .env.production .env.prod.bak +cp .env.test.abitaregliiblei.it .env.production + +sleep 1 + +npm run buildpwa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/package.json b/package.json index 4e1f3e15..0eebe9e3 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.0.55", + "version": "1.0.56", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", @@ -155,4 +155,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/send_pwa_to_test_abitaregliiblei.it.sh b/send_pwa_to_test_abitaregliiblei.it.sh new file mode 100755 index 00000000..21304d17 --- /dev/null +++ b/send_pwa_to_test_abitaregliiblei.it.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source .env.test.abitaregliiblei.it + +cp .env.test.abitaregliiblei.it .env.production + +echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +echo "Finito $SERVERDIR_WEBSITE" + +cp .env.prod.bak .env.production diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 88619be5..fd1862e1 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => { }); -const VersioneApp = "1.0.55"; +const VersioneApp = "1.0.56"; console.log(' [ VER-' + VersioneApp + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index ab526e45..03c513de 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -630,8 +630,8 @@ myrec.mycities[0].comune " > - - + + @@ -652,10 +652,7 @@ }} - + @@ -673,7 +670,9 @@ diff --git a/src/components/CMyEditElem/CMyEditElem.ts b/src/components/CMyEditElem/CMyEditElem.ts index d60ac27a..dd899fa4 100755 --- a/src/components/CMyEditElem/CMyEditElem.ts +++ b/src/components/CMyEditElem/CMyEditElem.ts @@ -201,7 +201,7 @@ export default defineComponent({ if (!myel.value.elemsText) myel.value.elemsText = [] - myel.value.elemsText.push({ _id: objectId(), text: '', color: '#ffffff', class: '', size: '', anim: { name: 'FadeIn', clduration: '', cldelay: '', timingtype: 'ease-in-out'} }) + myel.value.elemsText.push({ _id: objectId(), text: '', color: '#ffffff', class: '', size: '', anim: { name: 'FadeIn', clduration: '', cldelay: '', timingtype: 'ease-in-out' } }) modifElem() } @@ -255,7 +255,7 @@ export default defineComponent({ }) } } else if ((props.myelem.type === shared_consts.ELEMTYPE.IMGTITLE) || - (props.myelem.type === shared_consts.ELEMTYPE.IMAGE)) { + (props.myelem.type === shared_consts.ELEMTYPE.IMAGE)) { myel.value.image = myval } modifElem() @@ -263,11 +263,11 @@ export default defineComponent({ function showAnimation() { return (myel.value.type === shared_consts.ELEMTYPE.IMAGE) - || (myel.value.type === shared_consts.ELEMTYPE.IMGTITLE) - || (myel.value.type === shared_consts.ELEMTYPE.TEXT) - || (myel.value.type === shared_consts.ELEMTYPE.CARD) - || (myel.value.type === shared_consts.ELEMTYPE.HTML) - || (myel.value.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS) + || (myel.value.type === shared_consts.ELEMTYPE.IMGTITLE) + || (myel.value.type === shared_consts.ELEMTYPE.TEXT) + || (myel.value.type === shared_consts.ELEMTYPE.CARD) + || (myel.value.type === shared_consts.ELEMTYPE.HTML) + || (myel.value.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS) } function updateElem(myvalue: any) { @@ -278,6 +278,20 @@ export default defineComponent({ modifElem() } + function generateSizeOptions() { + const options = []; + for (let i = 0; i <= 700; i += 50) { + options.push({ label: `${i}px`, value: `${i}px` }); + } + return options; + } + + function updateSizeWidth(value: any) { + // Gestisce l'input dell'utente per un nuovo valore + myel.value.widthimg = value; // Aggiorna widthimg con il nuovo valore + modifElem() + } + onMounted(mounted) return { @@ -318,6 +332,8 @@ export default defineComponent({ visuadd, tabadd, Products, + generateSizeOptions, + updateSizeWidth, } }, diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 0cb26c08..9ee2eb1b 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -59,41 +59,45 @@ > -
- - - - +
+
+ + + +
- - + style="width: 150px" + />
- - + @new-value="updateSizeWidth" + style="width: 150px" + /> +
- - + dense + use-input + use-chips + @new-value="updateSizeWidth" + style="width: 150px" + />
-
Cataloghi:

- +
Cataloghi:
+
+ - + - Versione PDF: - + Versione PDF: + +
+


globalStore.isAppRunning) - const coordaddr = ref( { address: '', coordinates: [0, 0] }) - + const coordaddr = ref({ address: '', coordinates: [0, 0] }) + watch(() => myel.value.order, (value, oldval) => { mounted() }) diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 7e1744b7..fe6297ec 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -513,10 +513,10 @@
-
-
- Bottone Chat Territoriale -
+
+
Bottone Chat Territoriale
@@ -559,8 +563,7 @@
PRODOTTI CATALOGO:
- +
MAPPA:
@@ -570,25 +573,22 @@
MAPPA UTENTI:
- +
MAPPA COORDINATE:
- +
EDIT ADDRESS BY COORD:
-
MAPPA COMUNI:
- +
STRUMENTI AI:
diff --git a/src/components/CMyImg/CMyImg.ts b/src/components/CMyImg/CMyImg.ts index 2e45300f..61701fb2 100755 --- a/src/components/CMyImg/CMyImg.ts +++ b/src/components/CMyImg/CMyImg.ts @@ -24,8 +24,8 @@ export default defineComponent({ const mystyle = ref('') function mounted() { - console.log('mounted') - console.log(props.src) + + // console.log(props.src) if (props.width) mystyle.value = 'max-width: ' + props.width + 'px; ' diff --git a/src/components/CMyPageElem/CMyPageElem.ts b/src/components/CMyPageElem/CMyPageElem.ts index e84851a2..b1951540 100755 --- a/src/components/CMyPageElem/CMyPageElem.ts +++ b/src/components/CMyPageElem/CMyPageElem.ts @@ -65,12 +65,14 @@ export default defineComponent({ const globalStore = useGlobalStore() const $router = useRouter() + const mywidthEditor = ref(400) + const editOn = computed({ - get (): boolean { + get(): boolean { return !!globalStore.editOn ? globalStore.editOn : false }, - set (value: boolean) { + set(value: boolean) { return globalStore.editOn = value } }) @@ -141,6 +143,10 @@ export default defineComponent({ globalStore.changeVisuDrawer(path, edit) } + function toggleSize() { + mywidthEditor.value = mywidthEditor.value === 400 ? 1200 : 400 + } + onMounted(mounted) return { @@ -156,6 +162,8 @@ export default defineComponent({ selElem, saveElem, changeVisuDrawer, + mywidthEditor, + toggleSize, } }, diff --git a/src/components/CMyPageElem/CMyPageElem.vue b/src/components/CMyPageElem/CMyPageElem.vue index de9550ed..702bd252 100755 --- a/src/components/CMyPageElem/CMyPageElem.vue +++ b/src/components/CMyPageElem/CMyPageElem.vue @@ -1,7 +1,7 @@