Merge pull request #45 from oAGoulart/updates

Updates

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+
+## [0.2.0] - 2020-05-27
+
+### Added
+
+- This CHANGELOG file.
+
+### Changed
+
+- Resume page now being generated with its own JSON file.
+
+### Fixed
+
+- Resume years bar color not using color variables
+- Color of home page about section button
+- Task list style
+
+
+[unreleased]: https://github.com/oAGoulart/vitrina/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/oAGoulart/vitrina/releases/tag/v0.2.0

_config.yml

@@ -28,7 +28,10 @@ collections:
 exclude: [
   yarn.lock,
   Gemfile.lock,
-  jekyll-theme-vitrina.gemspec,
+  vitrina.gemspec,
+  package.json,
+  README.md,
+  CHANGELOG.md,
   Gemfile, vendor, scripts,
   node_modules/bulma,
   node_modules/fork-awesome/*.md,

_data/home.json

@@ -112,7 +112,7 @@
             "link": "/contact"
           },
           {
-            "style": "is-primary",
+            "style": "is-info",
             "content": "See my resume",
             "link": "/resume"
           }

_data/resume.json

@@ -0,0 +1,80 @@
+{
+  "photo": "/assets/img/icon.png",
+  "name": "Vitrina",
+  "title": "Malding Scientist",
+  "skills": [
+    {
+      "icon": "fa-html5",
+      "progress": {
+        "value": 90,
+        "max": 100
+      }
+    },
+    {
+      "icon": "fa-android",
+      "progress": {
+        "value": 50,
+        "max": 100
+      }
+    },
+    {
+      "icon": "fa-gimp",
+      "progress": {
+        "value": 30,
+        "max": 100
+      }
+    },
+    {
+      "icon": "fa-css3",
+      "progress": {
+        "value": 90,
+        "max": 100
+      }
+    },
+    {
+      "icon": "fa-php",
+      "progress": {
+        "value": 75,
+        "max": 100
+      }
+    },
+    {
+      "icon": "fa-python",
+      "progress": {
+        "value": 95,
+        "max": 100
+      }
+    }
+  ],
+  "profile": [
+    {
+      "title": "Education",
+      "info": [
+        {
+          "years": "2015-2069",
+          "text": "B.S. in Malding Science, Vitrina University"
+        }
+      ]
+    },
+    {
+      "title": "Experience",
+      "info": [
+        {
+          "years": "1001-1312",
+          "text": "Malder in Chief - <em>Malding Industries</em>",
+          "list": [
+            {
+              "text": "Achived malding supreme ultra nuclear."
+            },
+            {
+              "text": "Lead malding experts to accomplish MALDNESS."
+            },
+            {
+              "text": "Instructed junior staff on the Art of Malding."
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

_sass/elements.scss

@@ -69,7 +69,7 @@ main {
             }
 
             .years {
-              border-top: 4px solid #ffe100;
+              border-top: 4px solid $primary-invert;
               left: -6rem;
               position: relative;
               text-align: right;
@@ -104,7 +104,7 @@ main {
   }
 }
 
-ul {
+ul:not(.task-list) {
   list-style: square inside;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrina",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "A general purpose, configurable, Jekyll theme",
   "main": "index.html",
   "author": {

resume.html

@@ -9,67 +9,53 @@ <h1 class="title is-size-1 has-text-centered has-text-primary">{{ page.title }}<
     <div class="container page page-resume">
       <div class="columns">
         <div class="column is-5 resume-profile">
-          {% assign link = "/assets/img/icon.png" %}
-          {% include util/prepend_link.html %}
+          {% assign data = site.data.resume %}
 
+          {% assign link = data.photo %}
+          {% include util/prepend_link.html %}
           <img class="image centered is-128x128" src="{{ link }}">
-          <h1 class="is-size-1 has-text-centered">Vitrina</h1>
-          <p class="has-text-centered">Malding Scientist</p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-html5"></i>
-            </span>
-            <progress class="progress" value="90" max="100">90%</progress>
-          </p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-android"></i>
-            </span>
-            <progress class="progress" value="50" max="100">50%</progress>
-          </p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-gimp"></i>
-            </span>
-            <progress class="progress" value="30" max="100">30%</progress>
-          </p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-css3"></i>
-            </span>
-            <progress class="progress" value="90" max="100">90%</progress>
-          </p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-php"></i>
-            </span>
-            <progress class="progress" value="75" max="100">75%</progress>
-          </p>
-          <p class="skill">
-            <span class="icon is-big has-text-info">
-              <i class="fa fa-2x fa-python"></i>
-            </span>
-            <progress class="progress" value="80" max="100">80%</progress>
-          </p>
-        </div>
+
+          <h1 class="is-size-1 has-text-centered">{{ data.name }}</h1>
+          <p class="has-text-centered">{{ data.title }}</p>
+
+        {% if data.skills %}
+          {% for skill in data.skills %}
+            <p class="skill {{ skill.style }}">
+              <span class="icon is-big has-text-info">
+                <i class="fa fa-2x {{ skill.icon }}"></i>
+              </span>
+              <progress class="progress {{ skill.progress.style }}" value="{{ skill.progress.value }}" max="{{ skill.progress.max }}">{{ skill.progress.value }}%</progress>
+            </p>
+
+          {% endfor %}
+
+        {% endif %}
+
+        </div> {% comment %} resume-profile {% endcomment %}
+
         <div class="column resume-info has-text-dark">
-          <h1 class="is-size-3">Education</h1>
-          <p class="years">2015-2069</p>
-          <p class="info">
-            B.S. in Malding Science, Vitrina University
-          </p>
-          <h1 class="is-size-3">Experience</h1>
-          <p class="years">1001-1312</p>
-          <p class="info">
-            Malder in Chief - <em>Malding Industries</em>
-          </p>
-          <ul class="info">
-            <li>Achived malding supreme ultra nuclear.</li>
-            <li>Lead malding experts to accomplish MALDNESS.</li>
-            <li>Instructed junior staff on the Art of Malding.</li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
+        {% for section in data.profile %}
+          <h1 class="is-size-3 {{ section.style }}">{{ section.title }}</h1>
+
+          {% for item in section.info %}
+            <p class="years {{ item.style }}">{{ item.years }}</p>
+            <p class="info {{ item.style }}">{{ item.text }}</p>
+
+            {% if item.list %}
+              <ul class="info {{ item.style }}">
+                {% for line in item.list %}
+                  <li class="{{ line.style }}">{{ line.text }}</li>
+                {% endfor %}
+
+              </ul> {% comment %} info {% endcomment %}
+            {% endif %}
+
+          {% endfor %}
+
+        {% endfor %}
+
+        </div> {% comment %} resume-info {% endcomment %}
+      </div> {% comment %} columns {% endcomment %}
+    </div> {% comment %} page-resume {% endcomment %}
+  </div> {% comment %} section-card {% endcomment %}
+</div> {% comment %} resume {% endcomment %}

vitrina.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'vitrina'
-  s.version       = '0.1.3'
+  s.version       = '0.2.0'
   s.authors       = ['Augusto Goulart']
   s.email         = ['josegoulart.aluno@unipampa.edu.br']