diff --git a/.gitignore b/.gitignore index ca1ac66..073776c 100644 --- a/.gitignore +++ b/.gitignore @@ -82,4 +82,8 @@ public/site/config/.license # Vendor # --------------- -public/vendor \ No newline at end of file +public/vendor + +# Local +# --------------- +/local \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 202a4d3..5a8fa8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "pinia": "^2.1.7", "primevue": "^4.0.6", "slugify": "^1.6.6", + "three": "^0.168.0", "vue": "^3.5.6", "vue-router": "^4.4.5" }, @@ -1061,6 +1062,11 @@ "node": ">=0.10.0" } }, + "node_modules/three": { + "version": "0.168.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.168.0.tgz", + "integrity": "sha512-6m6jXtDwMJEK/GGMbAOTSAmxNdzKvvBzgd7q8bE/7Tr6m7PaBh5kKLrN7faWtlglXbzj7sVba48Idwx+NRsZXw==" + }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", diff --git a/package.json b/package.json index b9a6c15..ba3b57a 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "pinia": "^2.1.7", "primevue": "^4.0.6", "slugify": "^1.6.6", + "three": "^0.168.0", "vue": "^3.5.6", "vue-router": "^4.4.5" }, diff --git a/public/assets/3D/flacon-test.glb b/public/assets/3D/flacon-test.glb new file mode 100644 index 0000000..0487275 Binary files /dev/null and b/public/assets/3D/flacon-test.glb differ diff --git a/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg b/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg new file mode 100644 index 0000000..e095ad9 Binary files /dev/null and b/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg differ diff --git a/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt b/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt new file mode 100644 index 0000000..28751dc --- /dev/null +++ b/public/content/inspirations/2_autre-inspiration/22f8779f680ed826a2d0a1d2af6018c9.jpg.txt @@ -0,0 +1 @@ +Uuid: OcfuImJZoRDv8tPB \ No newline at end of file diff --git a/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg new file mode 100644 index 0000000..b9cc7b9 Binary files /dev/null and b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg differ diff --git a/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt new file mode 100644 index 0000000..eb6a5d3 --- /dev/null +++ b/public/content/inspirations/2_autre-inspiration/6b0228aa62a396728a25bb8991a49392.jpg.txt @@ -0,0 +1,9 @@ +Favoriteforusers: + +---- + +Uuid: INXC9OOVmvBjPHZw + +---- + +Template: inspiration \ No newline at end of file diff --git a/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png new file mode 100644 index 0000000..2d253a9 Binary files /dev/null and b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png differ diff --git a/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt new file mode 100644 index 0000000..6c09bfb --- /dev/null +++ b/public/content/inspirations/2_autre-inspiration/d82f18573c439d6edd434ffca62471a7.png.txt @@ -0,0 +1,9 @@ +Favoriteforusers: + +---- + +Uuid: LDbC2tGWZmJYuyQR + +---- + +Template: inspiration \ No newline at end of file diff --git a/public/content/inspirations/2_autre-inspiration/inspiration.txt b/public/content/inspirations/2_autre-inspiration/inspiration.txt new file mode 100644 index 0000000..db98d99 --- /dev/null +++ b/public/content/inspirations/2_autre-inspiration/inspiration.txt @@ -0,0 +1,28 @@ +Title: Autre inspiration + +---- + +Cover: - file://OcfuImJZoRDv8tPB + +---- + +Date: 2024-09-24 + +---- + +New: false + +---- + +Description: Nulla arcu gravida sollicitudin suspendisse proin tincidunt eu erat fusce sem massa dolor lorem enim nisi commodo scelerisque diam hendrerit amet adipiscing amet aliquam congue. Nisi arcu nunc congue lacus sem quam nisi ex sit urna ac rutrum cursus suspendisse sit amet condimentum portaest amet elit ac felis eget id. + +---- + +Media: + +- file://LDbC2tGWZmJYuyQR +- file://INXC9OOVmvBjPHZw + +---- + +Uuid: 7wws4Jxf2f5iR10B \ No newline at end of file diff --git a/public/site/blueprints/pages/inspiration.yml b/public/site/blueprints/pages/inspiration.yml index 27e12b3..172b68e 100644 --- a/public/site/blueprints/pages/inspiration.yml +++ b/public/site/blueprints/pages/inspiration.yml @@ -28,6 +28,7 @@ tabs: type: date display: YY/MM required: true + default: today width: 2/12 new: label: Nouveauté diff --git a/public/site/config/hooks/create-steps.php b/public/site/config/hooks/create-steps.php index f13a831..d00a06b 100644 --- a/public/site/config/hooks/create-steps.php +++ b/public/site/config/hooks/create-steps.php @@ -1,9 +1,9 @@ template() != "project") return; +return function($page) { + if ($page->template() != "project") return; - $newPage->createChild([ + $page->createChild([ 'slug' => 'client-brief', 'template' => 'client-brief', 'content' => [ @@ -11,7 +11,7 @@ return function($newPage, $oldPage) { ] ]); - $newPage->createChild([ + $page->createChild([ 'slug' => 'proposal', 'template' => 'proposal', 'content' => [ @@ -19,7 +19,7 @@ return function($newPage, $oldPage) { ] ]); - $newPage->createChild([ + $page->createChild([ 'slug' => 'extended-brief', 'template' => 'extended-brief', 'content' => [ @@ -27,7 +27,7 @@ return function($newPage, $oldPage) { ] ]); - $newPage->createChild([ + $page->createChild([ 'slug' => 'sample', 'template' => 'sample', 'content' => [ diff --git a/src/components/VirtualSample.vue b/src/components/VirtualSample.vue new file mode 100644 index 0000000..0f32052 --- /dev/null +++ b/src/components/VirtualSample.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components/inspirations/Selector.vue b/src/components/inspirations/Selector.vue index f47039e..33d05f8 100644 --- a/src/components/inspirations/Selector.vue +++ b/src/components/inspirations/Selector.vue @@ -3,17 +3,15 @@
- +