From 850417fb1688315ffde89841aedc0d93c7bdfc5e Mon Sep 17 00:00:00 2001
From: vjeantet <valere.jeantet@gmail.com>
Date: Fri, 11 Sep 2020 09:05:05 +0200
Subject: refactor netlify config

---
 exampleSite/config-template.toml                 | 12 +-----------
 exampleSite/config.toml                          | 10 ----------
 exampleSite/content/_layout/netlifycms/config.md | 13 ++++++++++---
 layouts/_default/single.netlifyyaml.yml          | 24 ++----------------------
 4 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/exampleSite/config-template.toml b/exampleSite/config-template.toml
index 60f11be..a8acdfa 100644
--- a/exampleSite/config-template.toml
+++ b/exampleSite/config-template.toml
@@ -30,17 +30,7 @@ menushortcutsnewtab = false # set true to open shortcuts links to a new tab/wind
 #editURL = "https://github.com/vjeantet/hugo-theme-docport/edit/master/exampleSite/content/"
 enableGitInfo = true
 
-# NetlifyCMS Options
-#editWithNetlifyCMSURL = "admin/#/collections/pages/entries/"
-#netlifycms_backend_name = "github"
-#netlifycms_backend_repo = "vjeantet/hugo-theme-docport"
-#netlifycms_backend_branch = "master"
-#netlifycms_backend_open_authoring = true
-#netlifycms_backend_authtype = " implicit"
-#netlifycms_backend_api_id = "L4M2L3K4ML23K4ML3K42LK342L3M4K23MLK42L3MK4"
-#netlifycms_backend_api_root = " https://xxxxxxxxxx/api/v4"
-#netlifycms_backend_base_url = "https://xxxxxxxxxxxxx"
-#netlifycms_backend_auth_endpoint = "oauth/authorize"
+
 
 [mediaTypes]
   [mediaTypes."application/netlifyconfig"]
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 669853e..6ab59da 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -36,16 +36,6 @@ menushortcutsnewtab = false # set true to open shortcuts links to a new tab/wind
 editWithNetlifyCMSURL = "admin/#/collections/pages/entries/"
 enableGitInfo = true
 
-netlifycms_backend_name = "github"
-netlifycms_backend_repo = "vjeantet/hugo-theme-docport"
-netlifycms_backend_branch = "master"
-netlifycms_backend_open_authoring = true
-#netlifycms_backend_authtype = " implicit"
-#netlifycms_backend_api_id = "L4M2L3K4ML23K4ML3K42LK342L3M4K23MLK42L3MK4"
-#netlifycms_backend_api_root = " https://xxxxxxxxxx/api/v4"
-#netlifycms_backend_base_url = "https://xxxxxxxxxxxxx"
-#netlifycms_backend_auth_endpoint = "oauth/authorize"
-
 [mediaTypes]
   [mediaTypes."application/netlifyconfig"]
     suffixes = ["yml"]
diff --git a/exampleSite/content/_layout/netlifycms/config.md b/exampleSite/content/_layout/netlifycms/config.md
index 1d97d50..f7b6c1e 100644
--- a/exampleSite/content/_layout/netlifycms/config.md
+++ b/exampleSite/content/_layout/netlifycms/config.md
@@ -1,8 +1,15 @@
 ---
-netlifycms_content_folder: exampleSite/content
+netlifycms_content_folder: "exampleSite/content"
 outputs:
 - netlifyyaml
-title: Netlify config file
 url: /admin/config.yml
 ---
-
+backend:
+  name: "github"
+  repo: "vjeantet/hugo-theme-docport"
+  branch: "master"
+  open_authoring: true
+
+media_folder: "static/images/uploads" # Media files will be stored in the repo under images/uploads
+public_folder: "/images/uploads" # The src attribute for uploaded media will begin with /images/uploads
+publish_mode: editorial_workflow
\ No newline at end of file
diff --git a/layouts/_default/single.netlifyyaml.yml b/layouts/_default/single.netlifyyaml.yml
index ddc310d..6e5222f 100644
--- a/layouts/_default/single.netlifyyaml.yml
+++ b/layouts/_default/single.netlifyyaml.yml
@@ -1,29 +1,9 @@
-media_folder: "static/images/uploads" # Media files will be stored in the repo under images/uploads
-public_folder: "/images/uploads" # The src attribute for uploaded media will begin with /images/uploads
-publish_mode: editorial_workflow
-backend:
-  {{if ne nil .Site.Params.netlifycms_backend_name}}name: {{.Site.Params.netlifycms_backend_name}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_repo}}
-  repo: {{.Site.Params.netlifycms_backend_repo}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_branch}}
-  branch: {{.Site.Params.netlifycms_backend_branch}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_authtype}}
-  auth_type: {{.Site.Params.netlifycms_backend_authtype}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_api_id}}
-  app_id: {{.Site.Params.netlifycms_backend_api_id}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_api_root}}
-  api_root: {{.Site.Params.netlifycms_backend_api_root}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_base_url}}
-  base_url: {{.Site.Params.netlifycms_backend_base_url}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_auth_endpoint}}
-  auth_endpoint: {{.Site.Params.netlifycms_backend_auth_endpoint}}{{end}}
-  {{- if ne nil .Site.Params.netlifycms_backend_open_authoring}}
-  open_authoring: {{.Site.Params.netlifycms_backend_open_authoring}}{{end}}
+{{.RawContent}}
 
 collections:
   - name: "pages"
     label: "Pages"
-    folder: "{{.Params.netlifycms_content_folder}}"
+    folder: "{{with .Params.netlifycms_content_folder}}{{.}}{{else}}content{{end}}"
     create: true
     media_folder: ''
     public_folder: ''
-- 
cgit v1.2.3