From 8253de814cbee33757703b9c7b79005d52e41f2c Mon Sep 17 00:00:00 2001
From: andreaskundig <andreas.kuendig@gmx.ch>
Date: Wed, 30 Jun 2021 16:46:04 +0200
Subject: [PATCH] replaces custom homepage paragraphs with generic

---
 conf/netlify/cms/config.yml | 22 ++-------------
 src/site/_layouts/home.html |  2 +-
 src/site/home/en/index.md   | 54 ++++++++++++++++++++-----------------
 src/site/home/fr/index.md   | 53 +++++++++++++++++++-----------------
 4 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/conf/netlify/cms/config.yml b/conf/netlify/cms/config.yml
index 5ab79c16..22747378 100644
--- a/conf/netlify/cms/config.yml
+++ b/conf/netlify/cms/config.yml
@@ -182,26 +182,8 @@ collections:
     - { label: Lead image , name: lead_image, required: false, widget: image, i18n: true }
     - { label: "Lead image caption", name: lead_image_caption, required: false, i18n: true,
         widget: markdown, buttons: [bold, italic, link], editor_components: [], minimal: true }
-    - { label: "Paragraph 1 title", name: paragraph1_title, required: false, i18n: true,
+    - { label: "Paragraphs title", name: paragraphs_title, required: false, i18n: true,
         widget: markdown, buttons: [bold, italic, link], editor_components: [], minimal: true}
-    # community: remove when migrated to paragraphs
-    - { label: "Community title", name: community_title, required: false, i18n: true,
-        widget: markdown, buttons: [bold, italic, link], editor_components: [], minimal: true}
-    - { label: "Community description", name: community_description, required: false, widget: markdown, i18n: true }
-    - { label: "Community link text", name: community_link_text, required: false, widget: string, i18n: true }
-    # end of community
-    # mission: remove when migrated to paragraphs
-    - { label: "Mission title", name: mission_title, required: false, i18n: true,
-        widget: markdown, buttons: [bold, italic, link], editor_components: [], minimal: true}
-    - { label: "Mission description", name: mission_description, required: false, widget: markdown, i18n: true }
-    - { label: "Mission link text", name: mission_link_text, required: false, widget: string, i18n: true }
-    # end of mission
-    # partners: remove when migrated to paragraphs
-    - { label: "Partners title", name: partners_title, required: false, i18n: true,
-        widget: markdown, buttons: [bold, italic, link], editor_components: [], minimal: true}
-    - { label: "Partners description", name: partners_description, required: false, widget: markdown, i18n: true }
-    - { label: "Partners link text", name: partners_link_text, required: false, widget: string, i18n: true }
-    # end of partners
     - label: "Paragraphs"
       name: "paragraphs"
       widget: "list"
@@ -212,7 +194,7 @@ collections:
         - { label: "Description", name: description, required: false, widget: markdown, i18n: true }
         - { label: "Link text", name: link_text, required: false, widget: string, i18n: true }
         - { label: Link, name: url, required: false, widget: file, i18n: true,
-            hint: 'Write a relative url if you link to another page on this website. (for example "partners", not "/partners")'}
+            hint: 'Write a relative url if you link to another page on this website. (for example "partners/", not "/partners/")'}
         - { label: "Colored button", name: primary_button, required: false, widget: boolean, i18n: true }
 
     - { label: "News title", name: news_title, required: false, i18n: true,
diff --git a/src/site/_layouts/home.html b/src/site/_layouts/home.html
index 4263bafa..e8755460 100644
--- a/src/site/_layouts/home.html
+++ b/src/site/_layouts/home.html
@@ -7,7 +7,7 @@
   the code to `home/en/index.html` and `home/fr/index.html`
 #}
 <section id="purpose">
-  <h1>{% inlineMarkdown paragraph1_title %}</h1>
+  <h1>{% inlineMarkdown paragraphs_title %}</h1>
   <div class="grid-layout-halves with-gutters">
     {% if community_title %}
     <div class="grid-cell">
diff --git a/src/site/home/en/index.md b/src/site/home/en/index.md
index f44d99fe..70efc2a8 100644
--- a/src/site/home/en/index.md
+++ b/src/site/home/en/index.md
@@ -7,33 +7,37 @@ lead: The community of **‹SITE-TITLE›**
 lead_image: /assets/media/home-hero-image.jpg
 lead_image_caption: Photo by [Mary Eineman](https://unsplash.com/@maryeineman)
   on [Unsplash](https://unsplash.com/photos/sQtGjRSOyGk)
-paragraph1_title: We define a new relationship to data
-community_title: We are a collective of users
-community_description: "‹SITE-TITLE› is you and me: app users and
-  people keen to understand privacy in relationships formed online. The
-  collective is worried about the way our intimate life is being coded and
-  exposed online. We aim to retake control of personal data on apps,
-  understand the privacy problems they create, and work to improve data
-  literacy."
-community_link_text: Join us
-mission_title: We work to understand what's being done
-mission_description: >-
-  We want to understand many privacy risks that we, as app users, are
-  confronted with when looking for a date online: unwanted ads, discrimination
-  resulting from data, incorrect profiling and predictions, and the possibility
-  of phishing and identity theft by rogue users.
+paragraphs_title: We define a new relationship to data
+paragraphs:
+  - title: We are a collective of users
+    description: "Dating Privacy is you and me: dating app users and
+      people keen to understand privacy in relationships formed online. The
+      collective is worried about the way our intimate life is being coded and
+      exposed online. We aim to retake control of personal data on dating apps,
+      understand the privacy problems they create, and work to improve data
+      literacy."
+    link_text: Join us
+    url: community/
+  - title: We work to understand what's being done
+    description: >-
+      We want to understand many privacy risks that we, as dating app users, are
+      confronted with when looking for a date online: unwanted ads, discrimination
+      resulting from data, incorrect profiling and predictions, and the possibility
+      of phishing and identity theft by rogue users.
+    
+    
+      Our ultimate goal is to bring together users and privacy enthusiasts to push for a paradigm shift.
+    link_text: Learn more
+    url: mission/
+  - title: We connect with many partners
+    description: >-
+      We are looking to collaborate with journalists, academics, researchers,
+      activists and NGOs in data protection and other related themes.
 
 
-  Our ultimate goal is to bring together users and privacy enthusiasts to push for a paradigm shift.
-mission_link_text: Learn more
-partners_title: We connect with many partners
-partners_description: >-
-  We are looking to collaborate with journalists, academics, researchers,
-  activists and NGOs in data protection and other related themes.
-
-
-  We push ideas for better user and company practices to control personal data and date safely online. We are particularly interested in raising awareness, as well as building methodological protocols and privacy tools for data protection and literacy.
-partners_link_text: Contact us
+      We push ideas for better user and company practices to control personal data and date safely online. We are particularly interested in raising awareness, as well as building methodological protocols and privacy tools for data protection and literacy.
+    link_text: Contact us
+    url: partners/
 news_title: News and events
 news:
   - type: infographic
diff --git a/src/site/home/fr/index.md b/src/site/home/fr/index.md
index e4afb96e..fdaa535b 100644
--- a/src/site/home/fr/index.md
+++ b/src/site/home/fr/index.md
@@ -7,33 +7,38 @@ lead: The community of **‹SITE-TITLE›**
 lead_image: /assets/media/home-hero-image.jpg
 lead_image_caption: Photo by [Mary Eineman](https://unsplash.com/@maryeineman)
   on [Unsplash](https://unsplash.com/photos/sQtGjRSOyGk)
-paragraph1_title: We define a new relationship to data
-community_title: We are a collective of users
-community_description: "‹SITE-TITLE› is you and me: app users and
-  people keen to understand privacy in relationships formed online. The
-  collective is worried about the way our intimate life is being coded and
-  exposed online. We aim to retake control of personal data on apps,
-  understand the privacy problems they create, and work to improve data
-  literacy."
-community_link_text: Join us
-mission_title: We work to understand what's being done
-mission_description: >-
-  We want to understand many privacy risks that we, as app users, are
-  confronted with when looking for a date online: unwanted ads, discrimination
-  resulting from data, incorrect profiling and predictions, and the possibility
-  of phishing and identity theft by rogue users.
+paragraphs_title: We define a new relationship to data
+paragraphs:
+  - title: We are a collective of users
+    description: "Dating Privacy is you and me: dating app users and
+      people keen to understand privacy in relationships formed online. The
+      collective is worried about the way our intimate life is being coded and
+      exposed online. We aim to retake control of personal data on dating apps,
+      understand the privacy problems they create, and work to improve data
+      literacy."
+    link_text: Join us
+    url: community/
+  - title: We work to understand what's being done
+    description: >-
+      We want to understand many privacy risks that we, as dating app users, are
+      confronted with when looking for a date online: unwanted ads, discrimination
+      resulting from data, incorrect profiling and predictions, and the possibility
+      of phishing and identity theft by rogue users.
+    
+    
+      Our ultimate goal is to bring together users and privacy enthusiasts to push for a paradigm shift.
+    link_text: Learn more
+    url: mission/
+  - title: We connect with many partners
+    description: >-
+      We are looking to collaborate with journalists, academics, researchers,
+      activists and NGOs in data protection and other related themes.
 
 
-  Our ultimate goal is to bring together users and privacy enthusiasts to push for a paradigm shift.
-mission_link_text: Learn more
-partners_title: We connect with many partners
-partners_description: >-
-  We are looking to collaborate with journalists, academics, researchers,
-  activists and NGOs in data protection and other related themes.
+      We push ideas for better user and company practices to control personal data and date safely online. We are particularly interested in raising awareness, as well as building methodological protocols and privacy tools for data protection and literacy.
+    link_text: Contact us
+    url: partners/
 
-
-  We push ideas for better user and company practices to control personal data and date safely online. We are particularly interested in raising awareness, as well as building methodological protocols and privacy tools for data protection and literacy.
-partners_link_text: Contact us
 news_title: News and events
 news:
   - type: infographic