Made variables more modular

_config.yml

@@ -6,7 +6,6 @@ url: 'http://webjeda.com'
 baseurl: '/online-cv' #change it according to your repository name
 # Style will be applied only after restarting the build or serve. Just choose one of the options.
 theme_skin: blue # blue turquoise green berry orange ceramic
-education_in_main: False # set to True if you want to remove education in main section instead of in sidebar
 
 # Tracker
 analytics: UA-83979019-1

_data/data.yml

@@ -4,6 +4,7 @@
 
 sidebar:
     about: True # set to false or comment line if you want to remove the "how to use?" in the sidebar
+    education: False # set to True if you want to remove education in main section instead of in sidebar
 
     # Profile information
     name: Alan Doe
@@ -44,7 +45,7 @@ sidebar:
 
 career-profile:
     title: Career Profile
-    text: |
+    summary: |
       Summarise your career here lorem ipsum dolor sit amet, consectetuer
       adipiscing elit. You can [download this free resume/CV template here]().
       Aenean commodo ligula eget dolor aenean massa. Cum sociis natoque
@@ -53,7 +54,7 @@ career-profile:
 
       Second paragraph if required.
 
-studies: 
+education:
     - degree: MSc in Computer Science
       university: University of London
       time: 2011 - 2012
@@ -81,9 +82,6 @@ studies:
           - Bullet point 
 
 experiences:
-    title: Experiences
-    
-    experiences:
     - role: Lead Developer
       time: 2015 - Present
       company: Startup Hubs, San Francisco
@@ -134,7 +132,7 @@ projects:
       section. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
       Vestibulum et ligula in nunc bibendum fringilla a eu lectus.
 
-    projects:
+    assignments:
       - title: Velocity
         link: "#hook"
         tagline: "A responsive website template designed to help startups promote, market and sell their products."
@@ -162,7 +160,7 @@ publications:
       amet, consectetur adipiscing elit. Vestibulum et ligula in nunc
       bibendum fringilla a eu lectus.
 
-    publications:
+    papers:
       - title: The Art of Computer Programming
         authors: Donald E. Knuth
         conference: Addison-Wesley, 1968
@@ -177,7 +175,8 @@ publications:
 
 skills:
     title: Skills & Proficiency
-    skills:
+
+    toolset:
       - name: Python & Django
         level: 98%
 
@@ -196,6 +195,5 @@ skills:
       - name: Sketch & Photoshop
         level: 60%
 
-footer: 
+footer: >
-    text: >
     Designed with <i class="fas fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="nofollow">Xiaoying Riley</a>

_includes/career-profile.html

@@ -1,4 +1,5 @@
-{% if site.data.data.career-profile %}
+{% assign career-profile = site.data.data.career-profile %}
+{% if career-profile %}
 <section class="section summary-section">
 
   <h2 class="section-title">
@@ -6,11 +7,11 @@
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fas fa-user fa-stack-1x fa-inverse"></i>
     </span>
-    {{ site.data.data.career-profile.title }}
+    {{ career-profile.title }}
   </h2>
 
   <div class="summary">
-    {{ site.data.data.career-profile.text | markdownify }}
+    {{ career-profile.summary | markdownify }}
   </div><!--//summary-->
     
 </section><!--//section-->

_includes/contact.html

@@ -1,63 +1,63 @@
 <div class="contact-container container-block">
   <ul class="list-unstyled contact-list">
 
-    {% if site.data.data.sidebar.email %}
+    {% if sidebar.email %}
     <li class="email"><i class="fas fa-envelope"></i>
-      <a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a>
+      <a href="mailto:{{ sidebar.email }}">{{ sidebar.email }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.phone %}
+    {% if sidebar.phone %}
     <li class="phone"><i class="fas fa-phone"></i>
-      <a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a>
+      <a href="tel:{{ sidebar.phone }}">{{ sidebar.phone }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.website %}
+    {% if sidebar.website %}
     <li class="website"><i class="fas fa-globe-americas"></i>
