Merge branch 'develop'

__src/views/_data/site.json

@@ -1,13 +1,18 @@
 {
   "name": "JL Folio",
   "description": "Jain Lo’s Portfolio site",
-  "url": "https://www.jainlo.com",
-  "domain": "https://www.jainlo.com",
+  "url": "https://audiliew.github.io/jfolio",
+  "domain": "https://audiliew.github.io/jfolio",
+  "home": "/",
   "author": {
     "name": "JL"
   },
+  "assets": {
+    "css": "/assets/main.css",
+    "js": "/assets/main.js"
+  },
   "path": {
-    "img": "/assets/img/"
+    "img": "/assets/img"
   },
   "names": {
     "image": {

__src/views/_includes/components/logo.njk

@@ -1 +1 @@
-<div class="navbar-logo"><a href="/">Jain Lo</a></div>
+<div class="navbar-logo"><a href="{{ site.home | url }}">Jain Lo</a></div>

__src/views/_includes/layouts/default.njk

@@ -18,7 +18,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
 
   <link href="https://fonts.googleapis.com/css?family=El+Messiri&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="/assets/main.css">
+  <link rel="stylesheet" href="{{ site.assets.css | url }}">
   {# <link rel="icon" type="image/png" href="{{ site.images.favicon }}"> #}
   <script>document.documentElement.className="js"</script>
 
@@ -48,7 +48,7 @@
     <div id="transition__plate" class="transition__plate"></div>
     <div id="transition__bg" class="transition__bg"></div>
   </div>
-  <script src='/assets/main.js'></script>
+  <script src='{{ site.assets.js | url }}'></script>
 </body>
 </html>
 

__src/views/_includes/layouts/work.njk

@@ -1,8 +1,9 @@
 ---
 layout: default
 ---
-<div class="hero bannerParallax" style="background-image:url({{ site.path.img }}/{{ code }}/{{ heroImg }})">
-  <img src="{{ site.path.img }}/{{ code }}/{{ heroImg }}">
+
+<div class="hero bannerParallax" style="background-image:url({{ site.path.img | url }}/{{ code }}/{{ heroImg }})">
+  <img src="{{ site.path.img | url }}/{{ code }}/{{ heroImg }}">
 </div>
 <div class="post-wrap">
   <div class="container">

__src/views/index.njk

@@ -15,10 +15,10 @@ body_class: "page-home"
 
 <div class="container">
   <div class="work-wrap">
-    {%- for post in collections.posts -%}
+    {%- for post in collections.works -%}
     <div class="work{% if post.data.is_short %} short{% endif %}">
-      <a href="{{ post.url }}" class="work__link">
-        <div class="work__preview"><img src="{{ site.path.img }}{{ post.data.code }}/preview.jpg" alt="{{ post.data.title }} preview"></div>
+      <a href="{{ post.url | url }}" class="work__link">
+        <div class="work__preview"><img src="{{ site.path.img | url }}{{ post.data.code }}/preview.jpg" alt="{{ post.data.title }} preview"></div>
         <div class="work__title">{{ post.data.title }}</div>
         <div class="work__type">{{ post.data.projectType }}</div>
       </a>

__src/views/works/denni.md

@@ -0,0 +1,35 @@
+---
+title: 'Denni'
+projectType: 'Corporate Identity'
+projectIntro: 'This is intro Culpa voluptatem optio ipsam quisquam maxime nihil nisi reprehenderit nam labore quo animi, autem adipisci explicabo fugit exercitationem deserunt nobis minima magni tempora eum est aliquid. Reiciendis accusamus nam voluptatum dicta tenetur'
+code: 'denni'
+permalink: /denni/ #false #
+date: 2020-02-04
+heroImg: 'hero.jpg'
+#mod_date: 2020-01-01
+is_short: true
+eleventyNavigation:
+  key: Denni
+  order: 1
+tags: 
+  - identity
+changefreq: monthly
+---
+{% set imgPathAndPrefix = site.path.img | url %}
+
+{% img src=imgPathAndPrefix + code + "/denni-1.jpg", caption="Denni Corporate Identity - Concept, layout, and photography art direction", marginBottom=false %}
+{% img src=imgPathAndPrefix + code + "/denni-2.jpg", caption="", marginBottom=false %}
+{% img src=imgPathAndPrefix + code + "/denni-3.jpg", caption="" %}
+
+{% img src=imgPathAndPrefix + code + "/denni-4.jpg", caption="", short=true, marginBottom=false %}
+
+{% imgstack src = [
+              imgPathAndPrefix + code + "/denni-5.jpg", 
+              imgPathAndPrefix + code + "/denni-6.jpg", 
+              imgPathAndPrefix + code + "/denni-7.jpg", 
+              imgPathAndPrefix + code + "/denni-8.jpg", 
+              imgPathAndPrefix + code + "/denni-9.jpg", 
+              imgPathAndPrefix + code + "/denni-10.jpg"
+            ],
+            columns = 2
+%}

__src/views/works/pmo.md

@@ -0,0 +1,26 @@
+---
+title: "Prime Minister’s Office"
+projectType: 'Invitation Cards'
+projectIntro: 'This is intro Culpa voluptatem optio ipsam quisquam maxime nihil nisi reprehenderit nam labore quo animi, autem adipisci explicabo fugit exercitationem deserunt nobis minima magni tempora eum est aliquid. Reiciendis accusamus nam voluptatum dicta tenetur'
+code: 'pmo'
+permalink: /pmo/ #false #
+date: 2020-02-04
+heroImg: 'hero.jpg'
+#mod_date: 2020-01-01
+is_short: true
+tags: 
+  - cards
+changefreq: monthly
+eleventyNavigation:
+  key: PMO
+  order: 1
+---
+{% set imgPathAndPrefix = site.path.img | url %}
+
+{% img src=imgPathAndPrefix + code + "/pmo-1.jpg", caption="Line drawing of the Istana - Used on stationery and PMO’s prepaid stamp", border=false %}
+{% img src=imgPathAndPrefix + code + "/pmo-2.jpg", caption="2015 Lunar New Year reception invite", marginBottom=false %}
+{% img src=imgPathAndPrefix + code + "/pmo-3.jpg", caption="", marginBottom=false %}
+{% img src=imgPathAndPrefix + code + "/pmo-4.jpg", caption="" %}
+
+{% img src=imgPathAndPrefix + code + "/pmo-5.jpg", caption="2016 Lunar New Year reception invite", marginBottom=false %}
+{% img src=imgPathAndPrefix + code + "/pmo-6.jpg", caption="" %}

__src/views/posts/shoe-salon.md → __src/views/works/shoe-salon.md

@@ -9,23 +9,23 @@ heroImg: 'hero.jpg'
 #mod_date: 2020-01-01
 is_short: true
 tags: 
-  - website
+  - identity
 changefreq: monthly
 eleventyNavigation:
   key: Shoe Salon
   order: 1
 ---
+{% set imgPathAndPrefix = site.path.img | url %}
+{% img src=imgPathAndPrefix + code + "/shoe-salon-1.jpg", caption="The Shoe Salon logo design" %}
 
-{% img src=site.path.img + code + "/shoe-salon-1.jpg", caption="The Shoe Salon logo design" %}
+{% img src=imgPathAndPrefix + code + "/shoe-salon-2.jpg", caption="<i>Her World</i> magazine Ad - Chloé<br>Concept and digital imagine" %}
 
-{% img src=site.path.img + code + "/shoe-salon-2.jpg", caption="<i>Her World</i> magazine Ad - Chloé<br>Concept and digital imagine" %}
-
-{% img src=site.path.img + code + "/shoe-salon-3.jpg", caption="Newspaper Ad - Concept and digital imaging" %}
+{% img src=imgPathAndPrefix + code + "/shoe-salon-3.jpg", caption="Newspaper Ad - Concept and digital imaging" %}
 
 {% imgstack src = [
-            site.path.img + code + "/shoe-salon-4.jpg", 
-            site.path.img + code + "/shoe-salon-5.jpg", 
-            site.path.img + code + "/shoe-salon-6.jpg"
+            imgPathAndPrefix + code + "/shoe-salon-4.jpg", 
+            imgPathAndPrefix + code + "/shoe-salon-5.jpg", 
+            imgPathAndPrefix + code + "/shoe-salon-6.jpg"
           ],
           caption = "Other Ads in the series (by colleagues)",
           columns = 3,

eleventy.config.js

@@ -16,7 +16,6 @@ module.exports = eleventyConfig => {
 
   let markdownLib = markdownIt(options).use(markdownItAttrs);
 
-
   eleventyConfig.addPlugin(eleventyNavigationPlugin);
 
   eleventyConfig.setLibrary("md", markdownLib);
@@ -129,10 +128,11 @@ module.exports = eleventyConfig => {
   });  
 
   // https://remysharp.com/2019/06/26/scheduled-and-draft-11ty-posts
-  eleventyConfig.addCollection('posts', collection => {
-    return collection.getFilteredByGlob('./__src/views/posts/**/*.md')
+  eleventyConfig.addCollection('works', collection => {
+    return collection.getFilteredByGlob('./__src/views/works/**/*.md')
       .filter(livePosts).reverse();
   });
+
   // Minify HTML
   /*
   eleventyConfig.addTransform("htmlmin", function(content, outputPath) {

package.json

@@ -14,7 +14,7 @@
     "preview:webpack": "npm run start:webpack",
     "clean": "rimraf docs",
     "build": "npm run build:webpack && npm run build:11ty",
-    "build:11ty": "cross-env ELEVENTY_ENV=production eleventy --config=eleventy.config.js",
+    "build:11ty": "cross-env ELEVENTY_ENV=production eleventy --config=eleventy.config.js --pathprefix=jfolio",
     "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
     "cleanbuild": "npm run clean && npm run build"
   },

webpack.common.js

@@ -53,6 +53,11 @@ module.exports = {
         from: 'CNAME',
         to: '../'
       },
+      {
+        context: '.',
+        from: '.nojekyll',
+        to: '../'
+      },
       {
         context: '.',
         from: 'robots.txt',