From abed0650752c6ed55211d51edb5c39bd634f0b15 Mon Sep 17 00:00:00 2001
From: ManUtopiK <emmanuel.salomon@gmail.com>
Date: Mon, 13 Sep 2021 11:48:34 +0200
Subject: [PATCH] settings: fix meta description

---
 nuxt.config.js               |  8 ++++++--
 static/admin/config.yml      | 29 +++++++++++++++--------------
 static/settings/globals.json |  3 ++-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index b8a6c344..da11f698 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,5 @@
 import i18n from './plugins/i18n.js'
+import config from './static/settings/globals.json'
 
 export default {
   target: 'static',
@@ -7,14 +8,15 @@ export default {
    * Global page headers (https://go.nuxtjs.dev/config-head)
    */
   head: {
-    title: process.env.npm_package_name || '',
+    title: config.site_title || process.env.npm_package_name || '',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
       {
         hid: 'description',
         name: 'description',
-        content: process.env.npm_package_description || '',
+        content:
+          config.site_description || process.env.npm_package_description || '',
       },
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.svg' }],
@@ -161,6 +163,8 @@ export default {
       name: 'Monnaie Libre',
       lang: 'fr',
       theme_color: '#5b21b6',
+      description:
+        config.site_description || process.env.npm_package_description,
       ogHost: 'monnaie-libre.fr',
       twitterCard: 'summary_large_image',
       twitterSite: '@monnaie_libre',
diff --git a/static/admin/config.yml b/static/admin/config.yml
index 078a5e60..cf25ffc2 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -1,21 +1,21 @@
-site_url: https://monnaie-libre-fr.duniter.io/
-# site_url: http://localhost:3000
 # site_url: https://monnaie-libre.fr
+site_url: http://localhost:3000
+# site_url: https://monnaie-libre-fr.duniter.io/
 logo_url: /admin/favicon-admin.svg
 
 backend:
 ## Local backend configuration
-#   name: git-gateway
-#   branch: master
-# local_backend: true
-## gitlab backend configuration
-  name: gitlab
-  repo: "websites/monnaie-libre-fr"
-  auth_type: implicit # Required for implicit grant
-  app_id: 89385b45d03d39342b0733071df9bcab4141cef55b5b84f36cf111d066fa0cd2 # Application ID from your GitLab settings
-  api_root: https://git.duniter.org/api/v4
-  base_url: https://git.duniter.org
-  auth_endpoint: oauth/authorize
+  name: git-gateway
+  branch: master
+local_backend: true
+## gitlab backend configuration https://www.netlifycms.org/docs/gitlab-backend/
+#  name: gitlab
+#  repo: "websites/monnaie-libre-fr"
+#  auth_type: pkce
+#  app_id: 6e22ae7895c421f05b6f5443f29db4008e62889efe9166e04d859677e965a173 # Application ID from https://git.duniter.org/groups/websites/-/settings/applications
+#  api_root: https://git.duniter.org/api/v4
+#  base_url: https://git.duniter.org
+#  auth_endpoint: oauth/authorize
 
 publish_mode: editorial_workflow
 
@@ -164,7 +164,8 @@ collections:
         label: Général
         file: static/settings/globals.json
         fields:
-          - { label: Titre du site, name: site_title, widget: string }
           - { label: Url du site, name: site_url, widget: string }
+          - { label: Titre du site, name: site_title, widget: string }
           - { label: Logo du site, name: site_logo, widget: image, allow_multiple: false }
+          - { label: Meta description du site, name: site_description, widget: string }
           - { label: Url du forum, name: forum_url, widget: string }
\ No newline at end of file
diff --git a/static/settings/globals.json b/static/settings/globals.json
index a963c4b6..b58395a5 100644
--- a/static/settings/globals.json
+++ b/static/settings/globals.json
@@ -2,5 +2,6 @@
   "site_url": "https://monnaie-libre.fr/",
   "site_logo": "/img/logo-monnaie-libre.svg",
   "site_title": "monnaie-libre.fr",
-  "forum_url": "https://forum.monnaie-libre.fr/"
+  "forum_url": "https://forum.monnaie-libre.fr/",
+  "site_description": "Tout savoir sur la monnaie libre ! Une monnaie au service de l'homme, le mettant au centre de l'économie."
 }
\ No newline at end of file
-- 
GitLab