Resume: add skills, improve project descriptions

- change footer background to line above

Resume:
- add LinkedIn
- fix Unicode expand icon not showing on mobile

.gitignore

@@ -4,3 +4,4 @@ resources/_gen/
 themes/base16*
 
 commit-msg.txt
+static/server-apps.json

assets/sass/main.scss

@@ -2,6 +2,7 @@
 
 //  base colors {{{ // 
 
+$base02: #515151;
 $base03: #747369;
 $base04: #a09f93;
 $base05: #d3d0c8; 
@@ -34,25 +35,36 @@ $base-dark-orange: #d27b53;
 
 //  mixins {{{ // 
 
-$max-page-width: 52em;
+// $max-page-width: 52em;
+$max-page-width: 45em;
 $phone-width: 800px;
 
-@mixin side-padding-rem($n) {
+@mixin side-padding-rem($n) {// {{{
   padding-left: $n * 1rem;
   padding-right: $n * 1rem;
-}
+}// }}}
 
-@mixin vert-padding-rem($n) {
+@mixin side-margin-em($n) {// {{{
+  margin-left: $n * 1em;
+  margin-right: $n * 1em;
+}// }}}
+
+@mixin vert-padding-rem($n) {// {{{
   padding-top: $n * 1rem;
   padding-bottom: $n * 1rem;
-}
+}// }}}
 
-@mixin auto-center() {
+@mixin vert-margin-rem($n) {// {{{
+  margin-top: $n * 1rem;
+  margin-bottom: $n * 1rem;
+}// }}}
+
+@mixin auto-center() {// {{{
   margin-left: auto;
   margin-right: auto;
-}
+}// }}}
 
-@mixin article-body() {
+@mixin article-body() {// {{{
   /* background-color: #e6e6fa; */
   background-color: #cbbeb5;
   color: #2d2d2d;
@@ -64,9 +76,9 @@ $phone-width: 800px;
   @media (max-width: $max-page-width) {
     @include side-padding-rem(2);
   }
-}
+}// }}}
 
-@mixin a-color($color) {
+@mixin a-color($color) {// {{{
   a {
     color: $color;
     &:visited {
@@ -76,7 +88,7 @@ $phone-width: 800px;
       color: $color;
     }
   }
-}
+}// }}}
 
 //  }}} mixins // 
 
