Made variables more modular

sharu725 · Jul 25, 2018 · a56a939 · a56a939
1 parent 72d9195
commit a56a939
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 148 deletions.
diff --git a/_config.yml b/_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

diff --git a/_data/data.yml b/_data/data.yml
@@ -4,12 +4,13 @@
 
 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
     tagline: Full Stack Developer
     avatar: profile.png  #place a 100x100 picture inside /assets/images/ folder and provide the name of the file below
-    
+
     # Sidebar links
     email: hello@webjeda.com
     phone: 012 345 6789
@@ -23,28 +24,28 @@ sidebar:
     codewars:
 
     languages:
-        - idiom: English
-          level: Native
+      - idiom: English
+        level: Native
 
-        - idiom: French
-          level: Professional
+      - idiom: French
+        level: Professional
 
-        - idiom: Spanish
-          level: Professional
+      - idiom: Spanish
+        level: Professional
 
     interests:
-        - item: Climbing
-          link:
+      - item: Climbing
+        link:
 
-        - item: Snowboarding
-          link:
+      - item: Snowboarding
+        link:
 
-        - item: Cooking
-          link:
+      - item: Cooking
+        link:
 
 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,60 +82,57 @@ studies:
           - Bullet point 
 
 experiences:
-    title: Experiences
-
-    experiences:
-        - role: Lead Developer
-          time: 2015 - Present
-          company: Startup Hubs, San Francisco
-          details: |
-            Describe your role here lorem ipsum dolor sit amet, consectetuer
-            adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
-            Cum sociis natoque penatibus et magnis dis parturient montes,
-            nascetur ridiculus mus. Donec quam felis, ultricies nec,
-            pellentesque eu, pretium quis, sem. Nulla consequat massa quis
-            enim. Donec pede justo. Sed ut perspiciatis unde omnis iste natus
-            error sit voluptatem accusantium doloremque laudantium, totam rem
-            aperiam, eaque ipsa quae ab illo inventore veritatis et quasi
-            architecto beatae vitae dicta sunt explicabo.
-
-              - Bullet point
-              - Bullet point 
-
-        - role: Senior Software Engineer
-          time: 2014 - 2015
-          company: Google, London
-          details: |
-            Describe your role here lorem ipsum dolor sit amet, consectetuer
-            adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
-            Cum sociis natoque penatibus et magnis dis parturient montes,
-            nascetur ridiculus mus. Donec quam felis, ultricies nec,
-            pellentesque eu, pretium quis, sem.
-
-              - Bullet point
-              - Bullet point
-
-        - role: UI Developer
-          time: 2012 - 2014
-          company: Amazon, London
-          details: |
-            Describe your role here lorem ipsum dolor sit amet, consectetuer
-            adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
-            Cum sociis natoque penatibus et magnis dis parturient montes,
-            nascetur ridiculus mus. Donec quam felis, ultricies nec,
-            pellentesque eu, pretium quis, sem.
-
-              - Bullet point
-              - Bullet point
-              
+    - role: Lead Developer
+      time: 2015 - Present
+      company: Startup Hubs, San Francisco
+      details: |
+        Describe your role here lorem ipsum dolor sit amet, consectetuer
+        adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
+        Cum sociis natoque penatibus et magnis dis parturient montes,
+        nascetur ridiculus mus. Donec quam felis, ultricies nec,
+        pellentesque eu, pretium quis, sem. Nulla consequat massa quis
+        enim. Donec pede justo. Sed ut perspiciatis unde omnis iste natus
+        error sit voluptatem accusantium doloremque laudantium, totam rem
+        aperiam, eaque ipsa quae ab illo inventore veritatis et quasi
+        architecto beatae vitae dicta sunt explicabo.
+
+          - Bullet point
+          - Bullet point 
+
+    - role: Senior Software Engineer
+      time: 2014 - 2015
+      company: Google, London
+      details: |
+        Describe your role here lorem ipsum dolor sit amet, consectetuer
+        adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
+        Cum sociis natoque penatibus et magnis dis parturient montes,
+        nascetur ridiculus mus. Donec quam felis, ultricies nec,
+        pellentesque eu, pretium quis, sem.
+
+          - Bullet point
+          - Bullet point
+
+    - role: UI Developer
+      time: 2012 - 2014
+      company: Amazon, London
+      details: |
+        Describe your role here lorem ipsum dolor sit amet, consectetuer
+        adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
+        Cum sociis natoque penatibus et magnis dis parturient montes,
+        nascetur ridiculus mus. Donec quam felis, ultricies nec,
+        pellentesque eu, pretium quis, sem.
+
+          - Bullet point
+          - Bullet point
+
 projects:
     title: Projects
     intro: >
       You can list your side projects or open source libraries in this
       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."
@@ -161,8 +159,8 @@ publications:
       You can list your publications in this section. Lorem ipsum dolor sit
       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 &amp; Proficiency
-    skills:
+
+    toolset:
       - name: Python & Django
         level: 98%
 
@@ -196,6 +195,5 @@ skills:
       - name: Sketch & Photoshop
         level: 60%
 
-footer: 
-    text: >
-      Designed with <i class="fas fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="nofollow">Xiaoying Riley</a>
+footer: >
+    Designed with <i class="fas fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="nofollow">Xiaoying Riley</a>
diff --git a/_includes/career-profile.html b/_includes/career-profile.html
@@ -1,16 +1,17 @@
-{% 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">
     <span class="fa-stack fa-xs">
       <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-->

diff --git a/_includes/contact.html b/_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 %}
 

diff --git a/_includes/education.html b/_includes/education.html
@@ -1,5 +1,6 @@
-{% if site.data.data.studies %}
-  {% if site.education_in_main %}
+{% assign education = site.data.data.education %}
+{% if education %}
+  {% if site.data.sidebar.education %}
     <section class="section educations-section">
 
       <h2 class="section-title">
@@ -10,22 +11,22 @@ <h2 class="section-title">
         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>
-              <div class="time">{{ education.time }}</div>
+              <h3 class="degree">{{ graduation.degree }}</h3>
+              <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 @@ <h3 class="degree">{{ education.degree }}</h3>
 
       <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>
-        <h5 class="meta">{{ education.university }}</h5>
-        <div class="time">{{ education.time }}</div>
+        <h4 class="degree">{{ graduation.degree }}</h4>
+        <h5 class="meta">{{ graduation.university }}</h5>
+        <div class="time">{{ graduation.time }}</div>
       </div><!--//item-->
       {% endfor %}
 

diff --git a/_includes/experiences.html b/_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">

diff --git a/_includes/footer.html b/_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-->