diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg new file mode 100644 index 0000000..38cae17 Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg.txt new file mode 100644 index 0000000..8555b51 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1445320111_perfume-1042715_1280.jpg.txt @@ -0,0 +1,9 @@ +Date: 2024-10-02 01:10 + +---- + +Uuid: 1NmPGSM9FKgiyOwH + +---- + +Template: default \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg new file mode 100644 index 0000000..3d06644 Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg.txt new file mode 100644 index 0000000..ed6aa97 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/1510991102_perfume-2721147_1280.jpg.txt @@ -0,0 +1,9 @@ +Date: 2024-10-02 01:10 + +---- + +Uuid: ump9516TWbjrIo7T + +---- + +Template: default \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg new file mode 100644 index 0000000..e9b3bbb Binary files /dev/null and b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg.txt new file mode 100644 index 0000000..37f7828 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/4049252942_perfume-2643349_1280.jpg.txt @@ -0,0 +1,9 @@ +Date: 2024-10-02 01:10 + +---- + +Uuid: RaQyVfBK6c8gv8pW + +---- + +Template: default \ 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 e4fc620..427e0b5 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 @@ -6,7 +6,7 @@ Stepname: clientBrief ---- -Briefclientpdf: +Clientbriefpdf: ---- @@ -14,7 +14,11 @@ Description: Sed congue magna magna lorem aliquam diam dolor arcu fusce adipisci ---- -Briefclientimages: +Clientbriefimages: + +- file://ump9516TWbjrIo7T +- file://RaQyVfBK6c8gv8pW +- file://1NmPGSM9FKgiyOwH ---- diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/project.txt b/public/content/projects/1_miss-dior-blooming-bouquet/project.txt index ec3f0ef..0e46d90 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/project.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/project.txt @@ -2,7 +2,7 @@ Title: Miss Dior Blooming Bouquet ---- -Currentstep: +Currentstep: clientBrief ---- diff --git a/public/content/projects/_drafts/test/1_client-brief/client-brief.txt b/public/content/projects/_drafts/test/1_client-brief/client-brief.txt index 146e636..a6c2c7a 100644 --- a/public/content/projects/_drafts/test/1_client-brief/client-brief.txt +++ b/public/content/projects/_drafts/test/1_client-brief/client-brief.txt @@ -14,7 +14,7 @@ Uuid: 5NGq8baScF9pCeK9 ---- -Briefclientpdf: +Clientbriefpdf: ---- @@ -22,4 +22,4 @@ Description: ---- -Briefclientimages: \ No newline at end of file +Clientbriefimages: \ No newline at end of file diff --git a/public/content/site.txt b/public/content/site.txt index d12bfae..4dd1f41 100644 --- a/public/content/site.txt +++ b/public/content/site.txt @@ -2,4 +2,4 @@ Title: Nom du service ---- -Briefclientimagestags: Parachèvements, Forme & design, Matériaux & textures, Coloris & nuances, Bouchon, Bouton poussoir, DA globale \ No newline at end of file +Clientbriefimagestags: Parachèvements, Forme & design, Matériaux & textures, Coloris & nuances, Bouchon, Bouton poussoir, DA globale \ No newline at end of file diff --git a/public/site/blueprints/pages/client-brief.yml b/public/site/blueprints/pages/client-brief.yml index b9f4e40..f9c1034 100644 --- a/public/site/blueprints/pages/client-brief.yml +++ b/public/site/blueprints/pages/client-brief.yml @@ -24,7 +24,7 @@ tabs: stepName: type: hidden value: test - briefClientPdf: + clientBriefPdf: label: PDF type: files multiple: false @@ -34,7 +34,7 @@ tabs: size: tiny buttons: false maxlength: 700 - briefClientImages: + clientBriefImages: label: Images type: files uploads: image diff --git a/public/site/blueprints/site.yml b/public/site/blueprints/site.yml index 75f7dd5..3b9bad1 100644 --- a/public/site/blueprints/site.yml +++ b/public/site/blueprints/site.yml @@ -35,7 +35,7 @@ tabs: label: Paramètres type: fields fields: - briefClientImagesTags: + clientBriefImagesTags: label: Tags des images de Brief client help: Ensemble des tags d’images disponibles lors de la création du Brief client type: tags diff --git a/public/site/config/config.php b/public/site/config/config.php index 291b3c9..f30803a 100644 --- a/public/site/config/config.php +++ b/public/site/config/config.php @@ -21,7 +21,7 @@ return [ 'routes' => [ require(__DIR__ . '/routes/logout.php'), require(__DIR__ . '/routes/toggle-favorite.php'), - require(__DIR__ . '/routes/upload.php') + require(__DIR__ . '/routes/upload-images.php') ], 'hooks' => [ 'page.create:after' => require_once(__DIR__ . '/hooks/create-steps.php'), diff --git a/public/site/config/routes/upload.php b/public/site/config/routes/upload-images.php similarity index 80% rename from public/site/config/routes/upload.php rename to public/site/config/routes/upload-images.php index 146333c..2a9e1d1 100644 --- a/public/site/config/routes/upload.php +++ b/public/site/config/routes/upload-images.php @@ -1,7 +1,7 @@ 'upload.json', + 'pattern' => 'upload-images.json', 'method' => 'POST', 'action' => function () { if ($uploads = kirby()->request()->files()) { @@ -11,6 +11,7 @@ return [ $alerts = []; $success = ''; $newFiles = []; + $allFiles = []; foreach ($uploads->get('images') as $upload) { // check for duplicate @@ -26,12 +27,11 @@ return [ if ($duplicates->count() > 0) { $alerts[$upload['name']] = "The file already exists"; - continue; } try { $name = crc32($upload['name'].microtime()). '_' . $upload['name']; - $newFiles[] = $page->createFile([ + $newFile = $page->createFile([ 'source' => $upload['tmp_name'], 'filename' => $name, 'template' => 'default', @@ -39,16 +39,28 @@ return [ 'date' => date('Y-m-d h:m') ] ]); + + $newFiles[] = $newFile; + $success = 'Your file upload was successful'; + + $allFiles[] = (string) $newFile->uuid(); } catch (Exception $e) { $alerts[$upload['name']] = $e->getMessage(); } } $images = array_map(function ($file) { - return $file->url(); + return [ + 'url' => $file->url(), + 'uuid' => $file->uuid() + ]; }, $newFiles); + $newPage = $page->update([ + 'clientBriefImages' => $allFiles + ]); + return compact('images', 'alerts', 'success'); } diff --git a/public/site/templates/client-brief.json.php b/public/site/templates/client-brief.json.php index 370b498..53a73dd 100644 --- a/public/site/templates/client-brief.json.php +++ b/public/site/templates/client-brief.json.php @@ -1,7 +1,16 @@ clientBriefImages()->toFiles() as $image) { + $images[] = [ + 'url' => $image->url(), + 'uuid' => (string) $image->uuid() + ]; +} + $specificData = [ - "exampleField" => $page->exampleField(), + "images" => $images ]; $data = array_merge($genericData, $specificData); diff --git a/src/components/project/ClientBrief/AddImages.vue b/src/components/project/ClientBrief/Images.vue similarity index 56% rename from src/components/project/ClientBrief/AddImages.vue rename to src/components/project/ClientBrief/Images.vue index 3555fff..c609852 100644 --- a/src/components/project/ClientBrief/AddImages.vue +++ b/src/components/project/ClientBrief/Images.vue @@ -4,7 +4,11 @@ class="project-details | flex items-start | bg-white | rounded-2xl | p-16 | w-full" >
- +
- + @@ -121,7 +235,7 @@ diff --git a/src/views/Project.vue b/src/views/Project.vue index 50fff01..7488c7d 100644 --- a/src/views/Project.vue +++ b/src/views/Project.vue @@ -4,7 +4,8 @@
- + +