-      <a href="http://{{ site.data.data.sidebar.website }}" target="_blank">{{ site.data.data.sidebar.website }}</a>
+      <a href="http://{{ sidebar.website }}" target="_blank">{{ sidebar.website }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.linkedin %}
+    {% if sidebar.linkedin %}
     <li class="linkedin"><i class="fab fa-linkedin"></i>
-      <a href="https://linkedin.com/in/{{ site.data.data.sidebar.linkedin }}" target="_blank">{{ site.data.data.sidebar.linkedin }}</a>
+      <a href="https://linkedin.com/in/{{ sidebar.linkedin }}" target="_blank">{{ sidebar.linkedin }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.github %}
+    {% if sidebar.github %}
     <li class="github"><i class="fab fa-github"></i>
-      <a href="http://github.com/{{ site.data.data.sidebar.github }}" target="_blank">{{ site.data.data.sidebar.github }}</a>
+      <a href="http://github.com/{{ sidebar.github }}" target="_blank">{{ sidebar.github }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.gitlab %}
+    {% if sidebar.gitlab %}
     <li class="gitlab"><i class="fab fa-gitlab"></i>
-      <a href="http://gitlab.com/{{ site.data.data.sidebar.gitlab }}" target="_blank">{{ site.data.data.sidebar.gitlab }}</a>
+      <a href="http://gitlab.com/{{ sidebar.gitlab }}" target="_blank">{{ sidebar.gitlab }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.bitbucket %}
+    {% if sidebar.bitbucket %}
     <li class="bitbucket"><i class="fab fa-bitbucket"></i>
-      <a href="http://bitbucket.com/{{ site.data.data.sidebar.bitbucket }}" target="_blank">{{ site.data.data.sidebar.bitbucket }}</a>
+      <a href="http://bitbucket.com/{{ sidebar.bitbucket }}" target="_blank">{{ sidebar.bitbucket }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.twitter %}
+    {% if sidebar.twitter %}
     <li class="twitter"><i class="fab fa-twitter"></i>
-      <a href="https://twitter.com/{{ site.data.data.sidebar.twitter }}" target="_blank">{{ site.data.data.sidebar.twitter }}</a>
+      <a href="https://twitter.com/{{ sidebar.twitter }}" target="_blank">{{ sidebar.twitter }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.stack-overflow %}
+    {% if sidebar.stack-overflow %}
     <li class="stack-overflow"><i class="fab fa-stack-overflow"></i>
-      <a href="https://stackoverflow.com/users/{{ site.data.data.sidebar.stack-overflow }}" target="_blank">{{ site.data.data.sidebar.stack-overflow }}</a>
+      <a href="https://stackoverflow.com/users/{{ sidebar.stack-overflow }}" target="_blank">{{ sidebar.stack-overflow }}</a>
     </li>
     {% endif %}
 
-    {% if site.data.data.sidebar.codewars %}
+    {% if sidebar.codewars %}
     <li class="codewars"><i class="fas fa-code"></i>
-      <a href="https://www.codewars.com/users/{{ site.data.data.sidebar.codewars }}/completed_solutions" target="_blank">{{ site.data.data.sidebar.codewars }}</a>
+      <a href="https://www.codewars.com/users/{{ sidebar.codewars }}/completed_solutions" target="_blank">{{ sidebar.codewars }}</a>
     </li>
     {% endif %}
 

_includes/education.html

@@ -1,5 +1,6 @@
-{% if site.data.data.studies %}
+{% assign education = site.data.data.education %}
-  {% if site.education_in_main %}
+{% if education %}
+  {% if site.data.sidebar.education %}
     <section class="section educations-section">
 
       <h2 class="section-title">
@@ -10,22 +11,22 @@
         Education
       </h2>
 
-      {% for education in site.data.data.studies %}
+      {% for graduation in education %}
         <div class="item">
         
           <div class="meta">
           
             <div class="upper-row">
-              <h3 class="degree">{{ education.degree }}</h3>
+              <h3 class="degree">{{ graduation.degree }}</h3>
-              <div class="time">{{ education.time }}</div>
+              <div class="time">{{ graduation.time }}</div>
             </div><!--//upper-row-->
             
