Improved general structure, resolve category name in metadata filter, added hideable nav items, added header for page layout

17 files changed, 157 insertions, 112 deletions

diff --git a/assets/css/components/_page-header.scss b/assets/css/components/_hero.scss
index e97aaf7..7fa79e1 100644
--- a/assets/css/components/_page-header.scss
+++ b/assets/css/components/_hero.scss
@@ -1,4 +1,4 @@
-.c-page-header {
+.c-hero {
     margin-bottom: $line-height * 2em;
     margin-left: -1 * $page--item-prefix--width;
     padding-left: $page--item-prefix--width;
diff --git a/assets/css/components/_page.scss b/assets/css/components/_page.scss
index bccf069..ce67f7e 100644
--- a/assets/css/components/_page.scss
+++ b/assets/css/components/_page.scss
@@ -1,4 +1,18 @@
 .c-page {
+    &__header {
+        margin-bottom: $line-height * 1em;
+
+        &__title {
+            margin-top: 0;
+        }
+
+        &__meta {
+            margin-top: 0;
+            color: var(--fg-hi);
+            font-weight: normal;
+        }
+    }
+
     &__content {
         padding-left: $page--item-prefix--width;
 
diff --git a/assets/css/style.scss b/assets/css/style.scss
index e89cbd6..9f3bb31 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -6,7 +6,7 @@
 @import 'components/hlist';
 @import 'components/nav';
 @import 'components/page';
-@import 'components/page-header';
+@import 'components/hero';
 
 @import 'layouts/container';
 
diff --git a/content/_personal/index.md b/content/_personal/index.md
new file mode 100644
index 0000000..5e89459
--- /dev/null
+++ b/content/_personal/index.md
@@ -0,0 +1,4 @@
+---
+title: Personal Blog
+layout: dated_list
+---
diff --git a/content/blog/index.md b/content/blog/index.md
index 1053dc2..6668eba 100644
--- a/content/blog/index.md
+++ b/content/blog/index.md
@@ -1,7 +1,5 @@
 ---
 title: Blog
-
+layout: dated_list
 create_feed: true
 ---
-
-# Blog
diff --git a/content/blog/test1.md b/content/blog/test1.md
index 05c2b2d..943570c 100644
--- a/content/blog/test1.md
+++ b/content/blog/test1.md
@@ -3,5 +3,3 @@ date: 2020-12-25
 title: Test Page 1
 category: tes
 ---
-
-# Test Page 1
diff --git a/content/blog/test2/index.md b/content/blog/test2/index.md
index 9d1ebd2..aee4641 100644
--- a/content/blog/test2/index.md
+++ b/content/blog/test2/index.md
@@ -4,8 +4,6 @@ title: Test Page 2
 category: per
 ---
 
-# Test Page 2
-
 ```
  - /----\
 -  |    |
diff --git a/filters/common_actions.lua b/filters/common_actions.lua
index 1d13e3a..a358b99 100644
--- a/filters/common_actions.lua
+++ b/filters/common_actions.lua
@@ -2,7 +2,10 @@ function CodeBlock(el)
     if next(el.classes) == nil then
         el.classes = el.classes .. {'c-page__prefixed', 'c-page__prefixed--pre'}
     else
-        local formatted = pandoc.pipe('pygmentize', {'-l', el.classes[1], '-f', 'html', '-O', 'cssclass=c-page__code s-code'}, el.text)
+        local formatted = pandoc.pipe('pygmentize', {
+            '-l', el.classes[1], '-f', 'html', '-O',
+            'cssclass=c-page__code s-code'
+        }, el.text)
         el = pandoc.RawBlock('html', formatted)
     end
 
@@ -21,9 +24,7 @@ function Header(el)
 end
 
 function Div(el)
-    if el.attributes.macro == nil then
-        return el
-    end
+    if el.attributes.macro == nil then return el end
 
     if el.attributes.macro == 'refs' and el.content[1].tag == 'BulletList' then
         local newchildren = pandoc.List()
@@ -31,7 +32,8 @@ function Div(el)
         newchildren:insert(pandoc.RawBlock('html', '<ul>'))
 
         for k, children in ipairs(el.content[1].content) do
-            newchildren:insert(pandoc.RawBlock('html', '<li class="c-page__prefixed c-page__prefixed--ref">'))
+            newchildren:insert(pandoc.RawBlock('html',
+                                               '<li class="c-page__prefixed c-page__prefixed--ref">'))
             newchildren:extend(children)
             newchildren:insert(pandoc.RawBlock('html', '</li>'))
         end
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml
index 51e8cda..ac8474d 100644
--- a/metadata/metadata.yaml
+++ b/metadata/metadata.yaml
@@ -14,6 +14,10 @@ menus:
     - id: blog
       label: Blog
       url: /blog/
+    - id: _personal
+      label: Personal
+      url: /_personal/
+      hidden: true
 
 feeds:
   - title: Blog
diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua
index d6379b9..4abb716 100644
--- a/scripts/metadata_filter.lua
+++ b/scripts/metadata_filter.lua
@@ -1,13 +1,9 @@
 function format_date(date)
-    if date == nil then
-        return date
-    end
+    if date == nil then return date end
 
     date = pandoc.utils.normalize_date(pandoc.utils.stringify(date))
     local year, month, day = date:match("(%d%d%d%d)-(%d%d)-(%d%d)")
-    if year == nil then
-        return nil
-    end
+    if year == nil then return nil end
 
     local time = os.time({
         year = tonumber(year),
@@ -26,15 +22,10 @@ function table_to_list(t, cmp)
     local l = pandoc.List()
 
     for key, value in pairs(t) do
-        l:insert(pandoc.MetaMap({
-            key = key,
-            value = value
-        }))
+        l:insert(pandoc.MetaMap({key = key, value = value}))
     end
 
-    l:sort(cmp or function(i1, i2)
-        return i1.key < i2.key
-    end)
+    l:sort(cmp or function(i1, i2) return i1.key < i2.key end)
 
     return l
 end
@@ -56,9 +47,7 @@ function group_by(l, field, insert)
 
         if f ~= nil then
             local out = insert(groups[f], f, item)
-            if out ~= nil then
-                groups[f] = out
-            end
+            if out ~= nil then groups[f] = out end
         end
     end
 
@@ -68,9 +57,7 @@ end
 function splitstr(input, sep)
     sep = sep or "%s"
     local t = {}
-    for str in input:gmatch("([^" .. sep .. "]+)") do
-        table.insert(t, str)
-    end
+    for str in input:gmatch("([^" .. sep .. "]+)") do table.insert(t, str) end
     return t
 end
 
@@ -98,9 +85,7 @@ function relative_to(dir, target)
             path = path .. (path == "" and "" or "/") .. target[i]
         end
     elseif #dir > #target then
-        for i = #target + 1, #dir do
-            path = "../" .. path
-        end
+        for _ = #target + 1, #dir do path = "../" .. path end
     end
 
     return path
@@ -123,6 +108,16 @@ function resolve_url(page_type, site_url, content_dir, base_dir, cur_file)
     })
 end
 
+function resolve_layout(layout)
+    if layout then
+        layout = pandoc.utils.stringify(layout)
+        return pandoc.MetaMap({
+            id = pandoc.MetaString(layout),
+            ["is_" .. layout] = pandoc.MetaBool(true)
+        })
+    end
+end
+
 function resolve_section(abs_url)
     local section = abs_url:match("^/(.-)[/.]") or "index"
     return pandoc.MetaMap({
@@ -131,25 +126,48 @@ function resolve_section(abs_url)
     })
 end
 
-function organize_subpages(site_url, content_dir, base_dir, pages, categories)
-    local grouped_pages = group_by(pages, function(p)
-        return not p.date
+function resolve_category(categories, category)
+    if categories and category then
+        category = pandoc.utils.stringify(category)
+        return pandoc.MetaMap({
+            id = pandoc.MetaString(category),
+            name = pandoc.MetaString(categories[category] or category)
+        })
+    end
+end
+
+function create_main_menu_state(section, main_menu)
+    for i = 1, #main_menu do
+        local item = main_menu[i]
+        local active = pandoc.utils.stringify(item.id) == section.id
+        item.active = pandoc.MetaBool(active)
+    end
+
+    return main_menu:filter(function(item)
+        return not item.hidden or item.active
     end)
+end
+
+function organize_subpages(pages)
+    local grouped_pages = group_by(pages, function(p) return not p.date end)
 
     local pages_undated = grouped_pages[true] or pandoc.MetaList({})
     pages_undated:sort(function(p1, p2)
-        return pandoc.utils.stringify(p1.title) < pandoc.utils.stringify(p2.title)
+        return pandoc.utils.stringify(p1.title) <
+                   pandoc.utils.stringify(p2.title)
     end)
 
     local pages_dated = grouped_pages[false] or pandoc.MetaList({})
     pages_dated:sort(function(p1, p2)
-        return pandoc.utils.stringify(p1.date.yyyy_mm_dd) > pandoc.utils.stringify(p2.date.yyyy_mm_dd)
+        return pandoc.utils.stringify(p1.date.yyyy_mm_dd) >
+                   pandoc.utils.stringify(p2.date.yyyy_mm_dd)
     end)
 
     local pages_by_year = group_by(pages_dated, function(p)
         return pandoc.utils.stringify(p.date.yyyy)
     end)
-    pages_by_year = pandoc.MetaList(table_to_list(pages_by_year, function(i1, i2)
+    pages_by_year = pandoc.MetaList(table_to_list(pages_by_year,
+                                                  function(i1, i2)
         return i1.key > i2.key
     end))
 
@@ -161,13 +179,10 @@ function organize_subpages(site_url, content_dir, base_dir, pages, categories)
     })
 
     local categories_data = group_by(pages_dated, function(p)
-        return p.category and pandoc.utils.stringify(p.category)
-    end, function(stats, category)
+        return p.category and pandoc.utils.stringify(p.category.id)
+    end, function(stats, _, p)
         if not stats then
-            return {
-                name = pandoc.MetaString(categories[category] or category),
-                count = 1
-            }
+            return {name = pandoc.MetaString(p.category.name), count = 1}
         else
             stats.count = stats.count + 1
         end
@@ -175,7 +190,8 @@ function organize_subpages(site_url, content_dir, base_dir, pages, categories)
     categories_data = pandoc.MetaList(table_to_list(categories_data))
 
     for i = 1, #categories_data do
-        categories_data[i].value.count = pandoc.MetaString(("%d"):format(categories_data[i].value.count))
+        categories_data[i].value.count =
+            pandoc.MetaString(("%d"):format(categories_data[i].value.count))
     end
 
     return pages_data, categories_data
@@ -188,6 +204,8 @@ function Meta(meta)
     meta.base_dir = meta.base_file:gsub("^(.*)/.-$", "%1")
     meta.page_type = meta.page_type or "page"
 
+    meta.layout = resolve_layout(meta.layout)
+
     meta.date = format_date(meta.date)
     if meta.last_update ~= nil then
         meta.last_update = format_date(meta.last_update)
@@ -197,28 +215,26 @@ function Meta(meta)
 
     if meta.page_type == "feed" then
         meta.page = pandoc.MetaMap({
-            url = resolve_url("page", meta.site.url, meta.content_dir, meta.base_dir, meta.file)
+            url = resolve_url("page", meta.site.url, meta.content_dir,
+                              meta.base_dir, meta.file)
         })
     end
 
-    meta.url = resolve_url(meta.page_type, meta.site.url, meta.content_dir, meta.base_dir, meta.file)
+    meta.url = resolve_url(meta.page_type, meta.site.url, meta.content_dir,
+                           meta.base_dir, meta.file)
     meta.section = resolve_section(meta.url.abs)
-    meta.categories = meta.categories[meta.section.id]
+    meta.category = resolve_category(meta.categories[meta.section.id],
+                                     meta.category)
+    meta.categories = nil
 
     if meta.menus and meta.menus.main then
-        for i = 1, #meta.menus.main do
-            local item = meta.menus.main[i]
-            item.active = pandoc.MetaBool(pandoc.utils.stringify(item.id) == meta.section.id)
-        end
+        meta.menus.main = create_main_menu_state(meta.section, meta.menus.main)
     end
 
     if meta.pages then
-        local pages, categories = organize_subpages(meta.site.url, meta.content_dir, meta.base_dir, meta.pages,
-                                      meta.categories)
+        local pages, categories = organize_subpages(meta.pages)
         meta.pages = pages
         meta.categories = categories
-    else
-        meta.categories = nil
     end
 
     return meta
diff --git a/templates/base.html b/templates/base.html
index b4a2953..da3dec9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,33 +45,14 @@
     <main class="c-page s-page l-container l-container--content l-container--pad-v">
         <div class="c-page__content">
             $if(section.is_index)$
-                <header class="c-page-header u-hidden@sm-down" role="presentation">
-${partials/pageHeader()}
-                </header>
-
-${page()}
-            $elseif(pages)$
-${list()}
+${layouts/index()}
+            $elseif(layout.is_dated_list)$
+${layouts/dated_list()}
             $else$
-${page()}
+${layouts/page()}
             $endif$
         </div>
     </main>
-
-    $if(section.is_index)$
-        <template id="header-sm">
-${partials/pageHeaderSm()}
-        </template>
-
-        <script>
-            var headerEl = document.querySelector(".c-page-header");
-            var headerTemplateEl = document.getElementById("header-sm");
-            var headerSmEl = headerTemplateEl.content.cloneNode("true");
-
-            headerEl.classList.remove("u-hidden@sm-down");
-            headerEl.appendChild(headerSmEl);
-        </script>
-    $endif$
 </body>
 
 </html>
diff --git a/templates/list.html b/templates/layouts/dated_list.html
index d74681c..0a279f0 100644
--- a/templates/list.html
+++ b/templates/layouts/dated_list.html
@@ -1,3 +1,5 @@
+<h1 class="c-page__prefixed c-page__prefixed--h1">$title$</h1>
+
 $body$
 
 $if(categories)$
@@ -12,7 +14,7 @@ $for(pages.by_year)$
     <ul>
         $for(it.value)$
             <li class="c-page__prefixed c-page__prefixed--ref">
-                <a href="$it.url.rel$">$it.category/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
+                <a href="$it.url.rel$">$it.category.id/uppercase$ $it.date.yyyy_mm_dd$ - $it.title$</a>
             </li>
         $endfor$
     </ul>
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
new file mode 100644
index 0000000..144d1ed
--- /dev/null
+++ b/templates/layouts/index.html
@@ -0,0 +1,44 @@
+<header class="c-hero u-hidden@sm-down" role="presentation">
+    $-- ' |      '     '             '     '            '   | |    |           '     '
+    $--   |      '     '             '       //\_       '   | ' .  |           '     '
+    $--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
+    $--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
+    $-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
+    $--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
+    $-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
+    $-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+        
+    <pre class="c-hero__pre c-page__prefixed c-page__prefixed--pre u-mt0 u-hidden@sm-down">
+' |      '     '             '     '            '   | |    |           '     '  
+  |      '     '             '       <strong>//\_</strong>       '   | ' .  |           '     '  
+ .|      '      <strong>____,...,______..,_~``  -`..,</strong>   '   |    ' |           '     '  
+  |       <strong>_,~´"'  ,               .    ,~--´</strong>    '  _|  | . |~~.__      '     '  
+| |    <strong>,-"    _.-|~/  |..,____,) ,/,,"'</strong>         '_( | '    |)    )     '     '  
+ '|    <strong>\__,~"´   /:) /       |:\ \</strong>            ,~(    ) . | |  )   `,   '   _,--.
+   \   .   :    <strong>(:/\_-,      \:.\_-,</strong>    .  \ .\      .  :   \  .   ) . ' ,/     </pre>
+
+</header>
+
+$body$
+
+<template id="header-sm">
+    $-- .|                     //\__      '  .'      |  . |           ' . ' 
+    $--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
+    $-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
+    $--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
+
+    <pre class="c-hero__pre c-page__prefixed c-page__prefixed--pre u-mt0 $if(section.is_index)$u-hidden@sm-up$endif$">
+.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
+ |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
+'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
+ |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>
+</template>
+
+<script>
+    var headerEl = document.querySelector(".c-hero");
+    var headerTemplateEl = document.getElementById("header-sm");
+    var headerSmEl = headerTemplateEl.content.cloneNode("true");
+
+    headerEl.classList.remove("u-hidden@sm-down");
+    headerEl.appendChild(headerSmEl);
+</script>
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
new file mode 100644
index 0000000..332a846
--- /dev/null
+++ b/templates/layouts/page.html
@@ -0,0 +1,12 @@
+<header class="c-page__header">
+    <h1 class="c-page__prefixed c-page__prefixed--h1 c-page__header__title">$title$</h1>
+    $if(date)$
+        <h2 class="c-page__header__meta">$date.yyyy_mm_dd$$if(category)$ in $category.name$$endif$</h2>
+    $elseif(category)$
+        <h2 class="c-page__header__meta">in $category.name$</h2>
+    $endif$
+</header>
+
+<section>
+$body$
+</section>
diff --git a/templates/page.html b/templates/page.html
deleted file mode 100644
index 36d66c2..0000000
--- a/templates/page.html
+++ /dev/null
@@ -1 +0,0 @@
-$body$
diff --git a/templates/partials/pageHeader.html b/templates/partials/pageHeader.html
deleted file mode 100644
index 95e55f7..0000000
--- a/templates/partials/pageHeader.html
+++ /dev/null
@@ -1,17 +0,0 @@
-$-- ' |      '     '             '     '            '   | |    |           '     '
-$--   |      '     '             '       //\_       '   | ' .  |           '     '
-$--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
-$--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
-$-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
-$--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
-$-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
-$-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-
-<pre class="c-page-header__pre c-page__prefixed c-page__prefixed--pre u-mt0 u-hidden@sm-down">
-' |      '     '             '     '            '   | |    |           '     '  
-  |      '     '             '       <strong>//\_</strong>       '   | ' .  |           '     '  
- .|      '      <strong>____,...,______..,_~``  -`..,</strong>   '   |    ' |           '     '  
-  |       <strong>_,~´"'  ,               .    ,~--´</strong>    '  _|  | . |~~.__      '     '  
-| |    <strong>,-"    _.-|~/  |..,____,) ,/,,"'</strong>         '_( | '    |)    )     '     '  
- '|    <strong>\__,~"´   /:) /       |:\ \</strong>            ,~(    ) . | |  )   `,   '   _,--.
-   \   .   :    <strong>(:/\_-,      \:.\_-,</strong>    .  \ .\      .  :   \  .   ) . ' ,/     </pre>
diff --git a/templates/partials/pageHeaderSm.html b/templates/partials/pageHeaderSm.html
deleted file mode 100644
index 92359fa..0000000
--- a/templates/partials/pageHeaderSm.html
+++ /dev/null
@@ -1,10 +0,0 @@
-$-- .|                     //\__      '  .'      |  . |           ' . ' 
-$--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
-$-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
-$--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
-
-<pre class="c-page-header__pre c-page__prefixed c-page__prefixed--pre u-mt0 $if(section.is_index)$u-hidden@sm-up$endif$">
-.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
- |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
-'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
- |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>