fix issue #66

resumic · Mar 10, 2019 · cd06570156457fd34a763db2fb1901146dd57c27 · cd06570
1 parent 416b968
commit cd06570156457fd34a763db2fb1901146dd57c27
Unified Split

Showing with 122 additions and 105 deletions.

+3 −1 example.json

+56 −50 schema.json

+5 −1 schema/schema.go

+1 −1 theme/defaults/test-theme/layouts/resumic/single.html

+57 −52 ui.json
diff --git a/example.json b/example.json
@@ -1,7 +1,9 @@
 {
   "core": {
+    "title": "Software Engineer"
+  },
+  "personal": {
     "name": "John Doe",
-    "title": "Software Engineer",
     "image": "example.com/Abcxyz",
     "email": "lucas@example.com",
     "phone": "912-217-7923",

diff --git a/schema.json b/schema.json
@@ -82,59 +82,9 @@
     },
     "core": {
       "properties": {
-        "currentLocation": {
-          "description": "living location",
-          "properties": {
-            "lat": {
-              "type": "number"
-            },
-            "long": {
-              "type": "number"
-            }
-          },
-          "type": "object"
-        },
-        "email": {
-          "description": "email address",
-          "format": "email",
-          "type": "string"
-        },
-        "image": {
-          "description": "url of the personal photo",
-          "type": "string"
-        },
-        "name": {
-          "description": "full name",
-          "type": "string"
-        },
-        "permanentLocation": {
-          "description": "permanently living location",
-          "properties": {
-            "lat": {
-              "type": "number"
-            },
-            "long": {
-              "type": "number"
-            }
-          },
-          "type": "object"
-        },
-        "phone": {
-          "description": "phone number",
-          "type": "string"
-        },
-        "summary": {
-          "description": "a short sentence about yourself",
-          "type": "string"
-        },
         "title": {
           "description": "job title",
           "type": "string"
-        },
-        "url": {
-          "description": "homepage url",
-          "format": "uri",
-          "type": "string"
         }
       },
       "type": "object"
@@ -330,6 +280,62 @@
       },
       "type": "object"
     },