-            <div class="university">{{ education.university }}</div>
+            <div class="university">{{ graduation.university }}</div>
           </div><!--//meta-->
           
-          {% if education.details %}
+          {% if graduation.details %}
           <div class="details">
-            {{ education.details | markdownify }}
+            {{ graduation.details | markdownify }}
           </div><!--//details-->
           {% endif %}
         </div><!--//item-->
@@ -37,11 +38,11 @@
 
       <h2 class="container-block-title">Education</h2>
 
-      {% for education in site.data.data.studies %}
+      {% for graduation in education %}
       <div class="item">
-        <h4 class="degree">{{ education.degree }}</h4>
+        <h4 class="degree">{{ graduation.degree }}</h4>
-        <h5 class="meta">{{ education.university }}</h5>
+        <h5 class="meta">{{ graduation.university }}</h5>
-        <div class="time">{{ education.time }}</div>
+        <div class="time">{{ graduation.time }}</div>
       </div><!--//item-->
       {% endfor %}
 

_includes/experiences.html

@@ -1,14 +1,15 @@
-{% if site.data.data.experiences %}
+{% assign experiences = site.data.data.experiences %}
+{% if experiences %}
 <section class="section experiences-section">
   <h2 class="section-title">
     <span class="fa-stack fa-xs">
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fas fa-briefcase fa-stack-1x fa-inverse"></i>
     </span>
-    {{ site.data.data.experiences.title }}
+    Experiences
   </h2>
 
-  {% for experience in site.data.data.experiences.experiences %}
+  {% for experience in experiences %}
   <div class="item">
 
     <div class="meta">

_includes/footer.html

@@ -1,6 +1,6 @@
 <footer class="footer">
     <div class="text-center">
         <!--/* This template is released under the Creative Commons Attribution 3.0 License. Please keep the attribution link below when using for your own project. Thank you for your support. :) If you'd like to use the template without the attribution, you can check out other license options via our website: themes.3rdwavemedia.com */-->
-        <small class="copyright">{{ site.data.data.footer.text }}</small>
+        <small class="copyright">{{ site.data.data.footer }}</small>
     </div><!--//container-->
 </footer><!--//footer-->

_includes/head.html

@@ -1,5 +1,5 @@
 <head>
-  <title>{{ site.data.data.sidebar.title }}</title>
+  <title>{{ site.title }}</title>
 
   <!-- Meta -->
   <meta charset="utf-8">

_includes/interests.html

@@ -1,10 +1,11 @@
-{% if site.data.data.sidebar.interests %}
+{% assign interests = site.data.data.sidebar.interests %}
+{% if interests %}
 <div class="interests-container container-block">
 
   <h2 class="container-block-title">Interests</h2>
 
   <ul class="list-unstyled interests-list">
-    {% for interest in site.data.data.sidebar.interests %}
+    {% for interest in interests %}
 
       {% if interest.link %}
       <li><a href="{{ interest.link }}">{{ interest.item }}</a></li>

_includes/language.html

@@ -1,10 +1,11 @@
-{% if site.data.data.sidebar.languages %}
+{% assign languages = site.data.data.sidebar.languages %}
+{% if languages %}
 <div class="languages-container container-block">
 
   <h2 class="container-block-title">Languages</h2>
 
   <ul class="list-unstyled interests-list">
-    {%for language in site.data.data.sidebar.languages %}
+    {%for language in languages %}
     <li>
       {{ language.idiom }}
       <span class="lang-desc">({{ language.level }})</span>

_includes/projects.html

@@ -1,4 +1,5 @@
-{% if site.data.data.projects %}
+{% assign projects = site.data.data.projects %}
+{% if projects %}
 <section class="section projects-section">
 
   <h2 class="section-title">
@@ -6,16 +7,16 @@
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fas fa-archive fa-stack-1x fa-inverse"></i>
     </span>
