From 5c41bfc04a22e8be774ad22db5ccdacf47981611 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Thu, 6 Jul 2023 11:08:07 +0200
Subject: [PATCH] =?UTF-8?q?promoted=20statics=20on=20header=20menu=20#2194?=
 =?UTF-8?q?,=20cr=C3=A9dits=20paysage=20sonor=20(r=C3=A9cit)=20#2148?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/gql/concernement.fragment.gql    |  1 +
 src/assets/main.scss                     | 24 +++++++++++++++++-------
 src/components/contents/TerrainDeVie.vue | 13 ++++++-------
 src/stores/common.js                     |  2 +-
 src/stores/statics.js                    | 10 +++++-----
 src/views/Static.vue                     |  3 +++
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/api/gql/concernement.fragment.gql b/src/api/gql/concernement.fragment.gql
index 7db5de5..33eae2b 100644
--- a/src/api/gql/concernement.fragment.gql
+++ b/src/api/gql/concernement.fragment.gql
@@ -13,6 +13,7 @@ fragment ConcernementFields on Concernement {
     }
     description
   }
+  recit_colophon
   author {
     username
     structure {
diff --git a/src/assets/main.scss b/src/assets/main.scss
index 2ee3afc..9f16daa 100644
--- a/src/assets/main.scss
+++ b/src/assets/main.scss
@@ -87,8 +87,7 @@ body{
   }
 
   #content{
-
-    section.concernement{
+    @mixin main-cartouche{
       background-color: rgba(255, 255, 255, 0.9);
       box-sizing: border-box;
       width:450px;
@@ -99,6 +98,12 @@ body{
       //
       display: flex;
       flex-direction: column;
+    }
+    section.static{
+      @include main-cartouche();
+    }
+    section.concernement{
+      @include main-cartouche();
       justify-content: flex-end;
       // layout
       >header{
@@ -193,13 +198,18 @@ body{
       }
       >footer{
         section.infos{
-          >p{
+          >div{
             font-size: 0.882em;
             font-weight: 100;
-              
-            >span{
-              >span{
-                font-weight: 100;
+            white-space:nowrap;
+            >span.label{
+              font-weight: 100;
+            }
+            >div{
+              &, p{
+                display: inline-block;
+                font-size: inherit;
+                font-weight: inherit;
               }
             }
           }
diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue
index 0e02663..477d1df 100644
--- a/src/components/contents/TerrainDeVie.vue
+++ b/src/components/contents/TerrainDeVie.vue
@@ -87,13 +87,12 @@ export default {
 
     <template v-slot:footer>
       <section class="infos">
-        <p>
-          <span class="author"><span>une enquête de</span> {{ opened_concernement.author.username }}<br/></span>
-          <span class="structure" v-if="opened_concernement.author.structure.length"><span>avec</span> {{ opened_concernement.author.structure[0].name }}<br/></span>
-          <span class="lieu" v-if="opened_concernement.lieu.length"><span>à</span> {{ opened_concernement.lieu[0].name }}<br/></span>
-          <span class="created"><span>démarrée le</span> {{ created }}<br/></span>
-          <span class="changed"><span>mise à jour le</span> {{ changed }}</span>
-        </p>
+          <div class="author"><span>une enquête de</span> {{ opened_concernement.author.username }}<br/></div>
+          <div class="structure" v-if="opened_concernement.author.structure.length"><span>avec</span> {{ opened_concernement.author.structure[0].name }}<br/></div>
+          <div class="lieu" v-if="opened_concernement.lieu.length"><span>à</span> {{ opened_concernement.lieu[0].name }}<br/></div>
+          <div class="created"><span>démarrée le</span> {{ created }}<br/></div>
+          <div class="changed"><span>mise à jour le</span> {{ changed }}</div>
+          <div class="recit-colophon"><span>récit:</span> <div v-html="opened_concernement.recit_colophon" /></div>
       </section>
         
       <!-- <section class="historique">
diff --git a/src/stores/common.js b/src/stores/common.js
index a4f1e64..6c19561 100644
--- a/src/stores/common.js
+++ b/src/stores/common.js
@@ -20,7 +20,7 @@ export const CommonStore = defineStore({
       this.hover_elmt = elmt;
     },
     addPaperSymbolDefinition(name, path) {
-      console.log(`addPaperSymbolDefinition ${name}`, path);
+      // console.log(`addPaperSymbolDefinition ${name}`, path);
       // mode can be : terraindevie, proximite, superposition, puissancedagir, action, doleancer
       this.paper_symbol_definitions[name] = new paper.SymbolDefinition(path);
     }
diff --git a/src/stores/statics.js b/src/stores/statics.js
index b078d37..a15088a 100644
--- a/src/stores/statics.js
+++ b/src/stores/statics.js
@@ -23,7 +23,7 @@ export const StaticsStore = defineStore({
       console.log('statics store loadStatics');
       return new Promise((resolve, reject) => {
         const ast = gql`{
-          allstatics {
+          promotedstatics {
             ...StaticsFields
           }
         }
@@ -31,11 +31,11 @@ export const StaticsStore = defineStore({
         `
         console.log('ast', ast);
         GQL.post('', { query: print(ast) })
-          .then(({ data : { data  : { allstatics } } }) => {
-            console.log('loadstatics loaded', allstatics)
-            this.statics = allstatics
+          .then(({ data : { data  : { promotedstatics } } }) => {
+            console.log('loadstatics loaded', promotedstatics)
+            this.statics = promotedstatics
             
-            allstatics.forEach((s) => {
+            promotedstatics.forEach((s) => {
               // console.log("s", s);
               this.statics_byid[s.id] = s
             });
diff --git a/src/views/Static.vue b/src/views/Static.vue
index 28e6a8e..b2579ca 100644
--- a/src/views/Static.vue
+++ b/src/views/Static.vue
@@ -29,10 +29,13 @@ export default {
 </script>
 
 <template>
+  <section class="static">
   <span v-if="!loaded">loading ...</span>
   <!-- <h2 v-if="loaded">{{ this.id }}</h2> -->
   <h2 v-if="loaded">{{ statics_byid[id].title }}</h2>
   <div v-if="loaded" v-html="statics_byid[id].texte"/>
+
+  </section>
 </template>
 
 <style lang="scss" scoped>