Merge branch 'master' into resume-pdf-2

Custom sitemap layout to hide letters.

.gitignore

@@ -3,8 +3,5 @@ public/
 resources/_gen/
 themes/base16*
 
-*.pdf
-
 commit-msg.txt
-.hugo_build.lock
 static/server-apps.json

.gitmodules

@@ -1,7 +1,4 @@
 [submodule "content/letter"]
 	path = content/letter
 	url = ssh://git@git.kevin-mok.com:399/Kevin-Mok/cover-letters.git
-	branch = master
+	branch = drafts
-[submodule "static/pdf"]
-	path = static/pdf
-	url = ssh://git@git.kevin-mok.com:399/Kevin-Mok/resume-pdf.git

assets/sass/main.scss

@@ -94,10 +94,10 @@ $phone-width: 800px;
 
 //  general elements {{{ // 
 
-// $background-color: #2d2d2d;
+$background-color: #2d2d2d;
-// $color: #f2f0ec;
+$color: #f2f0ec;
-$background-color: white;
+// $background-color: white;
-$color: black;
+// $color: black;
 
 body {
   margin: 0;
@@ -214,10 +214,6 @@ footer {
           @include vert-margin-rem(.2);
           padding-left: .5em;
           opacity: .6;
-
-          &:hover {
-            opacity: 1;
-          }
         }
       }
     }
@@ -662,7 +658,6 @@ header {// {{{
 
   &.letter {
     margin-top: 2em;
-    line-height: 1.5em;
 
     img {
       height: 4.5em;
@@ -671,16 +666,15 @@ header {// {{{
     h2 {
       color: $base-red;
       margin-top: 0em;
-      margin-bottom: .4em;
     }
 
     p {
-      margin-bottom: 1em;
+      margin-bottom: 1.25em;
     }
     
     .no-line-spacing {
       line-height: .5em;
-      margin-bottom: 1.75em;
+      margin-bottom: 2em;
       p {
         margin-bottom: 1em;
       }

config.yaml

@@ -1,5 +1,5 @@
-baseURL: http://localhost:1313/
+# baseURL: http://localhost:1313/
-# baseURL: https://kevin-mok.com/
+baseURL: https://kevin-mok.com/
 # baseURL: /home/kevin/coding/mf-site/public
 languageCode: en-us
 # title: Kevin Mok's Website
@@ -29,20 +29,16 @@ menu:
   - name: card
     url: /card
     weight: 15
-  # - name: letter
+  - name: letter
-    # url: /letter
+    url: /letter
-    # weight: 17
+    weight: 17
   # - name: credits
     # url: /credits
     # weight: 20
     
-# blackfriday:
+blackfriday:
-  # plainIDAnchors: true
+  plainIDAnchors: true
-  # hrefTargetBlank: true
+  hrefTargetBlank: true
 
 disableKinds: ["RSS"]
 
-markup:
-  goldmark:
-    renderer:
-      unsafe: true

content/card/_index.md

@@ -1,5 +1,5 @@
 ---
 title: "Digital Card"
 date: 2019-02-11T07:50:51-05:00
-draft: false
+draft: true
 ---

content/config/_index.md

@@ -39,4 +39,5 @@ a single branch.
 
 [chezmoi]: https://github.com/twpayne/chezmoi
 
+
 <!---  }}} Setup --> 

content/resume/_index.md

@@ -3,10 +3,19 @@ title: "Resume"
 date: 2019-02-11T07:50:51-05:00
 draft: false
 ---
+{{% resume/section overview %}}<!--- {{{ -->
+
+3<sup>rd</sup> year CS student. Enthusiast of all things
+Linux and FOSS. Seeking 16-month internship for my PEY
+co-op program. Looking to gain industry-relevant experience in 
+full-stack web dev, DevOps or system administration.
+
+{{% /resume/section %}}<!--- }}} -->
+
 {{% resume/section skills %}}<!--- {{{ -->
 
 #### Languages
-- **Bash**, **C**, **CSS**, C++, **Fish** (shell), Godot, **HTML5**, 
+- **Bash**, C, **CSS**, C++, **Fish** (shell), Godot, **HTML5**, 
   **Python**, Java, **Javascript** (ES6), **Sass**
 
 #### Frameworks
@@ -17,8 +26,8 @@ draft: false
 
 #### Tools
 - **Arch Linux**, Android Studio, **Debian**, **Command Line**, 
-  **Git**, IntelliJ IDEA, **Pycharm**, **NGINX**, npm/yarn, **SFTP**, 
+  **Git**, IntelliJ IDEA, **Pycharm**, **NGINX**, **SFTP**, **SSH**, 
-  **SSH**, **Vim**
+  **Vim**
 
 {{% /resume/section %}}<!--- }}} -->
 
@@ -123,27 +132,6 @@ url="https://kevin-mok.com/server/" date="Aug. 2019 — present" %}}
 
 <!--- DigitalOcean Droplet }}} -->
 