-    {{ site.data.data.projects.title }}
+    {{ projects.title }}
   </h2>
 
-  {% if site.data.data.projects.intro %}
+  {% if projects.intro %}
   <div class="intro">
-      <p>{{ site.data.data.projects.intro }}</p>
+      <p>{{ projects.intro }}</p>
   </div><!--//intro-->
   {% endif %}
 
-  {% for project in site.data.data.projects.projects %}
+  {% for project in projects.assignments %}
     <div class="item">
 
       <span class="project-title">

_includes/publications.html

@@ -1,4 +1,5 @@
-{% if site.data.data.publications %}
+{% assign publications = site.data.data.publications %}
+{% if publications %}
 <section class="section publications-section">
 
   <h2 class="section-title">
@@ -6,16 +7,16 @@
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fas fa-file-alt fa-stack-1x fa-inverse"></i>
     </span>
-    {{ site.data.data.publications.title }}
+    {{ publications.title }}
   </h2>
 
-  {% if site.data.data.publications.intro %}
+  {% if publications.intro %}
   <div class="intro">
-    {{ site.data.data.publications.intro | markdownify }}
+    {{ publications.intro | markdownify }}
   </div><!--//intro-->
   {% endif %}
 
-  {% for publication in site.data.data.publications.publications %}
+  {% for publication in publications.papers %}
   <div class="item">
     <div class="publication-title">{{ publication.title }}</div>
     <div class="publication-authors">{{ publication.authors }}</div>

_includes/sidebar.html

@@ -1,32 +1,32 @@
-<!-- Use icons from fontawesome when you are adding new item in the contact list  -->
+{% assign sidebar = site.data.data.sidebar %}
 <div class="sidebar-wrapper">
 
   <div class="profile-container">
 
-    {% if site.data.data.sidebar.name %}
+    {% if sidebar.name %}
-    <img class="avatar" src="{{ site.baseurl }}/assets/images/{{ site.data.data.sidebar.avatar }}" alt="profile picture" />
+    <img class="avatar" src="{{ site.baseurl }}/assets/images/{{ sidebar.avatar }}" alt="profile picture" />
     {% endif %}
 
-    {% if site.data.data.sidebar.name %}
+    {% if sidebar.name %}
-    <h1 class="name">{{ site.data.data.sidebar.name }}</h1>
+    <h1 class="name">{{ sidebar.name }}</h1>
     {% endif %}
 
-    {% if site.data.data.sidebar.tagline %}
+    {% if sidebar.tagline %}
-    <h3 class="tagline">{{ site.data.data.sidebar.tagline }}</h3>
+    <h3 class="tagline">{{ sidebar.tagline }}</h3>
     {% endif %}
 
   </div><!--//profile-container-->
 
   {% include contact.html %}
 
-  {% unless site.education_in_main %}
+  {% unless sidebar.education %}
     {% include education.html %}
   {% endunless %}
 
   {% include language.html %}
   {% include interests.html %}
 
-  {% if site.data.data.sidebar.about %}
+  {% if sidebar.about %}
     {% include about.html %}
   {% endif %}
 

_includes/skills.html

@@ -1,4 +1,5 @@
-{% if site.data.data.skills %}
+{% assign skills = site.data.data.skills %}
+{% if skills %}
 <section class="skills-section section">
 
   <h2 class="section-title">
@@ -6,12 +7,12 @@
       <i class="fas fa-circle fa-stack-2x"></i>
       <i class="fas fa-wrench fa-stack-1x fa-inverse"></i>
     </span>
-    {{ site.data.data.skills.title }}
+    {{ skills.title }}
   </h2>
 
   <div class="skillset">
 
-    {% for skill in site.data.data.skills.skills %}
+    {% for skill in skills.toolset %}
     <div class="item">
 
       <h3 class="level-title">{{ skill.name }}</h3>

_layouts/default.html

@@ -12,9 +12,7 @@ layout: compress
     {% include sidebar.html %}
     
     <div class="main-wrapper">
-           
         {{content}}
-            
     </div><!--//main-body-->
   </div>