refacto heading

sebousan · sebousan · commit da98f9ec3151 · 2023-05-15T15:44:49.000+02:00
diff --git a/admin/app/blocks/chart.js b/admin/app/blocks/chart.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
+import { heading } from '../fields/heading.js'
 import { chart } from '../fields/chart.js'
 import { grid } from '../fields/grid.js'
 import { background } from '../fields/background.js'
@@ -11,10 +10,9 @@ export const block_chart =  {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         chart,
         grid,
         background
diff --git a/admin/app/blocks/datas.js b/admin/app/blocks/datas.js
@@ -1,3 +1,4 @@
+import { heading } from '../fields/heading.js'
 import { title } from '../fields/title.js'
 import { text } from '../fields/text.js'
 import { column } from '../fields/column.js'
@@ -16,10 +17,9 @@ export const block_datas = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         column,
         show_gauge,
         show_color,
diff --git a/admin/app/blocks/embed.js b/admin/app/blocks/embed.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
+import { heading } from '../fields/heading.js'
 import { embed } from '../fields/embed.js'
 import { background } from '../fields/background.js'
 
@@ -12,8 +11,7 @@ export const block_embed = {
     collapsed: false,
     summary: '{{title}}',
     fields: [
-        title,
-        text,
+        heading,
         embed,
         background
     ]
diff --git a/admin/app/blocks/faq.js b/admin/app/blocks/faq.js
@@ -1,5 +1,5 @@
+import { heading } from '../fields/heading.js'
 import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
 import { text_markdown } from '../fields/text-markdown.js'
 import { background } from '../fields/background.js'
 
@@ -10,10 +10,9 @@ export const block_faq = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         {
             name: 'items',
             label: 'Question/Réponse',
diff --git a/admin/app/blocks/figure.js b/admin/app/blocks/figure.js
@@ -1,3 +1,4 @@
+import { heading } from '../fields/heading.js'
 import { figure } from '../fields/figure.js'
 import { grid } from '../fields/grid.js'
 import { offset } from '../fields/offset.js'
@@ -12,6 +13,7 @@ export const block_figure = {
     collapsed: false,
     summary: '{{title}}',
     fields: [
+        heading,
         figure,
         grid,
         offset,
diff --git a/admin/app/blocks/form.js b/admin/app/blocks/form.js
@@ -1,5 +1,5 @@
+import { heading } from '../fields/heading.js'
 import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
 import { value } from '../fields/value.js'
 import { grid } from '../fields/grid.js'
 import { background } from '../fields/background.js'
@@ -11,10 +11,9 @@ export const block_form = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         grid,
         { name: 'name', label: 'Identifiant du formulaire', widget: 'string', i18n: 'duplicate' },
         { name: 'submit', label: 'Texte du bouton d’envoie', widget: 'string', i18n: true },
diff --git a/admin/app/blocks/gallery.js b/admin/app/blocks/gallery.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js';
-import { text } from '../fields/text.js';
+import { heading } from '../fields/heading.js';
 import { column } from '../fields/column.js';
 import { gallery } from '../fields/gallery.js';
 import { background } from '../fields/background.js';
@@ -11,10 +10,9 @@ export const block_gallery = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         column,
         gallery,
         background
diff --git a/admin/app/blocks/images.js b/admin/app/blocks/images.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
+import { heading } from '../fields/heading.js'
 import { images } from '../fields/images.js'
 import { background } from '../fields/background.js'
 
@@ -10,10 +9,9 @@ export const block_images = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         images,
         background
     ]
diff --git a/admin/app/blocks/informations.js b/admin/app/blocks/informations.js
@@ -1,3 +1,4 @@
+import { heading } from '../fields/heading.js'
 import { icons } from '../fields/icons.js'
 import { image_src } from '../fields/image-src.js'
 import { image_alt } from '../fields/image-alt.js'
@@ -14,10 +15,9 @@ export const block_informations = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         column,
         {
             name: 'items',
diff --git a/admin/app/blocks/instagram.js b/admin/app/blocks/instagram.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
+import { heading } from '../fields/heading.js'
 import { count } from '../fields/count.js'
 import { background } from '../fields/background.js'
 
@@ -10,10 +9,9 @@ export const block_instagram = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         count,
         {
             name: 'token',
diff --git a/admin/app/blocks/latest.js b/admin/app/blocks/latest.js
@@ -1,6 +1,5 @@
+import { heading } from '../fields/heading.js'
 import { section } from '../fields/section.js'
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
 import { count } from '../fields/count.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -14,9 +13,8 @@ export const block_latest = {
     collapsed: false,
     summary: '{{title}}',
     fields: [
+        heading,
         section,
-        title,
-        text,
         count,
         show_more,
         background
diff --git a/admin/app/blocks/map.js b/admin/app/blocks/map.js
@@ -1,5 +1,4 @@
-import { title } from '../fields/title.js'
-import { text_area } from '../fields/text-area.js'
+import { heading } from '../fields/heading.js'
 import { map } from '../fields/map.js'
 import { zoom } from '../fields/zoom.js'
 import { grid } from '../fields/grid.js'
@@ -14,8 +13,7 @@ export const block_map = {
     collapsed: false,
     summary: '{{title}}',
     fields: [
-        title,
-        text_area,
+        heading,
         map,
         zoom,
         grid,
diff --git a/admin/app/blocks/pushes.js b/admin/app/blocks/pushes.js
@@ -1,3 +1,4 @@
+import { heading } from '../fields/heading.js'
 import { image_src } from '../fields/image-src.js'
 import { image_alt } from '../fields/image-alt.js'
 import { background_color } from '../fields/background-color.js'
@@ -17,10 +18,9 @@ export const block_pushes = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
-        text,
+        heading,
         column_simple,
         {
             name: 'items',
diff --git a/admin/app/blocks/quote.js b/admin/app/blocks/quote.js
@@ -1,6 +1,5 @@
-import { title } from '../fields/title.js'
-import { text } from '../fields/text.js'
-import { image } from '../fields/image.js'
+import { quote } from '../fields/quote.js'
+import { author } from '../fields/author.js'
 import { background } from '../fields/background.js'
 
 export const block_quote = {
@@ -10,22 +9,10 @@ export const block_quote = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{text}}',
+    summary: '{{quote}}',
     fields: [
-        text,
-        {
-            name: 'author',
-            title: 'Auteur',
-            widget: 'object',
-            required: false,
-            i18n: true,
-            collapsed: true,
-            fields: [
-                title,
-                text,
-                image
-            ]
-        },
+        quote,
+        author,
         background
     ]
 }
diff --git a/admin/app/blocks/selected-casestudies.js b/admin/app/blocks/selected-casestudies.js
@@ -1,4 +1,4 @@
-import { title } from '../fields/title.js'
+import { heading } from '../fields/heading.js'
 import { casestudies } from '../fields/casestudies.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -10,9 +10,9 @@ export const block_selectedcasestudies = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
+        heading,
         { name: 'section', default: 'casestudies', widget: 'hidden' },
         casestudies,
         show_more,
diff --git a/admin/app/blocks/selected-persons.js b/admin/app/blocks/selected-persons.js
@@ -1,4 +1,4 @@
-import { title } from '../fields/title.js'
+import { heading } from '../fields/heading.js'
 import { persons } from '../fields/persons.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -10,9 +10,9 @@ export const block_selectedpersons = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
+        heading,
         { name: 'section', default: 'persons', widget: 'hidden' },
         persons,
         show_more,
diff --git a/admin/app/blocks/selected-posts.js b/admin/app/blocks/selected-posts.js
@@ -1,4 +1,4 @@
-import { title } from '../fields/title.js'
+import { heading } from '../fields/heading.js'
 import { posts } from '../fields/posts.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -10,9 +10,9 @@ export const block_selectedposts = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
+        heading,
         { name: 'section', default: 'posts', widget: 'hidden' },
         posts,
         show_more,
diff --git a/admin/app/blocks/selected-projects.js b/admin/app/blocks/selected-projects.js
@@ -1,4 +1,4 @@
-import { title } from '../fields/title.js'
+import { heading } from '../fields/heading.js'
 import { projects } from '../fields/projects.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -10,9 +10,9 @@ export const block_selectedprojects = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
+        heading,
         { name: 'section', default: 'projects', widget: 'hidden' },
         projects,
         show_more,
diff --git a/admin/app/blocks/selected-publications.js b/admin/app/blocks/selected-publications.js
@@ -1,4 +1,4 @@
-import { title } from '../fields/title.js'
+import { heading } from '../fields/heading.js'
 import { publications } from '../fields/publications.js'
 import { show_more } from '../fields/show-more.js'
 import { background } from '../fields/background.js'
@@ -10,9 +10,9 @@ export const block_selectedpublications = {
     required: false,
     i18n: true,
     collapsed: false,
-    summary: '{{title}}',
+    summary: '{{heading.title}}',
     fields: [
-        title,
+        heading,
         { name: 'section', default: 'publications', widget: 'hidden' },
         publications,
         show_more,
diff --git a/admin/app/blocks/testimonials.js b/admin/app/blocks/testimonials.js
@@ -0,0 +1,32 @@
+import { heading } from '../fields/heading.js'
+import { quote } from '../fields/quote.js'
+import { author } from '../fields/author.js'
+import { background } from '../fields/background.js'
+
+export const block_testimonials = {
+    name: 'testimonials',
+    label: 'Témoignages',
+    widget: 'object',
+    required: false,
+    i18n: true,
+    collapsed: false,
+    summary: '{{heading.title}}',
+    fields: [
+        heading,
+        {
+            name: 'items',
+            label: 'Témoignages',
+            label_singular: 'témoignage',
+            widget: 'list',
+            required: false,
+            i18n: true,
+            collapsed: true,
+            summary: '{{quote.title}}',
+            fields: [
+                quote,
+                author
+            ]
+        },
+        background
+    ]
+}
diff --git a/admin/app/blocks/title.js b/admin/app/blocks/title.js
diff --git a/admin/app/fields/author.js b/admin/app/fields/author.js
diff --git a/admin/app/fields/heading.js b/admin/app/fields/heading.js
diff --git a/admin/app/fields/quote.js b/admin/app/fields/quote.js
diff --git a/package.json b/package.json