-<!--- Super ADA Bros. {{{ -->
-
-{{% resume/project name="Super ADA Bros"
-url="https://github.com/Kevin-Mok/SuperADABros" date="May 2019" %}}
-
-- Designed clone of Super Mario Bros 1-1, but Mario is mobility-impaired and
-  uses ramps to get through the level.
-- Uses **OpenCV** to track player's head movement which is then translated to 
-  in-game movement. [Video Demo]
-- Implemented in [**Godot**][Godot site], an open-source game engine.
-- Made during a 24-hour [accessibility-themed hackathon][PC Hacks event].
-
-[PC Hacks event]: https://pchacks19.devpost.com/
-[Godot site]: https://godotengine.org
-[Video Demo]: https://youtu.be/vRdENLGrBqM
-
-{{% /resume/project %}}
-
-
-<!--- Grocery Finder }}} -->
-
 {{% /resume/section %}}<!--- }}} -->
 
 {{% resume/section "Work Experience" %}}<!--- {{{ -->

content/resume/printable.txt

@@ -1,4 +1,13 @@
+# Base
 - bg colors
-- site title max width
+- increase font size
-- switch project shortcode
+- all phone width blocks
-- rm details top margin
+- reset header sizes
+- comment out font CSS stylesheet
+- hide print icon
+- right margin for social icons
+
+# Project
+- remove expand icon and link
+- rm ADA Bros.
+- show all sections by default 

layouts/letter/single.html

@@ -1,5 +1,7 @@
 {{ partial "base/header.html" . }}
 
+{{ partial "resume/print-icon.html" . }}
+
 {{ partial "base/site-title.html" . }}
 
 {{ partial "resume/contact-info.html" . }}

layouts/partials/base/footer.html

@@ -19,30 +19,20 @@
             <img src="{{ "img/social/github.svg" | relURL }}"
             alt="github-logo">
           </a>
-          <a href="https://git.kevin-mok.com/" target="_blank">
-            <img src="{{ "img/social/gitea.svg" | relURL }}" alt="gitea-logo">
-          </a>
-          · 
-          <a href="https://twitter.com/Kev_Mok" target="_blank">
-            <img src="{{ "img/social/twitter.svg" | relURL }}"
-            alt="twitter-logo">
-          </a>
-          <a rel="me" href="https://fosstodon.org/@Kevin" target="_blank">
-            <img src="{{ "img/social/mastodon.svg" | relURL }}"
-            alt="mastodon-logo">
-          </a>
-          <a href="https://www.reddit.com/u/Kevin-Mok" target="_blank">
-            <img src="{{ "img/social/reddit.svg" | relURL }}"
-            alt="reddit-logo">
-          </a>
-          . 
           <a href="https://www.linkedin.com/in/Kev-Mok" target="_blank">
             <img src="{{ "img/social/linkedin.svg" | relURL }}" alt="linkedin-logo">
           </a>
+          <a href="https://git.kevin-mok.com/" target="_blank">
+            <img src="{{ "img/social/gitea.svg" | relURL }}" alt="gitea-logo">
+          </a>
           <a href="mailto:me@kevin-mok.com" target="_blank">
             <img src="{{ "img/social/email.svg" | relURL }}"
             alt="envelope">
           </a>
+          <a href="https://fosstodon.org/@Kevin" target="_blank">
+            <img src="{{ "img/social/mastodon.svg" | relURL }}"
+            alt="mastodon-logo">
+          </a>
         </span>
         <span class="col-xs-2">
         </span>

layouts/partials/base/header.html

@@ -9,10 +9,10 @@
 {{- with $.Param "author" }}
 <meta name="author" content="{{ . }}">
 {{- end }}
-{{ hugo.Generator }}
+{{ .Hugo.Generator }}
 <meta name="google-site-verification" content="3aZhrY5bFgQY0HY2DNNUhbkuIfVEcwkrQHnbJd8jCCQ" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<!-- <script src="https://cdn.khkm.gq/live.js" charset="utf-8"></script> -->
+<script src="https://cdn.khkm.tk/live.js" charset="utf-8"></script>
 <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>

layouts/partials/home/about.html

@@ -1,7 +1,7 @@
 <div id="about">
 <h2>Welcome to my site!</h2>
 <p>
-  I'm Kevin Mok - a Computer Science
+  I'm Kevin Mok - a 3<sup>rd</sup> year Computer Science
   student at the University of Toronto, and I'm greatly interested in all things Linux and 
   <a href="https://www.gnu.org/philosophy/floss-and-foss.en.html"
     target="_blank">FOSS/FLOSS</a>.

layouts/partials/resume/print-icon.html

@@ -1,5 +1,5 @@
 <div id="print-icon">
-  <a href="{{ "pdf/kevin-mok-resume.pdf" | relURL }}" target="_blank">
+  <a href="{{ "kevin-mok-resume.pdf" | relURL }}" target="_blank">
     <img src="{{ "img/resume/printer.svg" | relURL }}" alt="printer-icon">
   </a>
 </div>

layouts/shortcodes/resume/letter-print.html

@@ -1,8 +0,0 @@
-<div id="print-icon">
-  {{ $type := .Get "type"  }}
-  {{ $code := .Get "code"  }}
-  {{ $pdfName := print "pdf/kevin-mok-" $type "-" $code ".pdf"  }}
-  <a href="{{ $pdfName | relURL }}" target="_blank">
-    <img src="{{ "img/resume/printer.svg" | relURL }}" alt="printer-icon">
-  </a>
-</div>

layouts/shortcodes/resume/project.html

@@ -1,23 +1,22 @@
 <div class="project">
   <div class="row project-header">
     <div class="col-8 text-left">
+      <!-- <a class="project-link" href="{{ .Get "url" }}" target="_blank"> -->
+        <!-- <img src="{{ "img/resume/link.svg" | relURL }}" alt="link-icon"> -->
+      <!-- </a> -->
       <a class="project-link" href="{{ .Get "url" }}" target="_blank">
-        <img src="{{ "img/resume/link.svg" | relURL }}" alt="link-icon">
-      </a>
-      <button class="btn" type="button" data-toggle="collapse"
-        data-target="#{{ .Get "name" | lower | urlize }}-details"
-        aria-expanded="false" aria-controls="{{ .Get "name" | lower | urlize }}-details">
         <h2 class="project-title">
           {{ .Get "name" }}
-          <img class="down-triangle" src="{{ "img/resume/down-triangle.png" | relURL }}" alt="link-icon">
+          <!-- <img class="down-triangle" src="{{ "img/resume/down-triangle.svg" | relURL }}" alt="link-icon"> -->
+          <!-- <img class="down-triangle" src="{{ "img/resume/down-triangle.png" | relURL }}" alt="link-icon"> -->
         </h2>
-      </button>
+      </a>
     </div>
     <div class="col-4 text-right date">{{ .Get "date" }}</div>
   </div>
-  <div class="collapse{{ with .Get "show" }} show{{ end }}" id="{{ .Get "name" | lower | urlize }}-details">
+  <div class="show" id="{{ .Get "name" | lower | urlize }}-details">
     <div>
       {{ .Inner }}
-</div>
+    </div>
   </div>
 </div>

static/img/social/reddit.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48px" height="48px"><path fill="#FFF" d="M12.193 19.555c-1.94-1.741-4.79-1.727-6.365.029-1.576 1.756-1.301 5.023.926 6.632L12.193 19.555zM35.807 19.555c1.939-1.741 4.789-1.727 6.365.029 1.575 1.756 1.302 5.023-.927 6.632L35.807 19.555zM38.32 6.975A3.5 3.5 0 1 0 38.32 13.975 3.5 3.5 0 1 0 38.32 6.975z"/><path fill="#FFF" d="M24.085 15.665000000000001A18.085 12.946 0 1 0 24.085 41.557A18.085 12.946 0 1 0 24.085 15.665000000000001Z"/><g><path fill="#D84315" d="M30.365 23.506A2.884 2.884 0 1 0 30.365 29.274 2.884 2.884 0 1 0 30.365 23.506zM17.635 23.506A2.884 2.884 0 1 0 17.635 29.274 2.884 2.884 0 1 0 17.635 23.506z"/></g><g><path fill="#37474F" d="M24.002 34.902c-3.252 0-6.14-.745-8.002-1.902 1.024 2.044 4.196 4 8.002 4 3.802 0 6.976-1.956 7.998-4C30.143 34.157 27.254 34.902 24.002 34.902zM41.83 27.026l-1.17-1.621c.831-.6 1.373-1.556 1.488-2.623.105-.98-.157-1.903-.721-2.531-.571-.637-1.391-.99-2.307-.994-.927.013-1.894.365-2.646 1.041l-1.336-1.488c1.123-1.008 2.545-1.523 3.991-1.553 1.488.007 2.833.596 3.786 1.658.942 1.05 1.387 2.537 1.221 4.081C43.961 24.626 43.121 26.096 41.83 27.026zM6.169 27.026c-1.29-.932-2.131-2.401-2.306-4.031-.166-1.543.279-3.03 1.221-4.079.953-1.062 2.297-1.651 3.785-1.658.009 0 .018 0 .027 0 1.441 0 2.849.551 3.965 1.553l-1.336 1.488c-.753-.676-1.689-1.005-2.646-1.041-.916.004-1.735.357-2.306.994-.563.628-.826 1.55-.721 2.53.115 1.067.657 2.023 1.488 2.624L6.169 27.026zM25 16.84h-2c0-2.885 0-10.548 4.979-10.548 2.154 0 3.193 1.211 3.952 2.096.629.734.961 1.086 1.616 1.086h1.37v2h-1.37c-1.604 0-2.453-.99-3.135-1.785-.67-.781-1.198-1.398-2.434-1.398C25.975 8.292 25 11.088 25 16.84z"/><path fill="#37474F" d="M24.085 16.95c9.421 0 17.085 5.231 17.085 11.661 0 6.431-7.664 11.662-17.085 11.662S7 35.042 7 28.611C7 22.181 14.664 16.95 24.085 16.95M24.085 14.95C13.544 14.95 5 21.066 5 28.611c0 7.546 8.545 13.662 19.085 13.662 10.54 0 19.085-6.116 19.085-13.662C43.17 21.066 34.625 14.95 24.085 14.95L24.085 14.95zM38.32 7.975c1.379 0 2.5 1.122 2.5 2.5s-1.121 2.5-2.5 2.5-2.5-1.122-2.5-2.5S36.941 7.975 38.32 7.975M38.32 5.975c-2.484 0-4.5 2.015-4.5 4.5s2.016 4.5 4.5 4.5c2.486 0 4.5-2.015 4.5-4.5S40.807 5.975 38.32 5.975L38.32 5.975z"/></g></svg>

static/img/social/twitter.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="240px" height="240px"><linearGradient id="_osn9zIN2f6RhTsY8WhY4a" x1="10.341" x2="40.798" y1="8.312" y2="38.769" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2aa4f4"/><stop offset="1" stop-color="#007ad9"/></linearGradient><path fill="url(#_osn9zIN2f6RhTsY8WhY4a)" d="M46.105,11.02c-1.551,0.687-3.219,1.145-4.979,1.362c1.789-1.062,3.166-2.756,3.812-4.758	c-1.674,0.981-3.529,1.702-5.502,2.082C37.86,8.036,35.612,7,33.122,7c-4.783,0-8.661,3.843-8.661,8.582	c0,0.671,0.079,1.324,0.226,1.958c-7.196-0.361-13.579-3.782-17.849-8.974c-0.75,1.269-1.172,2.754-1.172,4.322	c0,2.979,1.525,5.602,3.851,7.147c-1.42-0.043-2.756-0.438-3.926-1.072c0,0.026,0,0.064,0,0.101c0,4.163,2.986,7.63,6.944,8.419	c-0.723,0.198-1.488,0.308-2.276,0.308c-0.559,0-1.104-0.063-1.632-0.158c1.102,3.402,4.299,5.889,8.087,5.963	c-2.964,2.298-6.697,3.674-10.756,3.674c-0.701,0-1.387-0.04-2.065-0.122C7.73,39.577,12.283,41,17.171,41	c15.927,0,24.641-13.079,24.641-24.426c0-0.372-0.012-0.742-0.029-1.108C43.483,14.265,44.948,12.751,46.105,11.02"/></svg>

static/server-table.js

@@ -38,9 +38,6 @@ const generateTable = (table, data) => {
           aElem.textContent = elem['shortUrl']
           cell.appendChild(aElem)
           break
-        case 'description':
-          cell.innerHTML = elem[key]
-          break
         case 'repo':
           aElem.href = elem['repoUrl']
           aElem.textContent = elem[key]