@@ -92,7 +104,8 @@ body {
   background-color: $background-color;
   color: $color;
   line-height: 1.5;
-  font-size: 100%;
+  // font-size: 100%;
+  font-size: 15px;
   /* font-family: 'Source Code Pro', monospace; */
   font-family: 'Hack', monospace;
   display: flex;
@@ -108,10 +121,6 @@ body {
   margin-right: auto;
   flex: 1;
 
-  .copyright {
-    @include a-color(#747369);
-  }
-
   @media (max-width: $max-page-width) {
     width: 100%;
   }
@@ -152,22 +161,63 @@ header {
 }
 
 footer {
+  //  base {{{ // 
+  
+  @include a-color(#747369);
+  // background-color: #393939;
+  // max-width: $max-page-width;
   margin-top: 2rem;
-  margin-bottom: 1rem;
+  $vertical-margin: .2em;
   text-align: center;
-  font-size: 0.9em;
+  font-size: 0.8em;
   color: #747369;
   // bottom: 0;
   // position: absolute;
   // width: 100%;
   
-  .container {
+  //  }}} base // 
-    background-color: #393939;
+
-    max-width: 62em;
+  .container {// {{{
+    // max-width: $max-page-width;
+    // min-width: $max-page-width;
     @include auto-center();
-    @include vert-padding-rem(.1);
+    // @include vert-padding-rem(.1);
+    @include side-padding-rem(0);
+
+    #footer-row {
+      // background-color: #393939;
     }
 
+    #footer-content {
+      $side-padding: 2.5em;
+      @include vert-padding-rem(.35);
+      border-style: solid;
+      border-width: 1px 0 0 0;
+      border-color: rgba(81, 81, 81, .75);
+
+      #copyright {
+        // padding-left: .85em;
+        padding-left: $side-padding;
+        position: relative;
+        top: 2px;
+        @include a-color(#747369);
+      }
+
+      #social-icons {
+        position: relative;
+        padding-right: $side-padding;
+        // padding-right: .9em;
+
+        img {
+          height: 1.5em;
+          @include vert-margin-rem(.2);
+          padding-left: .5em;
+          opacity: .6;
+        }
+      }
+    }
+  }// }}}
+
   @media (max-width: $max-page-width) {
     margin-top: 0;
     margin-bottom: 0;
@@ -194,8 +244,20 @@ p {
   margin-bottom: 1rem;
 }
 
-h1 { font-size: 2rem }
+h1 {
-h2 { font-size: 1.5rem }
+  font-size: 2rem;
+
+  @media (max-width: $phone-width) {
+    font-size: 1.75rem;
+  }
+}
+h2 {
+  font-size: 1.5rem;
+
+  @media (max-width: $phone-width) {
+    font-size: 1.4rem;
+  }
+}
 h3 { font-size: 1.25rem }
 h4 { font-size: 1rem }
 h5 { font-size: .875rem }
@@ -222,10 +284,6 @@ header {// {{{
   }
 }// }}}
 
-footer {// {{{
-  @include a-color(#747369);
-}// }}}
-
 .page-not-found {// {{{
   h1 {
     text-align: center;
@@ -252,11 +310,12 @@ footer {// {{{
 
 #homepage {// {{{
   #about {
-    font-size: 1.25rem;
+    font-size: 1.1rem;
 
     h2 {
         margin-top: 1.25rem;
-        font-size: 2rem;
+        // font-size: 2rem;
+        font-size: 1.9rem;
         color: $base-yellow;
         text-align: center;
 
@@ -424,46 +483,101 @@ footer {// {{{
 }// }}}
 
 #contact-info {// {{{
-  @include vert-padding-rem(0.5);
+  @include side-margin-em(0);
-  display: flex;
+  // @include vert-padding-rem(0.5);
-  align-content: center;
+  @include a-color($base-sky-blue);
+  // min-width: $max-page-width;
+  @media (min-width: 1200px) {
+      .container{
+        min-width: $max-page-width;
+      }
+  }
 
-  div {
+  font-size: .9em;
-    flex-grow: 1;
+
+  .row {
+    // flex-grow: 1;
     color: $base05;
 
     img {
       height: 1em;
+      // @media (max-width: $phone-width) {
+        // height: 1.5em;
+      // }
+    }
+
+    div[class^="col"] {
+      @include side-padding-rem(0);
+      // text-align: center;
+
+    }
+
+  }
+
+  .url-info {
+    margin-left: 5px;
+    // position: relative;
+    // left: -8px;
+    @media (max-width: $phone-width) {
+      // display: none;
+      // font-size: 10px;
+      font-size: .8em;
     }
   }
 
-  #email {
-    text-align: center;
-  }
-
-  #website {
-    text-align: right;
-  }
 }// }}}
 
 #resume {// {{{
-  a {
+  a {// {{{
     text-decoration: none;
     &:hover {
       text-decoration: underline;
     }
-  }
+  }// }}}
 
-  h1 {
+  h1 {// {{{
     color: $base-orange;
-  }
+    margin-top: 1rem;
 
-  .date {
+    @media (max-width: $phone-width) {
+      margin-top: .75rem;
+    }
+  }// }}}
+  h2 {// {{{
+    color: $base-orange;
+    margin-top: .5rem;
+
+    @media (max-width: $phone-width) {
+      font-size: 1.2em;
+      margin-top: .75rem;
+    }
+  }// }}}
+  h4 {// {{{
+    color: $base-yellow;
+    margin-top: .5rem;
+
+    @media (max-width: $phone-width) {
+      font-size: 1.2em;
+      margin-top: .75rem;
+    }
+  }// }}}
+
+  .date {// {{{
+    padding-top: .8em;
     float: right;
     color: $base03;
+    
+    @media (max-width: $phone-width) {
+      padding-top: 0em;
+    }
+  }// }}}
+
+  #projects {// {{{
+    h1 {
+      margin-bottom: 3px;
     }
 
-  .project {
+    .project {// {{{
       @include vert-padding-rem(.2);
 
       h2 {
@@ -481,7 +595,15 @@ footer {// {{{
         }
       }
 
-    .btn {
+      .down-triangle {
+        // fill: blue;
+        height: 1.2em;
+        position: relative;
+        top: -3px;
+        left: -3px;
+      }
+
+      .btn {// {{{
         display: inline;
         background-color: transparent;
         margin-bottom: 5px;
@@ -491,12 +613,37 @@ footer {// {{{
           outline: none !important;
           box-shadow: none;
         }
-    }
+      }// }}}
+
+      // }}}
 
       // [id^="details-"] {
         // margin-top: .5em;
       // }
     }
+  }// }}}
+
+  .institution {
+    color: $base-yellow;
+    font-weight: bold;
+    font-size: 1.1em;
+    margin-bottom: 5px;
+  }
+
+  .title {
+    font-style: italic;
+  }
+
+  #education {// {{{
+    .date {
+      padding-top: 0;
+    }
+  }// }}}
+
+  @media (max-width: $phone-width) {
+    font-size: 14px;
+    // font-size: 1em;
+  }
 
 }// }}}
 
@@ -556,12 +703,12 @@ footer {// {{{
 
 h1.site-title {// {{{
   text-align: center;
-  /* font-size: 3.5em; */
+  font-size: 4.2em;
-  font-size: 4.8em;
   // color: #66cccc;
   color: $base05;
-  margin-top: 1rem;
+  // margin-top: 1rem;
-  margin-bottom: 0.5rem;
+  // margin-bottom: 0.75rem;
+  @include vert-margin-rem(.75);
 
   @include a-color($base-sky-blue);
   a {
@@ -573,15 +720,22 @@ h1.site-title {// {{{
   }
 
   @media (max-width: $phone-width) {
-    // font-size: 3em;
+    font-size: 3.5em;
+    @include vert-margin-rem(.3);
     // font-size: 2.5em;
-    font-size: 2em;
+    // font-size: 2em;
+
+    .surrounding {
+      display: none;
+    }
   }
 }// }}}
 
 .hero-logo img {
   margin-top: 0.5rem;
   width: 100%;
+  // display: none;
+  // width: $max-page-width;
 }
 
 .nav-bar {// {{{
@@ -708,6 +862,7 @@ article.single h1.headline {
 
 @media (max-width: $max-page-width) {
   article.single h1.headline {
+    font-size: 2em;
     padding-left: 2rem;
     padding-right: 2rem;
   }
@@ -722,7 +877,8 @@ article.single section.body h4 { color: #f2777a; }
 article.single section.body h5 { color: #515151; }
 article.single section.body h6 { color: #747369; }
 
-article.single section.body a,a:visited { color: #a06700; }
+// article.single section.body a,a:visited { color: #a06700; }
+article.single section.body a,a:visited { color: $base-sky-blue; }
 
 /* Article Elements */
 

content/config/_index.md

@@ -6,7 +6,7 @@ layout: single
 ---
 <!---  Intro {{{ --> 
 
-![desktop-screenshot](https://i.imgur.com/Fpsr8Fc.png)
+![desktop-screenshot](https://img.khkm.tk/uploads/big/b2bd45e8f436d389ecb787b5c61c951a.png)
 *Screenshot from my dual-monitor setup.*
 
 This [repository][lc-repo] contains the dotfiles to increase my workflow 
@@ -34,8 +34,10 @@ efficiency. They are also for my Linux [rice][ricing_explanation].
 <!---  Setup {{{ --> 
 
 ## Setup
-I use
+I use [chezmoi] to manage varying configs for different machines with 
-[Stow](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html)
+a single branch.                                                         
-to symbolically link the configs/dotfiles.
+
+[chezmoi]: https://github.com/twpayne/chezmoi
+
 
 <!---  }}} Setup --> 

content/resume/_index.md

@@ -5,10 +5,29 @@ draft: false
 ---
 {{% resume/section overview %}}<!--- {{{ -->
 
-I am a 3<sup>rd</sup> year CS student and enthusiast of all things Linux
+3<sup>rd</sup> year CS student. Enthusiast of all things
-and FOSS. I am looking for an internship to fully dedicate myself to that
+Linux and FOSS. Seeking 16-month internship for my PEY
-will test my abilities, provide the opportunity to gain valuable knowledge
+co-op program. Looking to gain industry-relevant experience in 
-and experience and jumpstart my career with a solid foundation.
+full-stack web dev, DevOps or system administration.
+
+{{% /resume/section %}}<!--- }}} -->
+
+{{% resume/section skills %}}<!--- {{{ -->
+
+#### Languages
+- **Bash**, C, **CSS**, C++, **Fish**, Godot, **HTML5**, **Python**, 
+  Java, **Javascript (ES6)**, **Sass**
+
+#### Frameworks
+- **Bootstrap**, **Django**, **Node.js**, **PostgreSQL**
+
+#### Services
+- **DigitalOcean**, **Linux**, Heroku, **REST/Web API's**
+
+#### Tools
+- **Arch Linux**, Android Studio, **Debian**, **Command Line**, 
+  **Git**, IntelliJ IDEA, **Pycharm**, **NGINX**, **SFTP**, **SSH**, 
+  **Vim**
 
 {{% /resume/section %}}<!--- }}} -->
 
@@ -16,15 +35,19 @@ and experience and jumpstart my career with a solid foundation.
 
 <!--- Spotify Graphs {{{ -->
 
-{{% resume/project name="Spotify Visualizer" 
+{{% resume/project name="Spotify Graphs" 
-url="https://github.com/Kevin-Mok/spotify-lib-vis" date="July 2018" show="true" %}}
+url="https://github.com/Kevin-Mok/spotify-lib-vis" date="June 2018 — July 2018" 
+show="true" %}}
 
-- Web app that scans your Spotify library using their API to produce
+- Scan tracks from user's library using Spotify API and organize data into 
-  [**d3** graphs][d3 graph examples] to visualize the artists, genres and
+  database.
-  features of tracks in your library.
+- Created and tested various __PostgreSQL__ schemas to increase efficiency for 
-- Can also keep track of your listening history. Currently runs as a `cron`
+  use cases.
-  job on my local machine to keep track of my own.
+- Produce bubble chart and (stacked) bar chart in [**d3** graphs][d3 graph examples]
-- Uses __Django__ and __PostgreSQL__ for back-end.
+  to visualize the artists, genres and features of tracks in library.
+- Implement functionality to keep track of user's listening history. Set up 
+  `cron` job on my local machine to keep track of my own.
+- Uses __Django__ for backend.
 
 [d3 graph examples]: https://github.com/d3/d3/wiki/Gallery
 
@@ -32,6 +55,27 @@ url="https://github.com/Kevin-Mok/spotify-lib-vis" date="July 2018" show="true"
 
 <!--- Spotify Graphs }}} -->
 
+<!--- Grocery Finder {{{ -->
+
+{{% resume/project name="Grocery Finder" 
+url="https://github.com/Kevin-Mok/grocery-finder" date="Feb. 2019 — Apr. 2019" 
+show="true" %}}
+
+- PoC for web app that finds the ideal supermarket based on your cart.
+- Designed responsive front-end layout using **Bootstrap**.
+- Implemented REST API functionality on backend using **Node.js** and 
+  **MongoDB**.
+- Setup deployment on [**Heroku**][Grocery Finder Heroku].
+- Led team of 4 as project leader to prioritize and delegate tasks while
+  also implementing a majority of the core features.
+- Performed code review for team member's pull requests.
+
+[Grocery Finder Heroku]: http://www.grocery-finder.ml
+
+{{% /resume/project %}}
+
+<!--- Grocery Finder }}} -->
+
 <!--- ParsaFood {{{ -->
 
 {{% resume/project name="ParsaFood" 
@@ -40,70 +84,70 @@ show="true" %}}
 
 - **Android** app that reads ingredient labels and detects any dietary 
   restrictions/allergies. 
+- Designed user interface and linked various functionality together.
 - Made during a 24-hour [food-themed hackathon][Platterz Hackathon event]
   in a group with two other members. Came in 2<sup>nd</sup> place and won
   an [Oculus Rift][Oculus Rift Amazon].
-- Came up with the idea based on [personal experience][Parsafood motivation].
 
 [Parsafood repo]: https://github.com/Kevin-Mok/ParsaFood
-[Parsafood motivation]: https://github.com/Kevin-Mok/ParsaFood#motivation
+[Platterz Hackathon event]: 
-[Platterz Hackathon event]: https://www.eventbrite.com/e/platterz-hackathon-tickets-42682237722
+https://www.eventbrite.com/e/platterz-hackathon-tickets-42682237722
 [Oculus Rift Amazon]: https://www.amazon.ca/Oculus-Rift-Windows-VR-Headset/dp/B00VF0IXEY/ref=sr_1_1_sspa?ie=UTF8&qid=1520422949&sr=8-1-spons&keywords=oculus+rift&psc=1
 
 {{% /resume/project %}}
 
 <!--- ParsaFood }}} -->
  
-<!--- Grocery Finder {{{ -->
-
-{{% resume/project name="Grocery Finder" 
-url="https://github.com/Kevin-Mok/grocery-finder" date="April 2019" 
-show="true" %}}
-
-- Proof of concept for a web app that finds the best supermarket for 
-  your needs based on the total price of your cart items and distance 
-  from you.
-- Responsive front-end using **Bootstrap**. Uses **Node.js** and 
-  **MongoDB** for back-end.
-- Currently deployed on [**Heroku**][Grocery Finder Heroku].
-- Took on role as project leader to prioritize and delegate tasks 
-  while
-  also implementing a majority of the core features.
-
-[Grocery Finder Heroku]: http://www.grocery-finder.ml
-
-{{% /resume/project %}}
-
-<!--- Grocery Finder }}} -->
-
 <!--- TrapBot {{{ -->
 
 {{% resume/project name="TrapBot"
 url="https://github.com/Kevin-Mok/TrapBot" date="March 2018" %}}
 
-- reddit bot that looks for comments with song names and responds with 
+- Use reddit API wrapper in **Python** to scan music subreddits for user 
-  their respective SoundCloud links.
+  comments containing common track listing formats.
-- Received positive feedback from users who saw the bot's posts.
+- Match detected track name and artists to track on SoundCloud using another 
-- Uses __Python__ API wrappers for SoundCloud and reddit.
+  Python API wrapper.
+- Respond to original poster's comment with formatted list of tracks found.
+- Received positive comment from users who replied to the bot's posts.
 
 {{% /resume/project %}}
 
 <!--- Grocery Finder }}} -->
 
+<!--- DigitalOcean {{{ -->
+
+{{% resume/project name="Personal Server"
+url="https://kevin-mok.com/server/" date="Aug. 2019—present" %}}
+
+- Deployed various web apps with backends such as Node, PHP and Python using 
+  **NGINX** on a **Debian** server.
+- Monitor system resources and perform system maintenance using tmux.
+- Wrote [**Node.js** script][server script] and [**systemd** service][systemd service]/[timer]
+  to check and display the uptime of my pages every hour.
+
+[server script]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-status.js
+[systemd service]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-pages.service
+[timer]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-pages.timer
+
+{{% /resume/project %}}
+
+<!--- DigitalOcean Droplet }}} -->
+
 <!--- Super ADA Bros. {{{ -->
 
 {{% resume/project name="Super ADA Bros"
 url="https://github.com/Kevin-Mok/SuperADABros" date="May 2019" %}}
 
-- Clone of Super Mario Bros 1-1, but Mario is mobility-impaired and
+- Designed clone of Super Mario Bros 1-1, but Mario is mobility-impaired and
   uses ramps to get through the level.
-- Able to be played using only head movement by getting input from a
+- Uses **OpenCV** to track player's head movement which is then translated to 
-  face-tracking script (**OpenCV**).
+  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 %}}
 
@@ -112,8 +156,20 @@ url="https://github.com/Kevin-Mok/SuperADABros" date="May 2019" %}}
 
 {{% /resume/section %}}<!--- }}} -->
 
-{{% resume/section education %}}<!--- {{{ -->
+{{% resume/section "Work Experience" %}}<!--- {{{ -->
 
-- **University of Toronto**: Computer Science Specialist <div class="date">2017-2021</div>
+{{% resume/education name="Philpott Children's Tennis" title="Head Instructor" date="2013—2015" %}}
+- Ran 8-week summer camp for inner-city youth with assistant coach.
+- Prepared daily lesson plans for 4 different age groups of children 
+  with varying skill levels and needs.
+- Supervised and ensured the safety and enjoyment of up to 20 children at once.
 
 {{% /resume/section %}}<!--- }}} -->
+
+{{% resume/section education %}}<!--- {{{ -->
+
+{{% resume/education name="University of Toronto" title="Computer Science Specialist" date="2017-2021" %}}
+
+{{% /resume/section %}}<!--- }}} -->
+
+<!-- vim: fdm=marker -->

content/server/_index.md

@@ -5,10 +5,12 @@ draft: false
 layout: single
 js: ["server-table"]
 ---
-Here is a list of apps that I am running a my [DigitalOcean 
+Here is a list of apps that I am running on my [DigitalOcean 
-droplet][do-droplet] along with their statuses, which are updated 
+droplet][do-droplet]. Their [statuses] are updated every hour using a 
-every hour using [this Node.js script][update-script].
+[Node.js script][update-script] and a [systemd service]/[timer].
 
 [do-droplet]: https://www.digitalocean.com/products/droplets/
-[update-script]: 
+[statuses]: https://kevin-mok.com/server-apps.json
-https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-status.js
+[systemd service]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-pages.service
+[timer]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-pages.timer
+[update-script]: https://git.kevin-mok.com/Kevin-Mok/server-pages/src/branch/master/server-status.js

layouts/partials/base/footer.html

@@ -7,15 +7,39 @@
 <footer>
   <div class="container">
     <!-- <span class="copyright">&copy; {{ .Site.LastChange.Year }} {{ .Site.Title }} - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a></span> -->
-    <span class="copyright">
+    <div id="footer-row" class="row justify-content-center">
-      &copy; {{ now.Year }} {{ .Site.Title }} · <a rel="license"
+      <span id="footer-content" class="name">
-        href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> · 
+        <span id="copyright" class="col-xs-6">
-      <a href="{{ "credits" | relURL }}">Credits</a>
+          &copy; {{ now.Year }} {{ .Site.Title }} · 
+          <!-- <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> ·  -->
+          <!-- <a href="{{ "credits" | relURL }}">Credits</a> ·  -->
+        </span>
+        <span id="social-icons" class="col-xs-4">
+          <a href="https://github.com/Kevin-Mok" target="_blank">
+            <img src="{{ "img/social/github.svg" | relURL }}"
+            alt="github-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/web/accounts/93113" target="_blank">
+            <img src="{{ "img/social/mastodon.svg" | relURL }}"
+            alt="mastodon-logo">
+          </a>
+        </span>
+        <span class="col-xs-2">
+        </span>
       </span>
     </div>
-
+  </div>
 </footer>
 
-
 </body>
 </html>

layouts/partials/base/site-title.html

@@ -1,7 +1,7 @@
 <h1 class="site-title">
-  [<a href="{{ .Site.BaseURL }}"><span class="base08">K</span><span
+  <span class="surrounding">[</span><a href="{{ .Site.BaseURL }}"><span class="base08">K</span><span
     class="base0f">e</span><span class="base09">v</span><span
     class="base0a">i</span><span class="base0b">n </span><span
     class="base0c">M</span><span class="base0d">o</span><span
-    class="base0e">k</span></a>] # _
+    class="base0e">k</span></a><span class="surrounding">] # _</span>
 </h1>

layouts/partials/home/about.html

@@ -1,7 +1,7 @@
 <div id="about">
 <h2>Welcome to my site!</h2>
 <p>
-  I'm Kevin Mok - a 2<sup>nd</sup> year 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/contact-info.html

@@ -1,15 +1,39 @@
-<div id="contact-info">
+<div id="contact-info" class="container">
-  <div id="phone-number">
+  <div class="row row-top justify-content-center">
+    <div id="phone-number" class="col text-left">
+      <a href="tel:647-685-2500" target="_blank">
         <img src="{{ "img/resume/smartphone.svg" | relURL }}"
-    alt="smartphone-icon">:
+          alt="smartphone-icon">
-    <a href="tel:647-685-2500" target="_blank">647-685-2500</a>
+        <span class="url-info">
+          647-685-2500
+        </span>
+      </a>
     </div>
-  <div id="email">
+    <div id="linkedin" class="col text-right">
-    <img src="{{ "img/resume/envelope.svg" | relURL }}" alt="envelope-icon">:
+      <a href="https://www.linkedin.com/in/Kev-Mok">
-    <a href="mailto:me@kevin-mok.com">me@kevin-mok.com</a>
+        <span class="url-info">
+          Kev-Mok
+        </span>
+        <img src="{{ "img/social/linkedin.svg" | relURL }}" alt="linkedin-icon">
+      </a>
+    </div>
+  </div>
+  <div class="row justify-content-center">
+    <div id="email" class="col col-left">
+      <a href="mailto:me@kevin-mok.com">
+        <img src="{{ "img/resume/envelope.svg" | relURL }}" alt="envelope-icon">
+        <span class="url-info">
+          me@kevin-mok.com
+        </span>
+      </a>
+    </div>
+    <div id="website" class="col text-right">
+      <a href="https://kevin-mok.com/">
+        <span class="url-info">
+          kevin-mok.com
+        </span>
+        <img src="{{ "img/resume/link.svg" | relURL }}" alt="link-icon">
+      </a>
     </div>
-  <div id="website">
-    <img src="{{ "img/resume/link.svg" | relURL }}" alt="link-icon">:
-    <a href="https://kevin-mok.com/">kevin-mok.com</a>
   </div>
 </div>

layouts/resume/section.html

@@ -6,8 +6,6 @@
 
 {{ partial "resume/contact-info.html" . }}
 
-{{ partial "base/base16-logo.html" . }}
-
 <div id="resume">
   
 {{ .Content }}

layouts/robots.txt

@@ -1,4 +1 @@
 User-agent: *
-
-Allow: /$
-Disallow: /

layouts/shortcodes/resume/education.html

@@ -0,0 +1,13 @@
+<div class="education">
+  <div class="row">
+    <div class="col-8 text-left">
+      <p class="institution">
+        {{ .Get "name" }}
+      </p>
+    </div>
+    <div class="col text-right date">{{ .Get "date" }}</div>
+  </div>
+  <span class="title">
+    {{ .Get "title" }}
+  </span>
+</div>

layouts/shortcodes/resume/project.html

@@ -1,14 +1,23 @@
 <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>
       <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" }} ⏷</h2>
+        <h2 class="project-title">
+          {{ .Get "name" }}
+          <!-- <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>
-  <div class="date">{{ .Get "date" }}</div>
+    </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>

static/img/social/email.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 504.124 504.124" style="enable-background:new 0 0 504.124 504.124;" xml:space="preserve">
+<path style="fill:#D07C40;" d="M0,200.862L252.062,51.2l252.062,149.662v220.554H0V200.862z"/>
+<path style="fill:#EFEFEF;" d="M55.138,11.815h393.846c8.665,0,15.754,7.089,15.754,15.754v275.692
+	c0,8.665-7.089,15.754-15.754,15.754H55.138c-8.665,0-15.754-7.089-15.754-15.754V27.569C39.385,18.905,46.474,11.815,55.138,11.815
+	z"/>
+<path style="fill:#26A6D1;" d="M415.902,43.323l25.206-31.508h7.877c8.665,0,15.754,7.089,15.754,15.754v15.754H415.902z
+	 M211.102,43.323l25.206-31.508h55.138L266.24,43.323H211.102z M39.385,43.323V27.569c0-8.665,7.089-15.754,15.754-15.754h39.385
+	L69.317,43.323H39.385z"/>
+<path style="fill:#EFC75E;" d="M504.123,468.677c0,12.997-10.634,23.631-23.631,23.631H23.631C10.634,492.309,0,481.674,0,468.677
+	V200.862l252.062,110.277l252.062-110.277v267.815H504.123z"/>
+<path style="fill:#E8C15B;" d="M504.123,468.677c0,12.997-10.634,23.631-23.631,23.631H23.631C10.634,492.309,0,481.674,0,468.677
+	v-47.262l504.123-220.554V468.677z"/>
+<path style="fill:#D6D9DB;" d="M160.295,151.631l3.151,16.542l-25.206-39.385l-35.446,55.138c-0.394,5.12,22.449,9.058,50.806,9.058
+	s51.2-3.938,51.2-9.058l-31.114-46.08C173.686,137.846,160.295,151.631,160.295,151.631z M163.446,129.969
+	c5.514,0,9.846-4.332,9.846-9.846s-4.332-9.846-9.846-9.846s-9.846,4.332-9.846,9.846S157.932,129.969,163.446,129.969z
+	 M244.185,126.031h157.538c4.332,0,7.877-3.545,7.877-7.877s-3.545-7.877-7.877-7.877H244.185c-4.332,0-7.877,3.545-7.877,7.877
+	S239.852,126.031,244.185,126.031z M401.723,141.785H244.185c-4.332,0-7.877,3.545-7.877,7.877s3.545,7.877,7.877,7.877h157.538
+	c4.332,0,7.877-3.545,7.877-7.877C409.6,145.329,406.055,141.785,401.723,141.785z M362.338,173.292H244.185
+	c-4.332,0-7.877,3.545-7.877,7.877s3.545,7.877,7.877,7.877h118.154c4.332,0,7.877-3.545,7.877-7.877
+	C370.215,176.837,366.671,173.292,362.338,173.292z"/>
+<path style="fill:#E2574C;" d="M313.502,43.323l25.206-31.508h55.138L368.64,43.323H313.502z M108.702,43.323l25.206-31.508h55.138
+	L163.84,43.323H108.702z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

static/img/social/gitea.svg

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46667 135.46667"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.1 r15371"
+   inkscape:export-filename=""
+   inkscape:export-xdpi="48.000004"
+   inkscape:export-ydpi="48.000004">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="418.13805"
+     inkscape:cy="177.57445"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     units="px"
+     width="256px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="false"
+     inkscape:measure-start="283.373,243.952"
+     inkscape:measure-end="290.267,236.527">
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,512"
+       id="guide3699"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="135.46667,0"
+       orientation="-512,0"
+       id="guide3701"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="135.46667,135.46667"
+       orientation="0,-512"
+       id="guide3703"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="0,135.46667"
+       orientation="512,0"
+       id="guide3705"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53334)"
+     style="display:inline">
+    <path
+       style="fill:#609926;fill-opacity:1;stroke:#428f29;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 27.709937,195.15095 c -9.546573,-0.0272 -22.3392732,6.79805 -21.6317552,23.90397 1.105534,26.72889 25.4565952,29.20839 35.1916502,29.42301 1.068023,5.01357 12.521798,22.30563 21.001818,23.21667 h 37.15277 c 22.27763,-1.66785 38.9607,-75.75671 26.59321,-76.03825 -46.781583,2.47691 -49.995146,2.13838 -88.599758,0 -2.495053,-0.0266 -5.972321,-0.49474 -9.707935,-0.5054 z m 2.491319,9.45886 c 1.351378,13.69267 3.555849,21.70359 8.018216,33.94345 -11.382872,-1.50473 -21.069822,-5.22443 -22.851515,-19.10984 -0.950962,-7.4112 2.390428,-15.16769 14.833299,-14.83361 z"
+       id="path3722"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sscccccsccsc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     style="display:inline">
+    <rect
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.24757317;stroke-opacity:1"
+       id="rect4599"
+       width="34.762054"
+       height="34.762054"
+       x="87.508659"
+       y="18.291576"
+       transform="rotate(25.914715)"
+       ry="5.4825778" />
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26644793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 79.804947,57.359056 3.241146,1.609954 V 35.255731 h -3.262698 z"
+       id="path4525"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Layer 3"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g4539">
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="90.077766"
+         cx="49.064713"
+         id="path4606"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="102.1049"
+         cx="36.810425"
+         id="path4606-3"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="111.43928"
+         cx="46.484283"
+         id="path4606-1"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <rect
+         transform="rotate(26.024158)"
+         y="18.061695"
+         x="97.333458"
+         height="27.261492"
+         width="2.6726954"
+         id="rect4629-8"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.27444693;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4514"
+         d="m 76.558096,68.116343 c 12.97589,6.395378 13.012989,4.101862 4.890858,20.907244"
+         style="fill:none;stroke:#609926;stroke-width:2.68000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

static/img/social/github.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="438.549px" height="438.549px" viewBox="0 0 438.549 438.549" style="enable-background:new 0 0 438.549 438.549;"
+	 xml:space="preserve">
+<g>
+	<path d="M409.132,114.573c-19.608-33.596-46.205-60.194-79.798-79.8C295.736,15.166,259.057,5.365,219.271,5.365
+		c-39.781,0-76.472,9.804-110.063,29.408c-33.596,19.605-60.192,46.204-79.8,79.8C9.803,148.168,0,184.854,0,224.63
+		c0,47.78,13.94,90.745,41.827,128.906c27.884,38.164,63.906,64.572,108.063,79.227c5.14,0.954,8.945,0.283,11.419-1.996
+		c2.475-2.282,3.711-5.14,3.711-8.562c0-0.571-0.049-5.708-0.144-15.417c-0.098-9.709-0.144-18.179-0.144-25.406l-6.567,1.136
+		c-4.187,0.767-9.469,1.092-15.846,1c-6.374-0.089-12.991-0.757-19.842-1.999c-6.854-1.231-13.229-4.086-19.13-8.559
+		c-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559
+		c-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-0.951-2.568-2.098-3.711-3.429c-1.142-1.331-1.997-2.663-2.568-3.997
+		c-0.572-1.335-0.098-2.43,1.427-3.289c1.525-0.859,4.281-1.276,8.28-1.276l5.708,0.853c3.807,0.763,8.516,3.042,14.133,6.851
+		c5.614,3.806,10.229,8.754,13.846,14.842c4.38,7.806,9.657,13.754,15.846,17.847c6.184,4.093,12.419,6.136,18.699,6.136
+		c6.28,0,11.704-0.476,16.274-1.423c4.565-0.952,8.848-2.383,12.847-4.285c1.713-12.758,6.377-22.559,13.988-29.41
+		c-10.848-1.14-20.601-2.857-29.264-5.14c-8.658-2.286-17.605-5.996-26.835-11.14c-9.235-5.137-16.896-11.516-22.985-19.126
+		c-6.09-7.614-11.088-17.61-14.987-29.979c-3.901-12.374-5.852-26.648-5.852-42.826c0-23.035,7.52-42.637,22.557-58.817
+		c-7.044-17.318-6.379-36.732,1.997-58.24c5.52-1.715,13.706-0.428,24.554,3.853c10.85,4.283,18.794,7.952,23.84,10.994
+		c5.046,3.041,9.089,5.618,12.135,7.708c17.705-4.947,35.976-7.421,54.818-7.421s37.117,2.474,54.823,7.421l10.849-6.849
+		c7.419-4.57,16.18-8.758,26.262-12.565c10.088-3.805,17.802-4.853,23.134-3.138c8.562,21.509,9.325,40.922,2.279,58.24
+		c15.036,16.18,22.559,35.787,22.559,58.817c0,16.178-1.958,30.497-5.853,42.966c-3.9,12.471-8.941,22.457-15.125,29.979
+		c-6.191,7.521-13.901,13.85-23.131,18.986c-9.232,5.14-18.182,8.85-26.84,11.136c-8.662,2.286-18.415,4.004-29.263,5.146
+		c9.894,8.562,14.842,22.077,14.842,40.539v60.237c0,3.422,1.19,6.279,3.572,8.562c2.379,2.279,6.136,2.95,11.276,1.995
+		c44.163-14.653,80.185-41.062,108.068-79.226c27.88-38.161,41.825-81.126,41.825-128.906
+		C438.536,184.851,428.728,148.168,409.132,114.573z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

static/img/social/linkedin.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 382 382" style="enable-background:new 0 0 382 382;" xml:space="preserve">
+<path style="fill:#0077B7;" d="M347.445,0H34.555C15.471,0,0,15.471,0,34.555v312.889C0,366.529,15.471,382,34.555,382h312.889
+	C366.529,382,382,366.529,382,347.444V34.555C382,15.471,366.529,0,347.445,0z M118.207,329.844c0,5.554-4.502,10.056-10.056,10.056
+	H65.345c-5.554,0-10.056-4.502-10.056-10.056V150.403c0-5.554,4.502-10.056,10.056-10.056h42.806
+	c5.554,0,10.056,4.502,10.056,10.056V329.844z M86.748,123.432c-22.459,0-40.666-18.207-40.666-40.666S64.289,42.1,86.748,42.1
+	s40.666,18.207,40.666,40.666S109.208,123.432,86.748,123.432z M341.91,330.654c0,5.106-4.14,9.246-9.246,9.246H286.73
+	c-5.106,0-9.246-4.14-9.246-9.246v-84.168c0-12.556,3.683-55.021-32.813-55.021c-28.309,0-34.051,29.066-35.204,42.11v97.079
+	c0,5.106-4.139,9.246-9.246,9.246h-44.426c-5.106,0-9.246-4.14-9.246-9.246V149.593c0-5.106,4.14-9.246,9.246-9.246h44.426
+	c5.106,0,9.246,4.14,9.246,9.246v15.655c10.497-15.753,26.097-27.912,59.312-27.912c73.552,0,73.131,68.716,73.131,106.472
+	L341.91,330.654L341.91,330.654z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

static/img/social/mastodon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>

static/server-apps.json

@@ -1,78 +0,0 @@
-{
-  "sites": [
-    {
-      "shortUrl": "kevin-mok.com",
-      "url": "https://kevin-mok.com",
-      "siteTitle": " Kevin Mok ",
-      "description": "Personal site (this site).",
-      "repo": "Kevin-Mok/my-site",
-      "repoUrl": "https://git.kevin-mok.com/Kevin-Mok/my-site",
-      "status": "up"
-    },
-    {
-      "shortUrl": "git.kevin-mok.com",
-      "url": "https://git.kevin-mok.com",
-      "siteTitle": "Kevin Mok's Gitea",
-      "description": "Lightweight Git server.",
-      "repo": "go-gitea/gitea",
-      "repoUrl": "https://github.com/go-gitea/gitea",
-      "status": "up"
-    },
-    {
-      "shortUrl": "cal.khkm.tk",
-      "url": "https://cal.khkm.tk",
-      "siteTitle": "Baïkal server",
-      "description": "CalDAV/CardDAV server.",
-      "repo": "sabre-io/Baikal",
-      "repoUrl": "https://github.com/sabre-io/Baikal",
-      "status": "up"
-    },
-    {
-      "shortUrl": "matrix.ataraxy.tk",
-      "url": "https://matrix.ataraxy.tk/.well-known/matrix/server",
-      "siteTitle": "",
-      "description": "Matrix chat server. Only accessible through Riot client.",
-      "repo": "matrix-org/synapse",
-      "repoUrl": "https://github.com/matrix-org/synapse",
-      "status": "up"
-    },
-    {
-      "shortUrl": "mnpd.gq",
-      "url": "https://mnpd.gq/test",
-      "siteTitle": "test",
-      "description": "Minimalistic live web notepad.",
-      "repo": "pereorga/minimalist-web-notepad",
-      "repoUrl": "https://github.com/pereorga/minimalist-web-notepad",
-      "status": "up"
-    },
-    {
-      "shortUrl": "pste.gq",
-      "url": "https://pste.gq",
-      "siteTitle": "hastebin",
-      "description": "Pastebin.",
-      "repo": "seejohnrun/haste-server",
-      "repoUrl": "https://github.com/seejohnrun/haste-server",
-      "status": "up"
-    },
-    {
-      "shortUrl": "smol.gq",
-      "url": "https://smol.gq",
-      "siteTitle": "Kevin's URL Shortener",
-      "description": "URL shortener.",
-      "repo": "132ikl/liteshort",
-      "repoUrl": "https://github.com/132ikl/liteshort",
-      "status": "up"
-    },
-    {
-      "shortUrl": "taskd.khkm.tk",
-      "url": "taskd.khkm.tk:53589",
-      "siteTitle": "",
-      "description": "Taskwarrior (task manager) server. No web interface.",
-      "repo": "GothenburgBitFactory/taskserver",
-      "repoUrl": "https://github.com/GothenburgBitFactory/taskserver",
-      "status": "up"
-    }
-  ],
-  "updateTime": 1569204723194,
-  "upSince": "2019-09-22 19:30:10"
-}

static/server-table.js

@@ -50,17 +50,42 @@ const generateTable = (table, data) => {
   })
 }
 
-const getDurationSince = date => { 
+const getDurationSince = (date, verbose) => { 
   const milli = Math.abs(Date.now() - date)
   let mins = Math.floor(milli/1000/60)
   const days = Math.floor(mins/60/24)
   mins %= 60*24
   const hours = Math.floor(mins/60)
   mins %= 60
-  let durationString = (days > 0) ? `${days}d ` : ''
+
-  durationString += (hours > 0) ? `${hours} hours, ` : ''
+  let dayString = ''
-  durationString += (mins > 0) ? `${mins} minutes` : '0m'
+  let hourString = ''
-  return durationString
+  let minString = ''
+  if (days > 0) {
+    dayString += days
+    if (!verbose) {
+      dayString += 'd '
+    } else {
+      dayString += (days == 1) ? ' day' : ' days'
+      dayString += ', '
+    }
+  }
+  if (hours > 0) {
+    hourString += hours
+    if (!verbose) {
+      hourString += 'h '
+    } else {
+      hourString += (hours == 1) ? ' hour' : ' hours'
+      hourString += ', '
+    }
+  }
+  minString += (mins > 0) ? mins: '0' 
+  if (!verbose) {
+    minString += 'm'
+  } else {
+    minString += (mins == 1) ? ' minute' : ' minutes'
+  }
+  return dayString + hourString + minString
 }
 
 fetch("/server-apps.json")
@@ -70,7 +95,7 @@ fetch("/server-apps.json")
     generateTable(table, json['sites']);
     generateTableHead(table);
     document.querySelector('#last-updated-time').textContent =
-      getDurationSince(new Date(json['updateTime'])) + ' ago.'
+      getDurationSince(new Date(json['updateTime']), false) + ' ago.'
     document.querySelector('#server-uptime-time').textContent = 
-      getDurationSince(new Date(json['upSince'])) + '.'
+      getDurationSince(new Date(json['upSince']), true) + '.'
   });