diff --git a/public/content/inspirations/1_shape-of-the-nature/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt b/public/content/inspirations/1_shape-of-the-nature/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt index 20d19b5..151f9ce 100644 --- a/public/content/inspirations/1_shape-of-the-nature/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt +++ b/public/content/inspirations/1_shape-of-the-nature/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt @@ -2,7 +2,7 @@ Alt: ---- -Favoriteforusers: - user://WWjXgPWk +Favoriteforusers: ---- diff --git a/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt index 1fef22a..e24c9a6 100644 --- a/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt +++ b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt @@ -2,7 +2,7 @@ Alt: ---- -Favoriteforusers: - user://WWjXgPWk +Favoriteforusers: ---- diff --git a/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt index 6c09bfb..2e09d31 100644 --- a/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt +++ b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt @@ -1,3 +1,7 @@ +Alt: + +---- + Favoriteforusers: ---- 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 c651096..7522f8d 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: proposal +Currentstep: extendedBrief ---- diff --git a/public/site/blueprints/pages/extended-brief.yml b/public/site/blueprints/pages/extended-brief.yml index d7922c4..5da68c0 100644 --- a/public/site/blueprints/pages/extended-brief.yml +++ b/public/site/blueprints/pages/extended-brief.yml @@ -15,7 +15,28 @@ options: sort: false tabs: - contentTab: - fields: - stepName: - type: hidden + content: + label: Brief enrichi + icon: document + columns: + - width: 1/1 + fields: + stepName: + type: hidden + value: test + pdf: + label: PDF + type: files + multiple: false + uploads: pdf + description: + type: textarea + size: tiny + buttons: false + maxlength: 700 + moodboard: + label: Images + type: files + uploads: image + layout: cards + size: medium diff --git a/public/site/models/project.php b/public/site/models/project.php index da29f4b..0905033 100644 --- a/public/site/models/project.php +++ b/public/site/models/project.php @@ -17,8 +17,8 @@ class ProjectPage extends Page { $files = []; $uri = null; - if ($child->stepName() == 'clientBrief') { - $this->handleClientBriefStep($child, $files, $uri); + if (str_contains($child->stepName()->value(), 'Brief')) { + $this->handleBriefStep($child, $files, $uri); } if ($child->stepName() == 'proposal') { @@ -40,9 +40,10 @@ class ProjectPage extends Page { ]; } - private function handleClientBriefStep($child, &$files, &$uri) { + private function handleBriefStep($child, &$files, &$uri) { + $uri = $child->uri(); + if ($child->moodboard()->isNotEmpty()) { - $uri = $child->uri(); foreach ($child->moodboard()->toFiles() as $file) { $files[] = getFileData($file); } diff --git a/public/site/templates/extended-brief.json.php b/public/site/templates/extended-brief.json.php new file mode 100644 index 0000000..2f957f9 --- /dev/null +++ b/public/site/templates/extended-brief.json.php @@ -0,0 +1,19 @@ +moodboard()->toFiles() as $image) { + $moodboard[] = getFileData($image); +} + +$specificData = [ + "tags" => $page->parent()->parent()->clientBriefImageTags()->split(), + "moodboard" => $moodboard +]; + +$pageData = array_merge($genericData, $specificData); + +echo json_encode([ + "page" => $pageData, + "user" => $userData +]); \ No newline at end of file diff --git a/public/site/templates/extended-brief.php b/public/site/templates/extended-brief.php new file mode 100644 index 0000000..4ed6305 --- /dev/null +++ b/public/site/templates/extended-brief.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/inspirations/Image.vue b/src/components/inspirations/Image.vue index b96ab5e..e03c8b3 100644 --- a/src/components/inspirations/Image.vue +++ b/src/components/inspirations/Image.vue @@ -1,13 +1,11 @@ + +