clean up a bunch of layouts, especially social-images function

also made even more config.toml parameters optional, will help when finally releasing theme

layouts/partials/head/schema/article.html

@@ -17,19 +17,19 @@
   "publisher": {
     "@type": "Organization",
     "name": {{ .Site.Title }},
-    "url": {{ .Site.BaseURL }},
+    "url": {{ .Site.BaseURL }}{{ with .Scratch.Get "logoImage" }},
     "logo": {
       "@type": "ImageObject",
-      "url": {{ .Scratch.Get "logoImage_url" | absURL }},
-      "width": "{{ .Scratch.Get "logoImage_width" }}",
-      "height": "{{ .Scratch.Get "logoImage_height" }}"
-    }
-  },
+      "url": {{ .Permalink }},
+      "width": "{{ .Width }}",
+      "height": "{{ .Height }}"
+    }{{ end }}
+  }{{ with .Scratch.Get "pageImage" }},
   "image": {
     "@type": "ImageObject",
-    "url": {{ .Scratch.Get "socialImage_url" | absURL }},
-    "width": "{{ .Scratch.Get "socialImage_width" }}",
-    "height": "{{ .Scratch.Get "socialImage_height" }}"
-  }
+    "url": {{ .Permalink }},
+    "width": "{{ .Width }}",
+    "height": "{{ .Height }}"
+  }{{ end }}
 }
 </script>

layouts/partials/head/schema/person.html

@@ -7,13 +7,13 @@
   "name": {{ .name }},
   "url": {{ $.Site.BaseURL }},
   "description": {{ $.Site.Params.description }},
-  {{ with .jobtitle }}"jobTitle": {{ . }},{{ end }}
+  {{ with .jobtitle }}"jobTitle": {{ . }},{{ end }}{{ with $.Scratch.Get "authorImage" }}
   "image": {
     "@type": "ImageObject",
-    "url": {{ $.Scratch.Get "defaultImage_url" | absURL }},
-    "width": "{{ $.Scratch.Get "defaultImage_width" }}",
-    "height": "{{ $.Scratch.Get "defaultImage_height" }}"
-  },
+    "url": {{ .Permalink }},
+    "width": "{{ .Width }}",
+    "height": "{{ .Height }}"
+  },{{ end }}
   "sameAs": [
     {{ $.Site.BaseURL }},
     {{ with .github }}{{ printf "%s%s" "https://github.com/" . }},{{ end }}