From 8abffeb86cca29611f89f20485fbf0943ec8cfaa Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 24 Apr 2019 16:30:07 +0300
Subject: [PATCH] Using clean JSON instead of YAML #123 #117

---
 site/themes/default/default.json             | 13 ++++
 site/themes/default/default.yaml             | 10 ---
 site/themes/default/fieldsets/about.json     | 67 +++++++++++++++++
 site/themes/default/fieldsets/about.yaml     | 49 -------------
 site/themes/default/fieldsets/blog-post.json | 36 +++++++++
 site/themes/default/fieldsets/blog-post.yaml | 25 -------
 site/themes/default/fieldsets/blog.json      | 57 +++++++++++++++
 site/themes/default/fieldsets/blog.yaml      | 41 -----------
 site/themes/default/fieldsets/default.json   | 77 ++++++++++++++++++++
 site/themes/default/fieldsets/default.yaml   | 57 ---------------
 site/themes/default/settings.json            |  3 +
 site/themes/default/settings.yaml            |  1 -
 12 files changed, 253 insertions(+), 183 deletions(-)
 create mode 100755 site/themes/default/default.json
 delete mode 100755 site/themes/default/default.yaml
 create mode 100644 site/themes/default/fieldsets/about.json
 delete mode 100644 site/themes/default/fieldsets/about.yaml
 create mode 100644 site/themes/default/fieldsets/blog-post.json
 delete mode 100644 site/themes/default/fieldsets/blog-post.yaml
 create mode 100644 site/themes/default/fieldsets/blog.json
 delete mode 100644 site/themes/default/fieldsets/blog.yaml
 create mode 100644 site/themes/default/fieldsets/default.json
 delete mode 100644 site/themes/default/fieldsets/default.yaml
 create mode 100755 site/themes/default/settings.json
 delete mode 100755 site/themes/default/settings.yaml

