diff --git a/.env.development b/.env.development index 4f0e9c9e..5448937a 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index c5aa9285..f88ad438 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index b25275cc..751d634c 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 515f6361..e6bd605d 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.prod.riso b/.env.prod.riso index 1a7351dc..314ca544 100644 --- a/.env.prod.riso +++ b/.env.prod.riso @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index d539b640..60d36cba 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 34269670..e829846c 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 0968bd31..1e9d72c9 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.test.risosrv b/.env.test.risosrv index 5bba9268..ca644178 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index 95962ad8..ac6cb999 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 45a5ee09..d5db3c32 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 7acc3f64..236b32d2 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" @@ -13,8 +13,8 @@ PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" LOGO_REG='abitaregliiblei-logo-full.png' -TEST_NAME="Paolo" -TEST_SURNAME="Arena" +TEST_NAME="Surya" +TEST_SURNAME="" TEST_EMAIL="" TEST_USERNAME="" TEST_PASSWORD="" diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json index 9816d79f..9f31ae9c 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,9 +1,9 @@ { "name": "abitaregliiblei", - "version": "1.1.18", + "version": "1.1.20", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", - "author": "Paolo Arena", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.development b/_ALL_SITES/comunitanuovomondo.app/.env.development index 4f0e9c9e..5448937a 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.development +++ b/_ALL_SITES/comunitanuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.test b/_ALL_SITES/comunitanuovomondo.app/.env.test index fb578180..ba5d5d4a 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.test +++ b/_ALL_SITES/comunitanuovomondo.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/comunitanuovomondo.app/package.json b/_ALL_SITES/comunitanuovomondo.app/package.json index 530c183d..0916e8c8 100755 --- a/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,9 +1,9 @@ { "name": "riso", - "version": "1.1.18", + "version": "1.1.20", "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", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 36849b79..8ef26ba0 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 b6000dc3..3c94dba9 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 2abfc5b7..752b9a1d 100755 --- a/_ALL_SITES/fioredellavita.riso.app/package.json +++ b/_ALL_SITES/fioredellavita.riso.app/package.json @@ -1,9 +1,9 @@ { "name": "fioredellavita", - "version": "1.1.18", + "version": "1.1.20", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", - "author": "Paolo Arena", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/_ALL_SITES/freeplanet.app/package.json b/_ALL_SITES/freeplanet.app/package.json index 15811c41..23623197 100755 --- a/_ALL_SITES/freeplanet.app/package.json +++ b/_ALL_SITES/freeplanet.app/package.json @@ -3,7 +3,7 @@ "version": "0.0.8", "description": "FreePlanet", "productName": "FreePlanet", - "author": "Paolo Arena", + "author": "Surya", "private": true, "keywords": [ ], diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index 7d35fcb3..1121d220 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" @@ -13,8 +13,8 @@ PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" LOGO_REG='gruppomacro-logo-full.png' -TEST_NAME="Paolo" -TEST_SURNAME="Arena" +TEST_NAME="Surya" +TEST_SURNAME="" TEST_EMAIL="" TEST_USERNAME="" TEST_PASSWORD="" diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index 34269670..e829846c 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index 9c57891a..184fe0dd 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,9 +1,9 @@ { "name": "gruppomacro", - "version": "1.1.18", + "version": "1.1.20", "description": "GruppoMacro", "productName": "Gruppo Macro", - "author": "Paolo Arena", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 1094f3a8..52dd0421 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 0968bd31..1e9d72c9 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/package.json b/_ALL_SITES/piuchebuono.app/package.json index 4099126f..d78cec97 100755 --- a/_ALL_SITES/piuchebuono.app/package.json +++ b/_ALL_SITES/piuchebuono.app/package.json @@ -1,9 +1,9 @@ { "name": "piuchebuono", - "version": "1.1.18", + "version": "1.1.20", "description": "PiuCheBuono", "productName": "PiuCheBuono", - "author": "Paolo Arena", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 4f0e9c9e..5448937a 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 2969bb46..b44a2d3d 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" 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 fb578180..ba5d5d4a 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.18" +APP_VERSION="1.1.20" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/images/riso-logo-full.png b/_ALL_SITES/riso.app/images/riso-logo-full.png index 38a9695f..51a29654 100644 Binary files a/_ALL_SITES/riso.app/images/riso-logo-full.png and b/_ALL_SITES/riso.app/images/riso-logo-full.png differ diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 530c183d..0916e8c8 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,9 +1,9 @@ { "name": "riso", - "version": "1.1.18", + "version": "1.1.20", "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", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/package.json b/package.json index 530c183d..0916e8c8 100755 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "riso", - "version": "1.1.18", + "version": "1.1.20", "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", + "author": "Surya", "private": true, "keywords": [], "license": "MIT", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index b2da4259..7342b37e 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => { }); -const APP_VERSION = "1.1.18"; +const APP_VERSION = "1.1.20"; console.log(' [ VER-' + APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index cc09346b..d0718473 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -169,6 +169,7 @@ export const shared_consts = { EDITADDRESSBYCOORD: 390, GRID_ORIZ: 400, QRCODE: 410, + CATALOGLIST: 420, }, QUERYTYPE_MYGROUP: 1, @@ -295,6 +296,7 @@ export const shared_consts = { TABLES_CIRCUITS: 'circuits', TABLES_MYGROUPS: 'mygroups', TABLES_ATTIVITAS: 'attivitas', + TABLES_CATALOG: 'catalogs', TABFILTRI_UTENTE: 'filtriutente', @@ -394,7 +396,7 @@ export const shared_consts = { TABLES_UPDATE_LASTIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots'], TABLES_FINDER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], - TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], + TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups', 'catalogs'], TABLES_SHOW_ADTYPE: ['myskills', 'mygoods', 'myhosps'], TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'users'], @@ -406,9 +408,11 @@ export const shared_consts = { TABLES_VISU_IMG: ['myskills', 'myhosps', 'mygoods', 'mygroups'], TABLES_DIRECTORY_A_PARTE: ['mygroups'], TABLES_WITH_ADMINS: ['mygroups', 'circuits'], - TABLES_DIRECTORY_SINGLE_IMG: ['circuits'], + TABLES_DIRECTORY_SINGLE_IMG: ['circuits', 'catalogs'], TABLES_IMAGEFILE_SINGOLO: ['productInfos'], + TABLES_PER_EDITORI: ['catalogs'], + TABLES_VISU_MAP: 'attivitas', VISIB_ALL: 0, @@ -1174,7 +1178,7 @@ export const shared_consts = { }, { id: 4, - label: 'a Paolo (test)', + label: 'a Surya (test)', value: 20, }, { @@ -1763,6 +1767,10 @@ export const shared_consts = { value: 410, label: 'Qr Code', }, + { + value: 420, + label: 'Lista Cataloghi', + }, ], TypesElemAdminTools: [ diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts index 2be7069e..9418ce3b 100755 --- a/src/components/CBarSelection/CBarSelection.ts +++ b/src/components/CBarSelection/CBarSelection.ts @@ -123,6 +123,17 @@ export default defineComponent({ } return '' }) + const colorsel = computed(() => { + const myarr: any = tools.getoptionsMainCards(false) + if (myarr) { + const rec = myarr.find((rec: any) => rec.value === tablesel.value) + + if (rec) { + return rec.color + } + } + return '' + }) const myfilter = ref('') const myfilterand: any = ref([]) let rowsel: any = {} @@ -362,6 +373,7 @@ export default defineComponent({ iconsel, filtri, clickButtBar, + colorsel, } } }) diff --git a/src/components/CBarSelection/CBarSelection.vue b/src/components/CBarSelection/CBarSelection.vue index 08b0605e..0f193b41 100755 --- a/src/components/CBarSelection/CBarSelection.vue +++ b/src/components/CBarSelection/CBarSelection.vue @@ -25,20 +25,22 @@ /> -
+