+    "personal": {
+      "description": "sensitive informations",
+      "properties": {
+        "currentLocation": {
+          "description": "living location",
+          "properties": {
+            "lat": {
+              "type": "number"
+            },
+            "long": {
+              "type": "number"
+            }
+          },
+          "type": "object"
+        },
+        "email": {
+          "description": "email address",
+          "format": "email",
+          "type": "string"
+        },
+        "image": {
+          "description": "url of the personal photo",
+          "type": "string"
+        },
+        "name": {
+          "description": "full name",
+          "type": "string"
+        },
+        "permanentLocation": {
+          "description": "permanently living location",
+          "properties": {
+            "lat": {
+              "type": "number"
+            },
+            "long": {
+              "type": "number"
+            }
+          },
+          "type": "object"
+        },
+        "phone": {
+          "description": "phone number",
+          "type": "string"
+        },
+        "summary": {
+          "description": "a short sentence about yourself",
+          "type": "string"
+        },
+        "url": {
+          "description": "homepage url",
+          "format": "uri",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "projects": {
       "description": "list of career projects",
       "items": {

diff --git a/schema/schema.go b/schema/schema.go
@@ -16,8 +16,11 @@ type resourceSchema struct {
 }
 
 type coreSchema struct {
+	Title string `json:"title" schema:"description:job title;example:Software Engineer"`
+}
+
+type personalSchema struct {
 	Name              string         `json:"name" schema:"description:full name;example:John Doe"`
-	Title             string         `json:"title" schema:"description:job title;example:Software Engineer"`
 	Image             string         `json:"image" schema:"description:url of the personal photo;example:example.com/Abcxyz"`
 	Email             string         `json:"email" schema:"description:email address;format:email;example:lucas@example.com"`
 	Phone             string         `json:"phone" schema:"description:phone number;example:912-217-7923"`
@@ -150,6 +153,7 @@ type metaSchema struct {
 // properties order in the struct.
 type Schema struct {
 	Core         coreSchema          `json:"core"`
+	Personal     personalSchema      `json:"personal" schema:"description:sensitive informations"`
 	Work         []workSchema        `json:"work"`
 	Education    []educationSchema   `json:"education"`
 	Volunteer    []volunteerSchema   `json:"volunteer"`

diff --git a/theme/defaults/test-theme/layouts/resumic/single.html b/theme/defaults/test-theme/layouts/resumic/single.html
@@ -1,6 +1,6 @@
 <html>
     <body>
         {{ $resume := index $.Site.Data.resumic .File.BaseFileName }}
-        {{ $resume.core.name }} - {{ $resume.core.title }}
+        {{ $resume.personal.name }} - {{ $resume.core.title }}
     </body>
 </html>
diff --git a/ui.json b/ui.json
@@ -69,62 +69,12 @@
     }
   },
   "core": {
-    "currentLocation": {
-      "lat": {
-        "ui:placeholder": "35.712758"
-      },
-      "long": {
-        "ui:placeholder": "51.392114"
-      },
-      "ui:order": [
-        "lat",
-        "long"
-      ]
-    },
-    "email": {
-      "ui:placeholder": "lucas@example.com"
-    },
-    "image": {
-      "ui:placeholder": "example.com/Abcxyz"
-    },
-    "name": {
-      "ui:placeholder": "John Doe"
-    },
-    "permanentLocation": {
-      "lat": {
-        "ui:placeholder": "35.712758"
-      },
-      "long": {
-        "ui:placeholder": "51.392114"
-      },
-      "ui:order": [
-        "lat",
-        "long"
-      ]
-    },
-    "phone": {
-      "ui:placeholder": "912-217-7923"
-    },
-    "summary": {
-      "ui:placeholder": "The man who sold the world!"
-    },
     "title": {
       "ui:placeholder": "Software Engineer"
     },
     "ui:order": [
-      "name",
-      "title",
-      "image",
-      "email",
-      "phone",
-      "url",
-      "summary",
-      "currentLocation",
-      "permanentLocation"
-    ],
-    "url": {
-      "ui:placeholder": "http://www.example.com/"
-    }
+      "title"
+    ]
   },
   "education": {
     "items": {
@@ -292,6 +242,60 @@
       "ui:placeholder": "v1.0.0"
     }
   },
+  "personal": {
+    "currentLocation": {
+      "lat": {
+        "ui:placeholder": "35.712758"
+      },
+      "long": {
+        "ui:placeholder": "51.392114"
+      },
+      "ui:order": [
+        "lat",
+        "long"
+      ]
+    },
+    "email": {
+      "ui:placeholder": "lucas@example.com"
+    },
+    "image": {
+      "ui:placeholder": "example.com/Abcxyz"
+    },
+    "name": {
+      "ui:placeholder": "John Doe"
+    },
+    "permanentLocation": {
+      "lat": {
+        "ui:placeholder": "35.712758"
+      },
+      "long": {
+        "ui:placeholder": "51.392114"
+      },
+      "ui:order": [
+        "lat",
+        "long"
+      ]
+    },
+    "phone": {
+      "ui:placeholder": "912-217-7923"
+    },
+    "summary": {
+      "ui:placeholder": "The man who sold the world!"
+    },
+    "ui:order": [
+      "name",
+      "image",
+      "email",
+      "phone",
+      "url",
+      "summary",
+      "currentLocation",
+      "permanentLocation"
+    ],
+    "url": {
+      "ui:placeholder": "http://www.example.com/"
+    }
+  },
   "projects": {
     "items": {
       "description": {
@@ -466,6 +470,7 @@
   },
   "ui:order": [
     "core",
+    "personal",
     "work",
     "education",
     "volunteer",