diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png deleted file mode 100644 index 35f3985..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png.txt deleted file mode 100644 index b73f720..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/0c41d3266e9ce2872f30608cceb28239.png.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: aWouZREvKfW9VWMt - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg deleted file mode 100644 index 6353fe6..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg.txt deleted file mode 100644 index 0e37173..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/20878a95a67b25e122365f351f1ec1a7.jpg.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: T3MXkEhh9mmAGkUH - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg deleted file mode 100644 index de69e36..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt deleted file mode 100644 index dc2764f..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: e57fucmyhXX9jJv4 - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png deleted file mode 100644 index e22fdbc..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png.txt deleted file mode 100644 index e48dd82..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/37a038883c87973036232aa0e43f6da2.png.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: aGCNfbFS7FcFJls1 - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg deleted file mode 100644 index 9d0227c..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg.txt deleted file mode 100644 index c7a78b6..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/6b0228aa62a396728a25bb8991a49392.jpg.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: qqhD8ABZ7BkkJxd5 - ----- - -Template: image \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/client-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/client-brief.txt deleted file mode 100644 index afed323..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/client-brief.txt +++ /dev/null @@ -1,29 +0,0 @@ -Title: Brief client - ----- - -Client: - page://G418qZ4ABsoWFx4i - ----- - -Briefclientpdf: - ----- - -Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas faucibus mollis interdum. Maecenas faucibus mollis interdum. Maecenas sed diam eget risus varius blandit sit amet non magna. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. - ----- - -Briefclientimages: - -- file://aWouZREvKfW9VWMt -- file://qqhD8ABZ7BkkJxd5 -- file://e57fucmyhXX9jJv4 -- file://aGCNfbFS7FcFJls1 -- file://T3MXkEhh9mmAGkUH -- file://B3TFeDZKd5d8dxKK - - ----- - -Uuid: jz9BryKovuoRUHdZ \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png deleted file mode 100644 index 546e793..0000000 Binary files a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png and /dev/null differ diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png.txt deleted file mode 100644 index 886c1e5..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/1_brief-client/d82f18573c439d6edd434ffca62471a7.png.txt +++ /dev/null @@ -1,5 +0,0 @@ -Uuid: B3TFeDZKd5d8dxKK - ----- - -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 new file mode 100644 index 0000000..e4fc620 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt @@ -0,0 +1,25 @@ +Title: Brief client + +---- + +Stepname: clientBrief + +---- + +Briefclientpdf: + +---- + +Description: Sed congue magna magna lorem aliquam diam dolor arcu fusce adipiscing morbi suspendisse sit dolor erat lorem phasellus sollicitudin cursus dolor aliquam maximus accumsan maximus phasellus ipsum cursus nisi cursus erat nec suspendisse morbi interdum suspendisse purus eget gravida ut mi hendrerit sit molestie eros scelerisque accumsan orci dolor amet. + +---- + +Briefclientimages: + +---- + +Stepindex: 1 + +---- + +Uuid: glE28vWGearnAmxw \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/2_offre-commerciale/proposal.txt b/public/content/projects/1_miss-dior-blooming-bouquet/2_offre-commerciale/proposal.txt deleted file mode 100644 index 826ae39..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/2_offre-commerciale/proposal.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: Offre commerciale - ----- - -Uuid: nEY0Hav7UFaGChPG \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/proposal.txt b/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/proposal.txt new file mode 100644 index 0000000..0bdc366 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/2_proposal/proposal.txt @@ -0,0 +1,13 @@ +Title: Offre commerciale + +---- + +Stepname: proposal + +---- + +Stepindex: 2 + +---- + +Uuid: AxFACcLRHv65S4DD \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/3_brief-enrichi/extended-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/3_brief-enrichi/extended-brief.txt deleted file mode 100644 index 5693110..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/3_brief-enrichi/extended-brief.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: Brief enrichi - ----- - -Uuid: Du1F8OV8YwBaUA3q \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/3_extended-brief/extended-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/3_extended-brief/extended-brief.txt new file mode 100644 index 0000000..7bc0661 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/3_extended-brief/extended-brief.txt @@ -0,0 +1,13 @@ +Title: Brief enrichi + +---- + +Stepname: extended-brief + +---- + +Stepindex: 3 + +---- + +Uuid: VJBxmiffVnZ3FYiR \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/4_echantillon-virtuel/sample.txt b/public/content/projects/1_miss-dior-blooming-bouquet/4_echantillon-virtuel/sample.txt deleted file mode 100644 index c2b2404..0000000 --- a/public/content/projects/1_miss-dior-blooming-bouquet/4_echantillon-virtuel/sample.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: Échantillon virtuel - ----- - -Uuid: cCwaSHyUwJNNvVD3 \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/virtual-sample.txt b/public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/virtual-sample.txt new file mode 100644 index 0000000..735a1db --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/virtual-sample.txt @@ -0,0 +1,13 @@ +Title: Échantillon virtuel + +---- + +Stepname: virtualSample + +---- + +Stepindex: 5 + +---- + +Uuid: C4w4dXYA5cOYbtHg \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/industrial-ideation/industrial-ideation.txt b/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/industrial-ideation/industrial-ideation.txt new file mode 100644 index 0000000..5e12f35 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/industrial-ideation/industrial-ideation.txt @@ -0,0 +1,13 @@ +Title: Idéation industrielle + +---- + +Stepname: industrialIdeation + +---- + +Stepindex: 4 + +---- + +Uuid: viylJQYGPO5v85cv \ No newline at end of file diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/physical-sample/physical-sample.txt b/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/physical-sample/physical-sample.txt new file mode 100644 index 0000000..2c030a3 --- /dev/null +++ b/public/content/projects/1_miss-dior-blooming-bouquet/_drafts/physical-sample/physical-sample.txt @@ -0,0 +1,13 @@ +Title: Échantillon physique + +---- + +Stepname: physicalSample + +---- + +Stepindex: 6 + +---- + +Uuid: kfj7IqqkXANm2czJ \ No newline at end of file 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 71ef6a8..ec3f0ef 100644 --- a/public/content/projects/1_miss-dior-blooming-bouquet/project.txt +++ b/public/content/projects/1_miss-dior-blooming-bouquet/project.txt @@ -2,11 +2,7 @@ Title: Miss Dior Blooming Bouquet ---- -Optionalsteps: industrialIdeation, physicalSample - ----- - -Currentstep: extendedBrief +Currentstep: ---- @@ -14,4 +10,4 @@ Client: - page://G418qZ4ABsoWFx4i ---- -Uuid: 513oEM4JFuWBt2Bw \ No newline at end of file +Uuid: jDag30qUf8zyiEwC \ No newline at end of file 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 eab353a..146e636 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 @@ -10,7 +10,7 @@ Stepindex: 1 ---- -Uuid: 8B7d4RgY8eFqvqOB +Uuid: 5NGq8baScF9pCeK9 ---- diff --git a/public/content/projects/_drafts/test/2_proposal/proposal.txt b/public/content/projects/_drafts/test/2_proposal/proposal.txt index 2f96a53..9eddb1a 100644 --- a/public/content/projects/_drafts/test/2_proposal/proposal.txt +++ b/public/content/projects/_drafts/test/2_proposal/proposal.txt @@ -10,4 +10,4 @@ Stepindex: 2 ---- -Uuid: AORTte4et35lhTXL \ No newline at end of file +Uuid: b1ZjuC8nDSXOOBf9 \ No newline at end of file diff --git a/public/content/projects/_drafts/test/3_extended-brief/extended-brief.txt b/public/content/projects/_drafts/test/3_extended-brief/extended-brief.txt index 51dcb6e..81facc1 100644 --- a/public/content/projects/_drafts/test/3_extended-brief/extended-brief.txt +++ b/public/content/projects/_drafts/test/3_extended-brief/extended-brief.txt @@ -10,4 +10,4 @@ Stepindex: 3 ---- -Uuid: oBp6AlnPTY1xpfNU \ No newline at end of file +Uuid: cOMCwMHw0SRwCDjD \ No newline at end of file diff --git a/public/content/projects/_drafts/test/4_virtual-sample/virtual-sample.txt b/public/content/projects/_drafts/test/4_virtual-sample/virtual-sample.txt index 64a6692..a0253e8 100644 --- a/public/content/projects/_drafts/test/4_virtual-sample/virtual-sample.txt +++ b/public/content/projects/_drafts/test/4_virtual-sample/virtual-sample.txt @@ -10,4 +10,4 @@ Stepindex: 5 ---- -Uuid: KvcDJf8bfJXQnxML \ No newline at end of file +Uuid: FouVvjVPGInE74Yv \ No newline at end of file diff --git a/public/content/projects/_drafts/test/_drafts/industrial-ideation/industrial-ideation.txt b/public/content/projects/_drafts/test/_drafts/industrial-ideation/industrial-ideation.txt index cb16e5d..efcf5a2 100644 --- a/public/content/projects/_drafts/test/_drafts/industrial-ideation/industrial-ideation.txt +++ b/public/content/projects/_drafts/test/_drafts/industrial-ideation/industrial-ideation.txt @@ -10,4 +10,4 @@ Stepindex: 4 ---- -Uuid: jGfYrEyipW8esCwk \ No newline at end of file +Uuid: 2B5pbQQ6BrcDHGnG \ No newline at end of file diff --git a/public/content/projects/_drafts/test/_drafts/physical-sample/physical-sample.txt b/public/content/projects/_drafts/test/_drafts/physical-sample/physical-sample.txt index b54c228..35bfa0a 100644 --- a/public/content/projects/_drafts/test/_drafts/physical-sample/physical-sample.txt +++ b/public/content/projects/_drafts/test/_drafts/physical-sample/physical-sample.txt @@ -10,4 +10,4 @@ Stepindex: 6 ---- -Uuid: IbgnF5QBMM0WsmRK \ No newline at end of file +Uuid: XdHzenC81EA7rS4e \ No newline at end of file diff --git a/public/content/projects/_drafts/test/project.txt b/public/content/projects/_drafts/test/project.txt index fb97f4a..12eed61 100644 --- a/public/content/projects/_drafts/test/project.txt +++ b/public/content/projects/_drafts/test/project.txt @@ -6,4 +6,4 @@ Client: ---- -Uuid: 96WmogVvmpMRmgzj \ No newline at end of file +Uuid: Wz0hErzk7ltN2qT8 \ No newline at end of file diff --git a/public/site/blueprints/pages/industrial-ideation.yml b/public/site/blueprints/pages/industrial-ideation.yml index 47227d0..fa8b6bc 100644 --- a/public/site/blueprints/pages/industrial-ideation.yml +++ b/public/site/blueprints/pages/industrial-ideation.yml @@ -3,6 +3,12 @@ icon: light-bulb image: back: black color: white +status: + draft: + label: Désactivée + unlisted: false + listed: true + label: Activée tabs: contentTab: diff --git a/public/site/blueprints/pages/physical-sample.yml b/public/site/blueprints/pages/physical-sample.yml index 7b69bf0..0f3832b 100644 --- a/public/site/blueprints/pages/physical-sample.yml +++ b/public/site/blueprints/pages/physical-sample.yml @@ -3,6 +3,12 @@ icon: image image: back: black color: white +status: + draft: + label: Désactivée + unlisted: false + listed: true + label: Activée tabs: contentTab: diff --git a/public/site/blueprints/pages/projects.yml b/public/site/blueprints/pages/projects.yml index e233c74..61c4dee 100644 --- a/public/site/blueprints/pages/projects.yml +++ b/public/site/blueprints/pages/projects.yml @@ -1,12 +1,6 @@ title: Projets sections: - fieldsSection: - type: fields - fields: - steps: - label: Étapes - type: tags drafts: extends: sections/projects headline: Brouillons diff --git a/public/site/config/config.php b/public/site/config/config.php index 2071eed..37c5f58 100644 --- a/public/site/config/config.php +++ b/public/site/config/config.php @@ -23,6 +23,7 @@ return [ require(__DIR__ . '/routes/toggle-favorite.php'), ], 'hooks' => [ - 'page.create:after' => require_once(__DIR__ . '/hooks/create-steps.php') + 'page.create:after' => require_once(__DIR__ . '/hooks/create-steps.php'), + 'page.delete:before' => require_once(__DIR__ . '/hooks/delete-steps.php'), ] ]; diff --git a/public/site/config/hooks/delete-steps.php b/public/site/config/hooks/delete-steps.php new file mode 100644 index 0000000..417f0e7 --- /dev/null +++ b/public/site/config/hooks/delete-steps.php @@ -0,0 +1,10 @@ +template() == "project") { + kirby()->impersonate('kirby'); + foreach ($page->children() as $child) { + $child->delete(); + } + } +}; \ No newline at end of file diff --git a/public/site/models/project.php b/public/site/models/project.php index 9e147dc..60185b9 100644 --- a/public/site/models/project.php +++ b/public/site/models/project.php @@ -6,10 +6,15 @@ class ProjectPage extends Page { $steps = array_map(function($child) { return [ 'text' => $child['content']['title'], - 'value' => $child['content']['stepname'] + 'value' => $child['content']['stepname'], + 'index' => $child['content']['stepindex'] ]; }, $this->children()->toArray()); + usort($steps, function ($a, $b) { + return $a['index'] <=> $b['index']; + }); + return $steps; } } \ No newline at end of file