diff --git a/public/site/blueprints/files/image.yml b/public/site/blueprints/files/image.yml index 94b5fc1..d5417a3 100644 --- a/public/site/blueprints/files/image.yml +++ b/public/site/blueprints/files/image.yml @@ -11,5 +11,7 @@ fields: buttons: false size: small width: 1/2 + tags: + type: tags # tags: - # type: tags \ No newline at end of file + # type: tags diff --git a/public/site/config/routes/upload.php b/public/site/config/routes/upload.php index a589695..146333c 100644 --- a/public/site/config/routes/upload.php +++ b/public/site/config/routes/upload.php @@ -10,11 +10,12 @@ return [ $alerts = []; $success = ''; + $newFiles = []; + foreach ($uploads->get('images') as $upload) { // check for duplicate $files = $page->files(); $duplicates = $files->filter(function ($file) use ($upload) { - // get original safename without prefix $pos = strpos($file->filename(), '_'); $originalSafename = substr($file->filename(), $pos + 1); @@ -30,7 +31,7 @@ return [ try { $name = crc32($upload['name'].microtime()). '_' . $upload['name']; - $file = $page->createFile([ + $newFiles[] = $page->createFile([ 'source' => $upload['tmp_name'], 'filename' => $name, 'template' => 'default', @@ -43,7 +44,12 @@ return [ $alerts[$upload['name']] = $e->getMessage(); } } - return compact('alerts', 'success'); + + $images = array_map(function ($file) { + return $file->url(); + }, $newFiles); + + return compact('images', 'alerts', 'success'); } return [ diff --git a/src/components/project/ClientBrief/AddImages.vue b/src/components/project/ClientBrief/AddImages.vue index c7ba531..43b4542 100644 --- a/src/components/project/ClientBrief/AddImages.vue +++ b/src/components/project/ClientBrief/AddImages.vue @@ -68,48 +68,10 @@ - @@ -118,6 +80,7 @@ import Toast from "primevue/toast"; import FileUpload from "primevue/fileupload"; import { useToast } from "primevue/usetoast"; import { usePageStore } from "../../../stores/page"; +import { ref } from "vue"; const { page } = usePageStore(); const toast = useToast(); @@ -130,6 +93,8 @@ const beforeSend = (event) => { ); }; +const images = ref([]); + const onAdvancedUpload = (event) => { if (event.xhr.status === 200) { toast.add({ @@ -138,7 +103,9 @@ const onAdvancedUpload = (event) => { detail: event.xhr.response.success, life: 3000, }); - console.log(JSON.parse(event.xhr.response)); + const response = JSON.parse(event.xhr.response); + console.log(response); + images.value = response.images; } else { toast.add({ severity: "error",