diff --git a/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf b/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf
new file mode 100644
index 0000000..929bbfc
Binary files /dev/null and b/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf differ
diff --git a/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf.txt b/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf.txt
new file mode 100644
index 0000000..c734c06
--- /dev/null
+++ b/public/content/projects/4_projet-test2/5_industrial-ideation/47696_prt.pdf.txt
@@ -0,0 +1,9 @@
+Cover:
+
+----
+
+Uuid: fF3uEQ4fXtB4wSIY
+
+----
+
+Template: pdf
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/_drafts/industrial-ideation/industrial-ideation.txt b/public/content/projects/4_projet-test2/5_industrial-ideation/industrial-ideation.txt
similarity index 75%
rename from public/content/projects/4_projet-test2/_drafts/industrial-ideation/industrial-ideation.txt
rename to public/content/projects/4_projet-test2/5_industrial-ideation/industrial-ideation.txt
index ee0f257..3b3a15a 100644
--- a/public/content/projects/4_projet-test2/_drafts/industrial-ideation/industrial-ideation.txt
+++ b/public/content/projects/4_projet-test2/5_industrial-ideation/industrial-ideation.txt
@@ -6,6 +6,10 @@ Stepname: industrialIdeation
----
+Pdf: - file://fF3uEQ4fXtB4wSIY
+
+----
+
Stepindex: 4
----
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg b/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg
new file mode 100644
index 0000000..8cb0aa6
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg.txt
new file mode 100644
index 0000000..3761d58
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/black-1984277_1280.jpg.txt
@@ -0,0 +1,9 @@
+Favoriteforusers:
+
+----
+
+Uuid: GgNiFbKpuBHuiKoI
+
+----
+
+Template: inspiration
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg b/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg
new file mode 100644
index 0000000..7daf8e7
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg.txt
new file mode 100644
index 0000000..aadede0
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/nacre_wallpaper_mural_artwork.jpg.txt
@@ -0,0 +1 @@
+Uuid: 0XaNKWTOhgkS3CJj
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg b/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg
new file mode 100644
index 0000000..38cae17
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg.txt
new file mode 100644
index 0000000..4a93fa5
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/perfume-1042715_1280.jpg.txt
@@ -0,0 +1,9 @@
+Favoriteforusers:
+
+----
+
+Uuid: ClSfHdtHGaFpNi5Z
+
+----
+
+Template: inspiration
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg b/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg
new file mode 100644
index 0000000..ba16ec9
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg.txt
new file mode 100644
index 0000000..80c7ee6
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/perfume-144546_1280.jpg.txt
@@ -0,0 +1,9 @@
+Favoriteforusers:
+
+----
+
+Uuid: qpFySer4qbeUBUaS
+
+----
+
+Template: inspiration
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg
new file mode 100644
index 0000000..e9b3bbb
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg.txt
new file mode 100644
index 0000000..03088f4
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2643349_1280.jpg.txt
@@ -0,0 +1,9 @@
+Favoriteforusers:
+
+----
+
+Uuid: R6hghlGnjA4EVi85
+
+----
+
+Template: inspiration
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg
new file mode 100644
index 0000000..3d06644
Binary files /dev/null and b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg differ
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg.txt b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg.txt
new file mode 100644
index 0000000..9699de1
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/perfume-2721147_1280.jpg.txt
@@ -0,0 +1,9 @@
+Favoriteforusers:
+
+----
+
+Uuid: PrjUSAOoUuwy3Vce
+
+----
+
+Template: inspiration
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/6_physical-sample/physical-sample.txt b/public/content/projects/4_projet-test2/6_physical-sample/physical-sample.txt
new file mode 100644
index 0000000..ebc1059
--- /dev/null
+++ b/public/content/projects/4_projet-test2/6_physical-sample/physical-sample.txt
@@ -0,0 +1,35 @@
+Title: Échantillon physique
+
+----
+
+Stepname: physicalSample
+
+----
+
+Cover: - file://0XaNKWTOhgkS3CJj
+
+----
+
+Date: 2024-12-11
+
+----
+
+Description: Lacus euismod bibendum enim hendrerit euismod pellentesque elementum rutrum dolor scelerisque vivamus placerat proin commodo et suspendisse magna et dolor lorem phasellus vivamus ipsum dolor. Congue phasellus gravida facilisis quam proin molestie molestie nisi purus sed orci arcu rutrum magna phasellus leo erat dolor dolor scelerisque eu a scelerisque aliquam.
+
+----
+
+Media:
+
+- file://GgNiFbKpuBHuiKoI
+- file://qpFySer4qbeUBUaS
+- file://ClSfHdtHGaFpNi5Z
+- file://R6hghlGnjA4EVi85
+- file://PrjUSAOoUuwy3Vce
+
+----
+
+Stepindex: 6
+
+----
+
+Uuid: SvuSmrScFYqZm33m
\ No newline at end of file
diff --git a/public/content/projects/4_projet-test2/_drafts/physical-sample/physical-sample.txt b/public/content/projects/4_projet-test2/_drafts/physical-sample/physical-sample.txt
deleted file mode 100644
index 2698e1e..0000000
--- a/public/content/projects/4_projet-test2/_drafts/physical-sample/physical-sample.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Échantillon physique
-
-----
-
-Stepname: physicalSample
-
-----
-
-Stepindex: 6
-
-----
-
-Uuid: SvuSmrScFYqZm33m
\ No newline at end of file
diff --git a/public/site/blueprints/pages/extended-brief.yml b/public/site/blueprints/pages/extended-brief.yml
index ee34839..8b92960 100644
--- a/public/site/blueprints/pages/extended-brief.yml
+++ b/public/site/blueprints/pages/extended-brief.yml
@@ -22,20 +22,8 @@ tabs:
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/blueprints/pages/industrial-ideation.yml b/public/site/blueprints/pages/industrial-ideation.yml
index fa8b6bc..930483d 100644
--- a/public/site/blueprints/pages/industrial-ideation.yml
+++ b/public/site/blueprints/pages/industrial-ideation.yml
@@ -11,7 +11,16 @@ status:
label: Activée
tabs:
- contentTab:
- fields:
- stepName:
- type: hidden
+ content:
+ label: Idéation industrielle
+ icon: document
+ columns:
+ - width: 1/1
+ fields:
+ stepName:
+ type: hidden
+ pdf:
+ label: PDF
+ type: files
+ multiple: false
+ uploads: pdf
\ No newline at end of file
diff --git a/public/site/blueprints/pages/physical-sample.yml b/public/site/blueprints/pages/physical-sample.yml
index 0f3832b..5c86e1e 100644
--- a/public/site/blueprints/pages/physical-sample.yml
+++ b/public/site/blueprints/pages/physical-sample.yml
@@ -11,7 +11,35 @@ status:
label: Activée
tabs:
- contentTab:
- fields:
- stepName:
- type: hidden
+ content:
+ label: Échantillon physique
+ icon: document
+ columns:
+ - width: 1/1
+ fields:
+ stepName:
+ type: hidden
+ cover:
+ type: files
+ multiple: false
+ layout: cards
+ size: full
+ image:
+ ratio: 6/1
+ cover: true
+ date:
+ type: date
+ display: DD/MM/YY
+ required: true
+ default: today
+ width: 2/12
+ description:
+ type: text
+ required: true
+ width: 10/12
+ media:
+ type: files
+ layout: cards
+ size: large
+ required: true
+ uploads: inspiration
diff --git a/public/site/models/project.php b/public/site/models/project.php
index d9921bd..3b39d11 100644
--- a/public/site/models/project.php
+++ b/public/site/models/project.php
@@ -17,7 +17,7 @@ class ProjectPage extends Page {
$files = [];
$uri = null;
- if (str_contains($child->stepName()->value(), 'Brief')) {
+ if (str_contains($child->stepName()->value(), 'Brief') || $child->stepName()->value() === "industrialIdeation") {
$this->handleBriefStep($child, $files, $uri);
}
@@ -28,6 +28,10 @@ class ProjectPage extends Page {
if ($child->stepName() == 'virtualSample') {
$this->handleVirtualSampleStep($child, $files, $uri);
}
+
+ if ($child->stepName() == 'physicalSample') {
+ $this->handlePhysicalSampleStep($child, $files, $uri);
+ }
return [
'label' => $child->title()->value(),
@@ -36,6 +40,8 @@ class ProjectPage extends Page {
'index' => intval($child->stepIndex()->value()),
'modified' => $child->modified('Y-MM-dd'),
'isValidated' => $child->isValidated() == 'true' ? true : false,
+ 'description' => $child->description()->isNotempty() ? $child->description()->value() : null,
+ 'cover' => $child->cover()->isNotempty() ? $child->cover()->toFile()->url() : null,
'uri' => $uri,
'files' => $files,
];
@@ -98,6 +104,16 @@ class ProjectPage extends Page {
$files['static']['finishedGlass'] = getFileData($child->finishedGlass()->toFile());
}
}
+
+ private function handlePhysicalSampleStep($child, &$files, &$uri) {
+ $uri = $child->parent()->uri() . '?dialog=' . $child->slug();
+
+ if ($child->media()->isNotEmpty()) {
+ foreach ($child->media()->toFiles() as $file) {
+ $files[] = getFileData($file);
+ }
+ }
+ }
public function getStepLabel() {
$stepsLabel = [
diff --git a/src/components/project/DialogWrapper.vue b/src/components/project/DialogWrapper.vue
index ce97113..10d8db2 100644
--- a/src/components/project/DialogWrapper.vue
+++ b/src/components/project/DialogWrapper.vue
@@ -2,16 +2,20 @@
+
+
diff --git a/src/components/project/PhysicalSample.vue b/src/components/project/PhysicalSample.vue
new file mode 100644
index 0000000..fa545be
--- /dev/null
+++ b/src/components/project/PhysicalSample.vue
@@ -0,0 +1,3 @@
+
+
+
diff --git a/src/components/project/ProjectStep.vue b/src/components/project/ProjectStep.vue
index bad1c4a..8e2fcc3 100644
--- a/src/components/project/ProjectStep.vue
+++ b/src/components/project/ProjectStep.vue
@@ -16,7 +16,14 @@
step.files.length
"
>
-
+
{{
@@ -80,7 +87,12 @@
-
+
+
+