diff --git a/public/js/track.js b/public/js/track.js index 5f97353e..272b7957 100755 --- a/public/js/track.js +++ b/public/js/track.js @@ -4,7 +4,7 @@ function geturl() { if (miaurl.includes('localhost')) { return 'http://localhost:8084/' } - return 'https://mandalasolidale.freeplanet.app/' + return '' } function getidtrack() { diff --git a/public/upload/gallery/spaccata.jpg b/public/upload/gallery/spaccata.jpg new file mode 100644 index 00000000..6d618df7 Binary files /dev/null and b/public/upload/gallery/spaccata.jpg differ diff --git a/public/upload/none/bozza.jpg b/public/upload/none/bozza.jpg new file mode 100644 index 00000000..32843959 Binary files /dev/null and b/public/upload/none/bozza.jpg differ diff --git a/public/upload/none/citta.png b/public/upload/none/citta.png new file mode 100644 index 00000000..60bf39f1 Binary files /dev/null and b/public/upload/none/citta.png differ diff --git a/public/upload/none/matrimonio.jpeg b/public/upload/none/matrimonio.jpeg new file mode 100644 index 00000000..2ff1fa97 Binary files /dev/null and b/public/upload/none/matrimonio.jpeg differ diff --git a/public/upload/none/posizioni.png b/public/upload/none/posizioni.png new file mode 100644 index 00000000..d17afe2f Binary files /dev/null and b/public/upload/none/posizioni.png differ diff --git a/public/upload/none/serenita_interiore.jpg b/public/upload/none/serenita_interiore.jpg new file mode 100644 index 00000000..3d8fbb99 Binary files /dev/null and b/public/upload/none/serenita_interiore.jpg differ diff --git a/public/upload/none/temperare.png b/public/upload/none/temperare.png new file mode 100644 index 00000000..5669c290 Binary files /dev/null and b/public/upload/none/temperare.png differ diff --git a/public/upload/profile/paoloar77/alzata.jpg b/public/upload/profile/paoloar77/alzata.jpg new file mode 100644 index 00000000..3b5f15dd Binary files /dev/null and b/public/upload/profile/paoloar77/alzata.jpg differ diff --git a/public/upload/profile/paoloar77/ball4.jpg b/public/upload/profile/paoloar77/ball4.jpg new file mode 100644 index 00000000..42b89e4c Binary files /dev/null and b/public/upload/profile/paoloar77/ball4.jpg differ diff --git a/public/upload/profile/paoloar77/beachpao.jpg b/public/upload/profile/paoloar77/beachpao.jpg new file mode 100644 index 00000000..0bcedaa3 Binary files /dev/null and b/public/upload/profile/paoloar77/beachpao.jpg differ diff --git a/public/upload/profile/paoloar77/myskills/alzata.jpg b/public/upload/profile/paoloar77/myskills/alzata.jpg new file mode 100644 index 00000000..3b5f15dd Binary files /dev/null and b/public/upload/profile/paoloar77/myskills/alzata.jpg differ diff --git a/public/upload/profile/paoloar77/myskills/ball4.jpg b/public/upload/profile/paoloar77/myskills/ball4.jpg new file mode 100644 index 00000000..42b89e4c Binary files /dev/null and b/public/upload/profile/paoloar77/myskills/ball4.jpg differ diff --git a/public/upload/profile/paoloar77/myskills/beach1.jpg b/public/upload/profile/paoloar77/myskills/beach1.jpg new file mode 100644 index 00000000..d2ce67f2 Binary files /dev/null and b/public/upload/profile/paoloar77/myskills/beach1.jpg differ diff --git a/public/upload/undefined/serenita_interiore.jpg b/public/upload/undefined/serenita_interiore.jpg new file mode 100644 index 00000000..3d8fbb99 Binary files /dev/null and b/public/upload/undefined/serenita_interiore.jpg differ diff --git a/public/upload/users/ball4.jpg b/public/upload/users/ball4.jpg new file mode 100644 index 00000000..42b89e4c Binary files /dev/null and b/public/upload/users/ball4.jpg differ diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index 90f2daaf..990ed942 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -14,6 +14,11 @@ export default defineComponent({ type: Boolean, required: true, }, + single: { + type: Boolean, + required: false, + default: false, + }, title: String, directory: { type: String, @@ -72,14 +77,14 @@ export default defineComponent({ } function getnumimages() { - if (gallerylist.value && gallerylist.value) + if (gallerylist.value) return gallerylist.value.length else return 0 } function getlistimages() { - if (gallerylist.value && gallerylist.value) + if (gallerylist.value) return gallerylist.value.slice().sort((a: any, b: any) => a.order! - b.order!) else return null @@ -179,6 +184,7 @@ export default defineComponent({ // e.target.appendChild(draggedEl) e.target.classList.remove('drag-enter') + save() } } @@ -210,7 +216,8 @@ export default defineComponent({ gallerylist.value.push({ imagefile: file.name, order: getlastord() }) } - save() + if (!props.single) + save() } } @@ -219,6 +226,7 @@ export default defineComponent({ } function deleted(rec: any) { + console.log('deleted', rec.imagefile) // console.table(mylistimages) if (gallerylist.value) { @@ -231,7 +239,11 @@ export default defineComponent({ // console.table(mylistimages) - save() + console.log('single', props.single) + + if (!props.single) { + save() + } } } @@ -246,25 +258,41 @@ export default defineComponent({ async function deleteFile(rec: any) { + console.log('deleteFile....') const filename = getfullname(rec) // Delete File on server: const ris = await globalStore.DeleteFile({ filename }) + console.log('ris', ris) if (ris) deleted(rec) } function save() { - emit('showandsave', gallerylist.value) + if (gallerylist.value.length > 0) { + if (!props.single) { + emit('showandsave', gallerylist.value) + } else { + emit('showandsave', gallerylist.value[0].imagefile) + } + } + } + + function close() { + save() } function getsrcimg(gallerylistery: any) { - if (tools.getextfile(gallerylistery.imagefile) === 'pdf') - return 'images/images/pdf.jpg' - else - return 'upload/' + props.directory + '/' + gallerylistery.imagefile + if (gallerylistery) { + if (tools.getextfile(gallerylistery.imagefile) === 'pdf') + return 'images/images/pdf.jpg' + else + return 'upload/' + props.directory + '/' + gallerylistery.imagefile + } else { + return 'images/noimg.png'; + } } function getParamDir() { @@ -273,7 +301,7 @@ export default defineComponent({ function getUrl() { const myurl = tools.geturlupload() + getParamDir() - console.log('myurl', myurl) + // console.log('myurl', myurl) return myurl } @@ -301,6 +329,7 @@ export default defineComponent({ save, maximizedToggle, getUrl, + close, } } }) diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index ae1b0af3..92206efb 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -23,6 +23,7 @@