diff --git a/site/themes/default/default.json b/site/themes/default/default.json
new file mode 100755
index 00000000..5c957db8
--- /dev/null
+++ b/site/themes/default/default.json
@@ -0,0 +1,13 @@
+{
+  "name": "Default",
+  "version": "1.0.0",
+  "description": "Default theme for Flextype",
+  "author": {
+    "name": "Sergey Romanenko",
+    "email": "awilum@yandex.ru",
+    "url": "https://github.com/Awilum"
+  },
+  "homepage": "https://github.com/flextype/flextype",
+  "bugs": "https://github.com/flextype/flextype/issues",
+  "license": "MIT"
+}
diff --git a/site/themes/default/default.yaml b/site/themes/default/default.yaml
deleted file mode 100755
index 53a662b3..00000000
--- a/site/themes/default/default.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Default
-version: 1.0.0
-description: Default theme for Flextype
-author:
-  name: Sergey Romanenko
-  email: awilum@yandex.ru
-  url: https://github.com/Awilum
-homepage: https://github.com/flextype/flextype
-bugs: https://github.com/flextype/flextype/issues
-license: MIT
diff --git a/site/themes/default/fieldsets/about.json b/site/themes/default/fieldsets/about.json
new file mode 100644
index 00000000..41f00b51
--- /dev/null
+++ b/site/themes/default/fieldsets/about.json
@@ -0,0 +1,67 @@
+{
+  "title": "About",
+  "default_field": "title",
+  "sections": {
+    "main": {
+      "title": "Main",
+      "fields": {
+        "title": {
+          "title": "admin_title",
+          "type": "text",
+          "size": "col-12"
+        },
+        "content": {
+          "title": "admin_content",
+          "type": "html",
+          "size": "col-12"
+        },
+        "image": {
+          "title": "admin_media",
+          "type": "media_select",
+          "size": "col-3"
+        }
+      }
+    },
+    "seo": {
+      "title": "Seo",
+      "fields": {
+        "description": {
+          "title": "admin_description",
+          "type": "textarea",
+          "size": "col-12"
+        }
+      }
+    },
+    "menu": {
+      "title": "Menu",
+      "fields": {
+        "menu_item_title": {
+          "title": "admin_menu_item_title",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_url": {
+          "title": "admin_menu_item_url",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_target": {
+          "title": "admin_menu_item_target",
+          "type": "select",
+          "options": {
+            "blank": "_blank",
+            "self": "_self",
+            "parent": "_parent",
+            "top": "_top"
+          },
+          "size": "col-4"
+        },
+        "menu_item_order": {
+          "title": "admin_menu_item_order",
+          "type": "text",
+          "size": "col-4"
+        }
+      }
+    }
+  }
+}
diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml
deleted file mode 100644
index 0eb91be5..00000000
--- a/site/themes/default/fieldsets/about.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-title: About
-default_field: title
-sections:
-  main:
-    title: 'Main'
-    fields:
-      title:
-        title: admin_title
-        type: text
-        size: col-12
-      content:
-        title: admin_content
-        type: html
-        size: col-12
-      image:
-        title: admin_media
-        type: media_select
-        size: col-3
-  seo:
-    title: 'Seo'
-    fields:
-      description:
-        title: admin_description
-        type: textarea
-        size: col-12
-  menu:
-    title: 'Menu'
-    fields:
-      menu_item_title:
-        title: admin_menu_item_title
-        type: text
-        size: col-4
-      menu_item_url:
-        title: admin_menu_item_url
-        type: text
-        size: col-4
-      menu_item_target:
-        title: admin_menu_item_target
-        type: select
-        options:
-          blank: '_blank'
-          self: '_self'
-          parent: '_parent'
-          top: '_top'
-        size: col-4
-      menu_item_order:
-        title: admin_menu_item_order
-        type: text
-        size: col-4
diff --git a/site/themes/default/fieldsets/blog-post.json b/site/themes/default/fieldsets/blog-post.json
new file mode 100644
index 00000000..d167c7e5
--- /dev/null
+++ b/site/themes/default/fieldsets/blog-post.json
@@ -0,0 +1,36 @@
+{
+  "title": "Blog Post",
+  "default_field": "title",
+  "sections": {
+    "main": {
+      "title": "Main",
+      "fields": {
+        "title": {
+          "title": "admin_title",
+          "type": "text",
+          "size": "col-12"
+        },
+        "summary": {
+          "title": "admin_summary",
+          "type": "html",
+          "size": "col-12"
+        },
+        "content": {
+          "title": "admin_content",
+          "type": "html",
+          "size": "col-12"
+        }
+      }
+    },
+    "seo": {
+      "title": "Seo",
+      "fields": {
+        "description": {
+          "title": "admin_description",
+          "type": "textarea",
+          "size": "col-12"
+        }
+      }
+    }
+  }
+}
diff --git a/site/themes/default/fieldsets/blog-post.yaml b/site/themes/default/fieldsets/blog-post.yaml
deleted file mode 100644
index b6bf4b3e..00000000
--- a/site/themes/default/fieldsets/blog-post.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-title: 'Blog Post'
-default_field: title
-sections:
-  main:
-    title: 'Main'
-    fields:
-      title:
-        title: admin_title
-        type: text
-        size: col-12
-      summary:
-        title: admin_summary
-        type: html
-        size: col-12
-      content:
-        title: admin_content
-        type: html
-        size: col-12
-  seo:
-    title: 'Seo'
-    fields:
-      description:
-        title: admin_description
-        type: textarea
-        size: col-12
diff --git a/site/themes/default/fieldsets/blog.json b/site/themes/default/fieldsets/blog.json
new file mode 100644
index 00000000..26b30cac
--- /dev/null
+++ b/site/themes/default/fieldsets/blog.json
@@ -0,0 +1,57 @@
+{
+  "title": "Blog",
+  "default_field": "title",
+  "sections": {
+    "main": {
+      "title": "Main",
+      "fields": {
+        "title": {
+          "title": "admin_title",
+          "type": "text",
+          "size": "col-12"
+        }
+      }
+    },
+    "seo": {
+      "title": "Seo",
+      "fields": {
+        "description": {
+          "title": "admin_description",
+          "type": "textarea",
+          "size": "col-12"
+        }
+      }
+    },
+    "menu": {
+      "title": "Menu",
+      "fields": {
+        "menu_item_title": {
+          "title": "admin_menu_item_title",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_url": {
+          "title": "admin_menu_item_url",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_target": {
+          "title": "admin_menu_item_target",
+          "type": "select",
+          "options": {
+            "blank": "_blank",
+            "self": "_self",
+            "parent": "_parent",
+            "top": "_top"
+          },
+          "size": "col-4"
+        },
+        "menu_item_order": {
+          "title": "admin_menu_item_order",
+          "type": "text",
+          "size": "col-4"
+        }
+      }
+    }
+  }
+}
diff --git a/site/themes/default/fieldsets/blog.yaml b/site/themes/default/fieldsets/blog.yaml
deleted file mode 100644
index 3384c995..00000000
--- a/site/themes/default/fieldsets/blog.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-title: Blog
-default_field: title
-sections:
-  main:
-    title: 'Main'
-    fields:
-      title:
-        title: admin_title
-        type: text
-        size: col-12
-  seo:
-    title: 'Seo'
-    fields:
-      description:
-        title: admin_description
-        type: textarea
-        size: col-12
-  menu:
-    title: 'Menu'
-    fields:
-      menu_item_title:
-        title: admin_menu_item_title
-        type: text
-        size: col-4
-      menu_item_url:
-        title: admin_menu_item_url
-        type: text
-        size: col-4
-      menu_item_target:
-        title: admin_menu_item_target
-        type: select
-        options:
-          blank: '_blank'
-          self: '_self'
-          parent: '_parent'
-          top: '_top'
-        size: col-4
-      menu_item_order:
-        title: admin_menu_item_order
-        type: text
-        size: col-4
diff --git a/site/themes/default/fieldsets/default.json b/site/themes/default/fieldsets/default.json
new file mode 100644
index 00000000..63e3d6a0
--- /dev/null
+++ b/site/themes/default/fieldsets/default.json
@@ -0,0 +1,77 @@
+{
+  "title": "Default",
+  "default_field": "title",
+  "sections": {
+    "main": {
+      "title": "Main",
+      "fields": {
+        "title": {
+          "title": "admin_title",
+          "type": "text",
+          "size": "col-12"
+        },
+        "content": {
+          "title": "admin_content",
+          "type": "html",
+          "size": "col-12"
+        },
+        "template": {
+          "title": "admin_template",
+          "type": "template_select",
+          "size": "col-4"
+        },
+        "visibility": {
+          "title": "admin_visibility",
+          "type": "visibility_select",
+          "size": "col-4"
+        },
+        "date": {
+          "title": "admin_date",
+          "type": "text",
+          "size": "col-4"
+        }
+      }
+    },
+    "seo": {
+      "title": "Seo",
+      "fields": {
+        "description": {
+          "title": "admin_description",
+          "type": "textarea",
+          "size": "col-12"
+        }
+      }
+    },
+    "menu": {
+      "title": "Menu",
+      "fields": {
+        "menu_item_title": {
+          "title": "admin_menu_item_title",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_url": {
+          "title": "admin_menu_item_url",
+          "type": "text",
+          "size": "col-4"
+        },
+        "menu_item_target": {
+          "title": "admin_menu_item_target",
+          "type": "select",
+          "options": {
+            "blank": "_blank",
+            "self": "_self",
+            "parent": "_parent",
+            "top": "_top"
+          },
+          "size": "col-4"
+        },
+        "menu_item_order": {
+          "title": "admin_menu_item_order",
+          "type": "text",
+          "size": "col-4"
+        }
+      }
+    }
+  }
+}
diff --git a/site/themes/default/fieldsets/default.yaml b/site/themes/default/fieldsets/default.yaml
deleted file mode 100644
index 9b3b1e63..00000000
--- a/site/themes/default/fieldsets/default.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-title: Default
-default_field: title
-sections:
-  main:
-    title: 'Main'
-    fields:
-      title:
-        title: admin_title
-        type: text
-        size: col-12
-      content:
-        title: admin_content
-        type: html
-        size: col-12
-      template:
-        title: admin_template
-        type: template_select
-        size: col-4
-      visibility:
-        title: admin_visibility
-        type: visibility_select
-        size: col-4
-      date:
-        title: admin_date
-        type: text
-        size: col-4
-  seo:
-    title: 'Seo'
-    fields:
-      description:
-        title: admin_description
-        type: textarea
-        size: col-12
-  menu:
-    title: 'Menu'
-    fields:
-      menu_item_title:
-        title: admin_menu_item_title
-        type: text
-        size: col-4
-      menu_item_url:
-        title: admin_menu_item_url
-        type: text
-        size: col-4
-      menu_item_target:
-        title: admin_menu_item_target
-        type: select
-        options:
-          blank: '_blank'
-          self: '_self'
-          parent: '_parent'
-          top: '_top'
-        size: col-4
-      menu_item_order:
-        title: admin_menu_item_order
-        type: text
-        size: col-4
diff --git a/site/themes/default/settings.json b/site/themes/default/settings.json
new file mode 100755
index 00000000..4e609c71
--- /dev/null
+++ b/site/themes/default/settings.json
@@ -0,0 +1,3 @@
+{
+  "enabled": true
+}
diff --git a/site/themes/default/settings.yaml b/site/themes/default/settings.yaml
deleted file mode 100755
index d4ca9418..00000000
--- a/site/themes/default/settings.yaml
+++ /dev/null
@@ -1 +0,0 @@
-enabled: true