diff --git a/public/content/home/home.txt b/public/content/home/home.txt index 5f21997..933fc14 100644 --- a/public/content/home/home.txt +++ b/public/content/home/home.txt @@ -18,4 +18,8 @@ Testimage: - file://4xs4UNZhQf3jLvsG ---- -Uuid: 6yh1yt2Sk45Y2sOl \ No newline at end of file +Uuid: 6yh1yt2Sk45Y2sOl + +---- + +Clientbriefimages: - file://ihuGLrw5vll0R4j2 \ No newline at end of file diff --git a/public/content/home/image.png.txt b/public/content/home/image.png.txt index ac2b32c..4a6e327 100644 --- a/public/content/home/image.png.txt +++ b/public/content/home/image.png.txt @@ -1 +1,5 @@ -Template: blocks/image \ No newline at end of file +Template: blocks/image + +---- + +Uuid: vHs87W6sM0r43thr \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg new file mode 100644 index 0000000..a357c44 Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg.txt new file mode 100644 index 0000000..702467d --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1635712792_3ec586eada3d59adcd3e9bfb064380b495ef2306.jpg.txt @@ -0,0 +1,17 @@ +Description: nouvelle description + +---- + +Tags: matériaux & textures + +---- + +Date: 2024-10-09 05:10 + +---- + +Uuid: vs4tgLg5q6QFeb43 + +---- + +Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1646360903_perfume-144546_1280.jpg similarity index 100% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1646360903_perfume-144546_1280.jpg diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1646360903_perfume-144546_1280.jpg.txt similarity index 51% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1646360903_perfume-144546_1280.jpg.txt index d8e7146..69aaf3f 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-144546_1280.jpg.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1646360903_perfume-144546_1280.jpg.txt @@ -1,3 +1,7 @@ +Date: 2024-10-09 05:10 + +---- + Description: ---- @@ -6,7 +10,7 @@ Tags: ---- -Uuid: Ke2XIraa5jlvtOdb +Uuid: Nlkd6hX666PBBYlk ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2721147_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2873716079_perfume-2721147_1280.jpg similarity index 100% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2721147_1280.jpg rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2873716079_perfume-2721147_1280.jpg diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2643349_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2873716079_perfume-2721147_1280.jpg.txt similarity index 51% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2643349_1280.jpg.txt rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2873716079_perfume-2721147_1280.jpg.txt index 3142f09..2005012 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2643349_1280.jpg.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/2873716079_perfume-2721147_1280.jpg.txt @@ -1,3 +1,7 @@ +Date: 2024-10-09 05:10 + +---- + Description: ---- @@ -6,7 +10,7 @@ Tags: ---- -Uuid: nqa5cCGHGoWQXulB +Uuid: UkFMsBPXVGpQMmXV ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg new file mode 100644 index 0000000..8cb0aa6 Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-4718455_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg.txt similarity index 51% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-4718455_1280.jpg.txt rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg.txt index efcd959..b199605 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-4718455_1280.jpg.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/3086164329_black-1984277_1280.jpg.txt @@ -1,3 +1,7 @@ +Date: 2024-10-09 05:10 + +---- + Description: ---- @@ -6,7 +10,7 @@ Tags: ---- -Uuid: FWKdZwxSimGOaO2x +Uuid: DknJcJ7YnG29JXUN ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-1042715_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4156556841_perfume-1042715_1280.jpg similarity index 100% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-1042715_1280.jpg rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4156556841_perfume-1042715_1280.jpg diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4156556841_perfume-1042715_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4156556841_perfume-1042715_1280.jpg.txt new file mode 100644 index 0000000..c9cc5e7 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4156556841_perfume-1042715_1280.jpg.txt @@ -0,0 +1,17 @@ +Date: 2024-10-09 05:10 + +---- + +Description: + +---- + +Tags: + +---- + +Uuid: zGisP0BopebPl2ex + +---- + +Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-4718455_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/657342780_perfume-4718455_1280.jpg similarity index 100% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-4718455_1280.jpg rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/657342780_perfume-4718455_1280.jpg diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/657342780_perfume-4718455_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/657342780_perfume-4718455_1280.jpg.txt new file mode 100644 index 0000000..94b543b --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/657342780_perfume-4718455_1280.jpg.txt @@ -0,0 +1,17 @@ +Date: 2024-10-09 05:10 + +---- + +Description: + +---- + +Tags: + +---- + +Uuid: 2Nt5Vv2SrGcE1iro + +---- + +Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2643349_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/925109600_perfume-2643349_1280.jpg similarity index 100% rename from public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2643349_1280.jpg rename to public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/925109600_perfume-2643349_1280.jpg diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/925109600_perfume-2643349_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/925109600_perfume-2643349_1280.jpg.txt new file mode 100644 index 0000000..7b97f18 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/925109600_perfume-2643349_1280.jpg.txt @@ -0,0 +1,17 @@ +Date: 2024-10-09 05:10 + +---- + +Description: + +---- + +Tags: + +---- + +Uuid: ih7KMM6KjNoQ2umR + +---- + +Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt index 717df0d..c11b3fd 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt @@ -16,12 +16,13 @@ Description: test Clientbriefimages: -- file://b4Ywx4ProE0Smc0Q -- file://aCuD18YBmLHg6YaS -- file://Ke2XIraa5jlvtOdb -- file://QBax5c69DcENi2rt -- file://nqa5cCGHGoWQXulB -- file://FWKdZwxSimGOaO2x +- file://DknJcJ7YnG29JXUN +- file://Nlkd6hX666PBBYlk +- file://zGisP0BopebPl2ex +- file://ih7KMM6KjNoQ2umR +- file://UkFMsBPXVGpQMmXV +- file://2Nt5Vv2SrGcE1iro +- file://vs4tgLg5q6QFeb43 ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-1042715_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-1042715_1280.jpg.txt deleted file mode 100644 index f00d83c..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-1042715_1280.jpg.txt +++ /dev/null @@ -1,13 +0,0 @@ -Description: - ----- - -Tags: forme & design, coloris & nuances - ----- - -Uuid: QBax5c69DcENi2rt - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2721147_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2721147_1280.jpg.txt deleted file mode 100644 index 743704f..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/perfume-2721147_1280.jpg.txt +++ /dev/null @@ -1,13 +0,0 @@ -Description: test de description mais - ----- - -Tags: parachèvements - ----- - -Uuid: b4Ywx4ProE0Smc0Q - ----- - -Template: image \ No newline at end of file diff --git a/public/site/config/routes/upload-images.php b/public/site/config/routes/upload-images.php index 010955b..45797fc 100644 --- a/public/site/config/routes/upload-images.php +++ b/public/site/config/routes/upload-images.php @@ -4,19 +4,19 @@ return [ 'pattern' => 'upload-images.json', 'method' => 'POST', 'action' => function () { - if ($uploads = kirby()->request()->files()) { + if ($uploads = kirby()->request()->files()) { $pageUri = kirby()->request()->query()->get('pageUri'); - $page = page($pageUri); + $page = page($pageUri); + + $allFiles = $page->clientBriefImages()->toFiles()->pluck('uuid', ','); $alerts = []; - $success = ''; - $newFiles = []; - $allFiles = []; 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); @@ -26,9 +26,14 @@ return [ }); if ($duplicates->count() > 0) { - $alerts[$upload['name']] = "The file already exists"; + $duplicate = $duplicates->first(); + + if (in_array($duplicate->uuid(), $allFiles)) { + $allFiles[] = $duplicate->uuid(); + $alerts[$upload['name']] = "The file already exists, added to the field."; + } } - + try { $name = crc32($upload['name'].microtime()). '_' . $upload['name']; $newFile = $page->createFile([ @@ -49,19 +54,24 @@ return [ $alerts[$upload['name']] = $e->getMessage(); } } - - $images = array_map(function ($file) { - return [ - 'url' => $file->url(), - 'uuid' => $file->uuid() - ]; - }, $newFiles); - + $newPage = $page->update([ 'clientBriefImages' => $allFiles ]); - return compact('images', 'alerts', 'success'); + $images = []; + + foreach ($newPage->clientBriefImages()->toFiles() as $image) { + $images[] = [ + 'url' => $image->url(), + 'uuid' => (string) $image->uuid(), + 'tags' => $image->tags()->split(), + 'name' => $image->filename(), + 'description' => $image->description()->value(), + ]; + } + + return compact('images', 'alerts'); } return [ diff --git a/src/components/project/client-brief/Images.vue b/src/components/project/client-brief/Images.vue index ed517af..879638e 100644 --- a/src/components/project/client-brief/Images.vue +++ b/src/components/project/client-brief/Images.vue @@ -12,7 +12,7 @@ > Ajouter une ou plusieurs images -