merge

public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/1_1_wright-victor-orientation-122023.pdf.txt

@@ -1 +0,0 @@
-Uuid: inTVYmCtOtEsv5eV

public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/1_gernet-vernant-1964-evolution-idees-grece-chine_bude_0004-5527_1964_num_1_3_4085.pdf.txt

@@ -1 +0,0 @@
-Uuid: pXjr94mzDdcxVMVv

public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/adrien-payet_-az60.pdf.txt

@@ -0,0 +1,5 @@
+Uuid: WrFkfiMVZuxwdYad
+
+----
+
+Comments: 

public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/brahms-pieces-piano-35.pdf.txt

@@ -0,0 +1 @@
+Uuid: 6pNYNJpB2BCTWAEn

public/content/projects/1_miss-dior-blooming-bouquet/4_virtual-sample/virtual-sample.txt

@@ -2,11 +2,11 @@ Title: Échantillon virtuel
 
 ----
 
-Rawglass: - file://inTVYmCtOtEsv5eV
+Rawglass: - file://WrFkfiMVZuxwdYad
 
 ----
 
-Finishedglass: - file://pXjr94mzDdcxVMVv
+Finishedglass: - file://6pNYNJpB2BCTWAEn
 
 ----
 

public/site/blueprints/pages/client-brief.yml

@@ -28,7 +28,9 @@ tabs:
             label: PDF
             type: files
             multiple: false
-            uploads: pdf
+            template: pdf
+            accept:
+              extension: pdf
           description:
             type: textarea
             size: tiny
@@ -37,6 +39,6 @@ tabs:
           moodboard:
             label: Images
             type: files
-            uploads: image
+            template: image
             layout: cards
             size: medium

public/site/blueprints/pages/virtual-sample.yml

@@ -41,11 +41,11 @@ tabs:
                 label: Verre brut
                 type: files
                 multiple: false
-                uploads: pdf
+                template: pdf
               finishedGlass:
                 label: Verre parachevé
                 type: files
                 mutliple: false
-                uploads: pdf
+                template: pdf
               stepName:
                 type: hidden

public/site/plugins/helpers/index.php

@@ -15,9 +15,9 @@ function getFileData($file) {
     $data['tags'] = $file->tags()->split();
   };
 
-  if($file->comments()->exists()) {
+  if($file->extension() == "pdf") {
-    $data['comments'] = Data::decode($file->comments()->value(), 'yaml');
+    $data['comments'] = $file->comments()->exists() && $file->comments() ? Data::decode($file->comments()->value(), 'yaml') : [];
-  }
+  } 
 
   return $data;
 }

src/components/project/PdfViewer.vue

@@ -30,9 +30,6 @@ const licenseKey = import.meta.env.VITE_VPV_LICENSE;
 useLicense({ licenseKey });
 
 const { openedFile, isCommentsOpen, comments } = storeToRefs(useDialogStore());
-const dialog = useDialogStore();
-const router = useRouter();
-const route = useRoute();
 
 const draftComment = ref(null);
 
@@ -44,9 +41,6 @@ watch(isCommentsOpen, (newVal) => {
   }
 });
 
-openedFile.value = route.query.fileIndex
-  ? dialog.content.files[route.query.fileIndex]
-  : dialog.content.files[0];
 watch(openedFile, (newVal) => {
   removeCommentMarkers();
   if (newVal.comments) {

src/components/project/TitledPdfWrapper.vue

@@ -56,6 +56,10 @@ watch(isOpen, (newValue) => {
   router.push({ name: route.name });
 });
 
+openedFile.value = route.query.fileIndex
+  ? dialog.content.files[route.query.fileIndex]
+  : dialog.content.files[0];
+
 // Functions
 async function validate() {
   const response = await api.validateBrief(

src/components/project/virtual-sample/StaticView.vue

@@ -25,31 +25,28 @@
     </button>
   </header>
   <div class="dialog__inner" id="verre-brut">
-    <VPdfViewer
+    <PdfViewer />
-      v-if="activeTab === 'rawGlass'"
-      :darkMode="true"
-      :initialThumbnailsVisible="true"
-      :src="step.files.static.rawGlass.url"
-      local="fr_FR"
-      @loaded="onPdfLoaded"
-    />
-    <VPdfViewer
-      v-if="activeTab === 'finishedGlass'"
-      :darkMode="true"
-      :initialThumbnailsVisible="true"
-      :src="step.files.static.finishedGlass.url"
-      local="fr_FR"
-      @loaded="onPdfLoaded"
-    />
   </div>
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useVirtualSampleStore } from "../../../stores/virtualSample";
+import PdfViewer from "../PdfViewer.vue";
+import { storeToRefs } from "pinia";
+import { useDialogStore } from "../../../stores/dialog";
 
 const { step } = useVirtualSampleStore();
+const { openedFile } = storeToRefs(useDialogStore());
 const activeTab = ref(Object.keys(step.files.static)[0]);
+
+watch(
+  activeTab,
+  (newVal) => {
+    openedFile.value = step.files.static[newVal];
+  },
+  { immediate: true }
+);
 </script>
 
 <style scoped>

src/components/project/virtual-sample/VirtualSample.vue

@@ -65,13 +65,6 @@
       >
         <span class="sr-only">Afficher les commentaires</span>
       </button>
-      <Comments
-        v-if="isCommentsOpen"
-        :current-page-index="currentPageIndex"
-        :file="file"
-        :comments="file.comments"
-        @update:file="changeFile"
-      />
     </template>
   </Dialog>
 </template>
@@ -82,21 +75,18 @@ import Dialog from "primevue/dialog";
 import DynamicView from "./DynamicView.vue";
 import StaticView from "./StaticView.vue";
 import { ref } from "vue";
-import { useDialogStore } from "../../../stores/dialog";
 import { useVirtualSampleStore } from "../../../stores/virtualSample";
-import { usePageStore } from "../../../stores/page";
+import { useDialogStore } from "../../../stores/dialog";
 
 const { file } = defineProps({
   file: Object,
 });
 
-const { page } = usePageStore();
-const { comments } = storeToRefs(useDialogStore());
 const { activeTab, currentFile, step } = storeToRefs(useVirtualSampleStore());
+const { isCommentsOpen } = storeToRefs(useDialogStore());
 
 // Variables
 const isOpen = ref(true);
-const isCommentsOpen = ref(false);
 </script>
 
 <style scoped>

src/stores/dialog.js

@@ -10,10 +10,12 @@ export const useDialogStore = defineStore("dialog", () => {
   });
 
   function updateFile(newFile) {
+    openedFile.value = newFile;
+
+    if (!content.value.files) return;
     content.value.files = content.value.files.map((file) =>
       file.id === newFile.id ? newFile : file
     );
-    openedFile.value = newFile;
   }
 
   const route = useRoute();