- {{#resume.basics}}
-
-
-
-
-
-
- {% if resume.basics.profiles|not-empty %}
-
-
-
-
-
-
-
- Email
-
- {{resume.basics.email|email}}
-
- Location
-
- {% if resume.basics.phone|not-empty %}
- {{resume.basics.location.city}}
-
-
-
- Phone
-
- {% endif %}
- {% if resume.basics.website|not-empty %}
- {{resume.basics.phone}}
-
- Website
-
- {% endif %}
-
- {{.}}
-
-
-
- {{resume.basics.summary}}
-
-
- {% for profile in resume.basics.profiles %}
-
-
- {{profile.network}}
-
- {% if profile.username|not-empty %}
-
- {% if profile.url|not-empty %}
-
-
-
+
+ {% if resume.basics.profiles|not-empty %}
+
+
+
+ {% endif %}
-
-
-
- {{profile.username}}
+ {{#resume.basics}}
+
+
+
-
- {% endif %}
-
-
+
-
+
- {% else %}
- {% if profile.url|not-empty %}
-
+ Email
+
- {% else %}
- {{profile.username}}
- {% endif %}
- {{resume.basics.email|email}}
- {{profile.url}}
+
- {% endfor %}
-
+ Location
+
+ {% if resume.basics.phone|not-empty %}
+ {{resume.basics.location.city}}
+
+
+ Phone
+
{% endif %}
- {% endif %}
- {{resume.basics.phone}}
+
-
-
- {% for education in resume.education %}
-
-
-
- - {{education.institution}} - - {{education.startDate|date:"MMM yyyy"}} — {{education.endDate|date:"MMM yyyy"}} - -
-
- {{education.area}}
+ {% if resume.basics.website|not-empty %}
+
+ Website
+
+ {% endif %}
+
+ {{.}}
+
+
- {{education.studyType}}
+
+
+
+
- {% endfor %}
-
+
- {{resume.basics.summary}}
+
+
+ {% for profile in resume.basics.profiles %}
+
+
+
+ {{profile.network}}
+
+ {% if profile.username|not-empty %}
+
+ {% endfor %}
+
+ {% if profile.url|not-empty %}
+
+ {% else %}
+ {{profile.username}}
+ {% endif %}
+
+ {% else %}
+ {% if profile.url|not-empty %}
+
+ {{profile.url}}
+
+ {% endif %}
+ {% endif %}
+
-
-
-
+
+
+ {% endif %}
+
+
diff --git a/src/resume/resume_json.clj b/src/resume/resume_json.clj
index a9a19e8..dfb4d03 100644
--- a/src/resume/resume_json.clj
+++ b/src/resume/resume_json.clj
@@ -72,6 +72,7 @@
name :heading} experience]
{:summary (first text)
:company name
+ :website (get options "WEBSITE")
:position (get options "POSITION")
:startDate (parse-date (get options "FROM"))
:endDate (parse-date (get options "TO"))
diff --git a/test/resume/resume_json_test.clj b/test/resume/resume_json_test.clj
index 955c3d0..408b563 100644
--- a/test/resume/resume_json_test.clj
+++ b/test/resume/resume_json_test.clj
@@ -49,6 +49,7 @@
:position "Senior Javascript Developer"
:startDate (sut/parse-date "2018-03-01")
:endDate (sut/parse-date "2019-03-01")
+ :website nil
:highlights ["React, Apollo, Styled Components"
"Node.js / Rails"]})
- {% for skill in resume.skills %}
-
-
+
- {% if resume.languages|not-empty %}
-
-
-
-
+
+
- {% endfor %}
- {{skill.name}}
+
+
-
+ {% for education in resume.education %}
+
+
+ {% endfor %}
+ + {{education.institution}} + + {{education.startDate|date:"MMM yyyy"}} — {{education.endDate|date:"MMM yyyy"}} + +
+
+ {{education.area}}
+
+
+ {{education.studyType}}
+
+ -
- {% for keyword in skill.keywords %}
-
- {{keyword}} - {% endfor %} -
-
+
+
+ {% endif %}
- {% if resume.work|not-empty %}
-
-
-
- {% endif %}
- {% if resume.interests|not-empty %}
-
-
-
- {% endif %}
+ {% if resume.work|not-empty %}
+
+
+
+ {% endif %}
-
+ {% if resume.interests|not-empty %}
+
- {% for language in resume.languages %}
-
-
- {% endif %}
+
+ {% if resume.languages|not-empty %}
+
-
-
- {{language.language}}
-
-
- {{language.fluency}}
+
+
+
- {% endfor %}
-
+
-
+ {% for skill in resume.skills %}
+
+
+ {% endfor %}
+
+
+ {{skill.name}}
+-
+ {% for keyword in skill.keywords %}
+
- {{keyword}} + {% endfor %} +
+
+
+ {% for language in resume.languages %}
+
+
+
+ {% endfor %}
+
+ {{language.language}}
+
+
+ {{language.fluency}}
+
+
-
-
- {% for work in resume.work %}
-
-
-
- {% endfor %}
- - {{work.company}} - - {{work.startDate|date:"MMM yyyy"}} — {{work.endDate|date:"MMM yyyy"|default:"now"}} - -
- {% with url=work.website %} - {% if url|not-empty %} -
- {{url}}
-
- {% endif %}
- {% endwith %}
-
- {{work.position}}
-
-
-
- {% if work.highlights|not-empty %}
- {{work.summary}}
--
- {% for highlight in work.highlights %}
-
- {{highlight}} - {% endfor %} -
-
-
- {% for interest in resume.interests %}
-
-
-
- {% endfor %}
-
-
- {% if interest.keywords|not-empty %}
- {{interest.name}}
--
- {% for keyword in interest.keywords %}
-
- {{keyword}} - {% endfor %} -
+
+
+ {% for work in resume.work %}
+
+
+
+ {% endfor %}
+ + {{work.company}} + + {{work.startDate|date:"MMM yyyy"}} — {{work.endDate|date:"MMM yyyy"|default:"now"}} + +
+ {% with url=work.website %} + {% if url|not-empty %} +
+ {{url}}
+
+ {% endif %}
+ {% endwith %}
+
+ {{work.position}}
+
+
+
+ {% if work.highlights|not-empty %}
+ {{work.summary}}
+-
+ {% for highlight in work.highlights %}
+
- {{highlight}} + {% endfor %} +
+
+
+ {% for interest in resume.interests %}
+
+
+
+ {% endfor %}
+
+
+ {% if interest.keywords|not-empty %}
+ {{interest.name}}
+-
+ {% for keyword in interest.keywords %}
+
- {{keyword}} + {% endfor %} +