From 95064a39cdf78f8e3af09497b09cbc19605241c8 Mon Sep 17 00:00:00 2001 From: isUnknown Date: Wed, 16 Oct 2024 15:03:20 +0200 Subject: [PATCH 1/2] clientBriefImages => moodboard --- .../1_client-brief/client-brief.txt | 2 +- .../projects/_drafts/test/1_client-brief/client-brief.txt | 2 +- public/content/site.txt | 2 +- public/site/blueprints/pages/client-brief.yml | 2 +- public/site/blueprints/site.yml | 2 +- public/site/config/routes/upload-images.php | 6 +++--- public/site/templates/client-brief.json.php | 2 +- src/views/ClientBrief.vue | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) 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 43233b3..417435d 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 @@ -14,7 +14,7 @@ Description: ---- -Clientbriefimages: +Moodboard: ---- 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 a6c2c7a..9b35e1e 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 @@ -22,4 +22,4 @@ Description: ---- -Clientbriefimages: \ No newline at end of file +Moodboard: \ No newline at end of file diff --git a/public/content/site.txt b/public/content/site.txt index 4dd1f41..65fb5d2 100644 --- a/public/content/site.txt +++ b/public/content/site.txt @@ -2,4 +2,4 @@ Title: Nom du service ---- -Clientbriefimagestags: Parachèvements, Forme & design, Matériaux & textures, Coloris & nuances, Bouchon, Bouton poussoir, DA globale \ No newline at end of file +Moodboardtags: 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 f9c1034..8102ee1 100644 --- a/public/site/blueprints/pages/client-brief.yml +++ b/public/site/blueprints/pages/client-brief.yml @@ -34,7 +34,7 @@ tabs: size: tiny buttons: false maxlength: 700 - clientBriefImages: + moodboard: label: Images type: files uploads: image diff --git a/public/site/blueprints/site.yml b/public/site/blueprints/site.yml index 3b9bad1..d8124a6 100644 --- a/public/site/blueprints/site.yml +++ b/public/site/blueprints/site.yml @@ -35,7 +35,7 @@ tabs: label: Paramètres type: fields fields: - clientBriefImagesTags: + moodboardTags: 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/routes/upload-images.php b/public/site/config/routes/upload-images.php index d0bda08..2d4d268 100644 --- a/public/site/config/routes/upload-images.php +++ b/public/site/config/routes/upload-images.php @@ -20,7 +20,7 @@ return [ $page = page($pageUri); - $allFiles = $page->clientBriefImages()->isNotEmpty() ? $page->clientBriefImages()->toFiles()->pluck('uuid', ',') : []; + $allFiles = $page->moodboard()->isNotEmpty() ? $page->moodboard()->toFiles()->pluck('uuid', ',') : []; $alerts = []; $success = []; @@ -125,13 +125,13 @@ return [ $newPage = $page->update([]); if (!empty($allFiles)) { $newPage = $page->update([ - 'clientBriefImages' => $allFiles + 'moodboard' => $allFiles ]); } $images = []; - foreach ($newPage->clientBriefImages()->toFiles() as $image) { + foreach ($newPage->moodboard()->toFiles() as $image) { $images[] = [ 'url' => $image->url(), 'uuid' => (string) $image->uuid(), diff --git a/public/site/templates/client-brief.json.php b/public/site/templates/client-brief.json.php index 0908015..d491a0c 100644 --- a/public/site/templates/client-brief.json.php +++ b/public/site/templates/client-brief.json.php @@ -2,7 +2,7 @@ $images = []; -foreach ($page->clientBriefImages()->toFiles() as $image) { +foreach ($page->moodboard()->toFiles() as $image) { $images[] = [ 'url' => $image->url(), 'uuid' => (string) $image->uuid(), diff --git a/src/views/ClientBrief.vue b/src/views/ClientBrief.vue index bc3b9f7..d080690 100644 --- a/src/views/ClientBrief.vue +++ b/src/views/ClientBrief.vue @@ -36,7 +36,7 @@ function changeStep(stepName) { function setInitialStep() { const hasPDF = page.value.content.clientbriefpdf.length !== 0; const hasImages = - page.value.content.clientbriefimages.length !== 0 || + page.value.content.moodboard.length !== 0 || page.value.content.description.length !== 0; const isEmpty = !hasPDF && !hasImages; if (isEmpty) return "Intro"; From a7f01d66e830e9001f89fcf4a190bc1f089fdcc6 Mon Sep 17 00:00:00 2001 From: isUnknown Date: Wed, 16 Oct 2024 15:04:15 +0200 Subject: [PATCH 2/2] clientBriefPdf => pdf --- public/content/home/home.txt | 2 +- .../1_client-brief/client-brief.txt | 2 +- .../projects/_drafts/test/1_client-brief/client-brief.txt | 2 +- public/site/blueprints/pages/client-brief.yml | 2 +- public/site/config/routes/upload-pdf.php | 4 ++-- src/views/ClientBrief.vue | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/content/home/home.txt b/public/content/home/home.txt index 7c59634..3a04b18 100644 --- a/public/content/home/home.txt +++ b/public/content/home/home.txt @@ -22,4 +22,4 @@ Uuid: 6yh1yt2Sk45Y2sOl ---- -Clientbriefpdf: home/927346290_au-commencement-du-college-chloe-avait-donc-fait-la-connaissance-dun-garcon.-il-etait-plus-vieux.pdf \ No newline at end of file +Pdf: home/927346290_au-commencement-du-college-chloe-avait-donc-fait-la-connaissance-dun-garcon.-il-etait-plus-vieux.pdf \ 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 417435d..e28f425 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 ---- -Clientbriefpdf: - file://pWG1Dz4i9spu0X02 +Pdf: - file://pWG1Dz4i9spu0X02 ---- 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 9b35e1e..59bde7e 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 ---- -Clientbriefpdf: +Pdf: ---- diff --git a/public/site/blueprints/pages/client-brief.yml b/public/site/blueprints/pages/client-brief.yml index 8102ee1..e538e0a 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 - clientBriefPdf: + pdf: label: PDF type: files multiple: false diff --git a/public/site/config/routes/upload-pdf.php b/public/site/config/routes/upload-pdf.php index 562b356..37f7857 100644 --- a/public/site/config/routes/upload-pdf.php +++ b/public/site/config/routes/upload-pdf.php @@ -24,7 +24,7 @@ return [ try { $name = crc32($upload['name'] . microtime()) . '_' . $upload['name']; - $existingFileId = $page->clientBriefPdf()->id() ?? null; + $existingFileId = $page->pdf()->id() ?? null; if ($existingFileId) { $existingFile = $kirby->file($existingFileId); @@ -43,7 +43,7 @@ return [ ]); $newPage = $page->update([ - "clientBriefPdf" => $newFile->id() + "pdf" => $newFile->id() ]); return $newPage->toArray(); diff --git a/src/views/ClientBrief.vue b/src/views/ClientBrief.vue index d080690..4f4644b 100644 --- a/src/views/ClientBrief.vue +++ b/src/views/ClientBrief.vue @@ -34,7 +34,7 @@ function changeStep(stepName) { } function setInitialStep() { - const hasPDF = page.value.content.clientbriefpdf.length !== 0; + const hasPDF = page.value.content.pdf.length !== 0; const hasImages = page.value.content.moodboard.length !== 0 || page.value.content.description.length !== 0;