From d90d07fa3938c944fe8897e7ce1d995bd660573d Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Wed, 30 Dec 2020 11:30:59 +0100
Subject: Better templates structure, better script config

---
 scripts/build_content.sh                  | 10 ++++------
 scripts/build_fonts.sh                    | 26 ++++++++++++++++----------
 scripts/build_sass.sh                     | 10 ++++++++--
 scripts/watch_content.sh                  |  8 +++++++-
 scripts/watch_filters.sh                  |  8 +++++++-
 scripts/watch_metadata.sh                 |  8 +++++++-
 scripts/watch_sass.sh                     |  8 +++++++-
 scripts/watch_templates.sh                |  8 +++++++-
 site.defaults.conf                        |  8 ++++++++
 templates/base.html                       | 13 ++++++-------
 templates/categoriesByCount.html          |  7 -------
 templates/categoriesById.html             |  7 -------
 templates/feed.xml                        |  1 +
 templates/list.html                       |  4 ++++
 templates/page.html                       |  1 +
 templates/pageHeader.html                 | 17 -----------------
 templates/pageHeaderSm.html               | 10 ----------
 templates/pagelistByYear.html             | 11 -----------
 templates/partials/categoriesByCount.html |  7 +++++++
 templates/partials/categoriesById.html    |  7 +++++++
 templates/partials/pageHeader.html        | 17 +++++++++++++++++
 templates/partials/pageHeaderSm.html      | 10 ++++++++++
 templates/partials/pagelistByYear.html    | 11 +++++++++++
 23 files changed, 135 insertions(+), 82 deletions(-)
 create mode 100644 site.defaults.conf
 delete mode 100644 templates/categoriesByCount.html
 delete mode 100644 templates/categoriesById.html
 create mode 100644 templates/list.html
 create mode 100644 templates/page.html
 delete mode 100644 templates/pageHeader.html
 delete mode 100644 templates/pageHeaderSm.html
 delete mode 100644 templates/pagelistByYear.html
 create mode 100644 templates/partials/categoriesByCount.html
 create mode 100644 templates/partials/categoriesById.html
 create mode 100644 templates/partials/pageHeader.html
 create mode 100644 templates/partials/pageHeaderSm.html
 create mode 100644 templates/partials/pagelistByYear.html

diff --git a/scripts/build_content.sh b/scripts/build_content.sh
index 78857b5..e57cfed 100755
--- a/scripts/build_content.sh
+++ b/scripts/build_content.sh
@@ -1,12 +1,10 @@
 #!/bin/bash
 
-SITE="https://volpeon.ink/"
+source "site.defaults.conf"
 
-CONTENT_DIR="content/"
-FILTERS_DIR="filters/"
-METADATA_DIR="metadata/"
-TEMPLATES_DIR="templates/"
-OUTPUT_DIR="output/"
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
 
 get_filters() {
     filters_args=""
diff --git a/scripts/build_fonts.sh b/scripts/build_fonts.sh
index bd168df..292cef2 100755
--- a/scripts/build_fonts.sh
+++ b/scripts/build_fonts.sh
@@ -1,17 +1,23 @@
 #!/bin/bash
 
-echo -e "\033[0;32m[MINIFY  ]\033[0m assets/fonts/iosevka-term-ss09-regular.ttf -> output/iosevka-term-ss09-regular.woff2"
+source "site.defaults.conf"
 
-pyftsubset assets/fonts/iosevka-term-ss09-regular.ttf \
-    --text-file='assets/fonts/glyphs.txt' \
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+echo -e "\033[0;32m[MINIFY  ]\033[0m ${ASSETS_DIR}fonts/iosevka-term-ss09-regular.ttf -> ${OUTPUT_DIR}iosevka-term-ss09-regular.woff2"
+
+pyftsubset ${ASSETS_DIR}fonts/iosevka-term-ss09-regular.ttf \
+    --text-file="${ASSETS_DIR}fonts/glyphs.txt" \
     --layout-features+=ss09,dlig \
-    --flavor='woff2' \
-    --output-file='output/iosevka-term-ss09-regular.woff2'
+    --flavor="woff2" \
+    --output-file="${OUTPUT_DIR}iosevka-term-ss09-regular.woff2"
 
-echo -e "\033[0;32m[MINIFY  ]\033[0m assets/fonts/iosevka-term-ss09-bold.ttf -> output/iosevka-term-ss09-bold.woff2"
+echo -e "\033[0;32m[MINIFY  ]\033[0m ${ASSETS_DIR}fonts/iosevka-term-ss09-bold.ttf -> ${OUTPUT_DIR}iosevka-term-ss09-bold.woff2"
 
-pyftsubset assets/fonts/iosevka-term-ss09-bold.ttf \
-    --text-file='assets/fonts/glyphs.txt' \
+pyftsubset ${ASSETS_DIR}fonts/iosevka-term-ss09-bold.ttf \
+    --text-file="${ASSETS_DIR}fonts/glyphs.txt" \
     --layout-features+=ss09,dlig \
-    --flavor='woff2' \
-    --output-file='output/iosevka-term-ss09-bold.woff2'
+    --flavor="woff2" \
+    --output-file="${OUTPUT_DIR}iosevka-term-ss09-bold.woff2"
diff --git a/scripts/build_sass.sh b/scripts/build_sass.sh
index df1c0a9..5bb24d4 100755
--- a/scripts/build_sass.sh
+++ b/scripts/build_sass.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
 
-echo -e "\033[0;32m[COMPILE ]\033[0m assets/css/style.scss -> output/style.css"
-sassc assets/css/style.scss | node_modules/.bin/csso > output/style.css
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+echo -e "\033[0;32m[COMPILE ]\033[0m ${ASSETS_DIR}css/style.scss -> ${OUTPUT_DIR}style.css"
+sassc ${ASSETS_DIR}css/style.scss | node_modules/.bin/csso > "${OUTPUT_DIR}style.css"
diff --git a/scripts/watch_content.sh b/scripts/watch_content.sh
index f0d1b42..92719d3 100755
--- a/scripts/watch_content.sh
+++ b/scripts/watch_content.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-inotifywait -qrme close_write,delete,move --format "%w%f" content \
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+inotifywait -qrme close_write,delete,move --format "%w%f" "${CONTENT_DIR%/}" \
     | while read file
         do
             if [ -f "$file" ]; then
diff --git a/scripts/watch_filters.sh b/scripts/watch_filters.sh
index 9bb3b44..21fb686 100755
--- a/scripts/watch_filters.sh
+++ b/scripts/watch_filters.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-inotifywait -qrme close_write,delete,move --format "%w%f" filters \
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+inotifywait -qrme close_write,delete,move --format "%w%f" "${FILTERS_DIR%/}" \
     | while read file
         do
             scripts/build_content.sh "all_md"
diff --git a/scripts/watch_metadata.sh b/scripts/watch_metadata.sh
index 780177e..cc02ea7 100755
--- a/scripts/watch_metadata.sh
+++ b/scripts/watch_metadata.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-inotifywait -qrme close_write,delete,move --format "%w%f" metadata \
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+inotifywait -qrme close_write,delete,move --format "%w%f" "${METADATA_DIR%/}" \
     | while read file
         do
             scripts/build_content.sh "all_md"
diff --git a/scripts/watch_sass.sh b/scripts/watch_sass.sh
index d451135..11c210a 100755
--- a/scripts/watch_sass.sh
+++ b/scripts/watch_sass.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-inotifywait -qrme close_write,delete,move --format "%w%f" assets \
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+inotifywait -qrme close_write,delete,move --format "%w%f" "${ASSETS_DIR}css" \
     | while read file
         do
             scripts/build_sass.sh
diff --git a/scripts/watch_templates.sh b/scripts/watch_templates.sh
index 9b464d4..b6149e7 100755
--- a/scripts/watch_templates.sh
+++ b/scripts/watch_templates.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-inotifywait -qrme close_write,delete,move --format "%w%f" templates \
+source "site.defaults.conf"
+
+if [ -f "site.conf" ]; then
+    source "site.conf"
+fi
+
+inotifywait -qrme close_write,delete,move --format "%w%f" "${TEMPLATES_DIR%/}" \
     | while read file
         do
             scripts/build_content.sh "all_md"
diff --git a/site.defaults.conf b/site.defaults.conf
new file mode 100644
index 0000000..1c44c50
--- /dev/null
+++ b/site.defaults.conf
@@ -0,0 +1,8 @@
+SITE="https://volpeon.ink/"
+
+CONTENT_DIR="content/"
+ASSETS_DIR="assets/"
+FILTERS_DIR="filters/"
+METADATA_DIR="metadata/"
+TEMPLATES_DIR="templates/"
+OUTPUT_DIR="output/"
diff --git a/templates/base.html b/templates/base.html
index 48d7c72..76dd0ba 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,22 +45,21 @@
         <div class="c-page__content">
             $if(is_home)$
                 <header class="c-page-header u-hidden@sm-down" role="presentation">
-${pageHeader()}
+${partials/pageHeader()}
                 </header>
             $endif$
 
-$body$
-
-            $if(section.is_blog)$
-                ${categoriesById()}
-                ${pagelistByYear()}
+            $if(pages)$
+${list()}
+            $else$
+${page()}
             $endif$
         </div>
     </main>
 
     $if(is_home)$
         <template id="header-sm">
-${pageHeaderSm()}
+${partials/pageHeaderSm()}
         </template>
 
         <script>
diff --git a/templates/categoriesByCount.html b/templates/categoriesByCount.html
deleted file mode 100644
index 871e3db..0000000
--- a/templates/categoriesByCount.html
+++ /dev/null
@@ -1,7 +0,0 @@
-$if(categories.by_count)$
-    <ul class="c-hlist">
-        $for(categories.by_count)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
-        $endfor$
-    </ul>
-$endif$
diff --git a/templates/categoriesById.html b/templates/categoriesById.html
deleted file mode 100644
index 1f4f433..0000000
--- a/templates/categoriesById.html
+++ /dev/null
@@ -1,7 +0,0 @@
-$if(categories.by_id)$
-    <ul class="c-hlist">
-        $for(categories.by_id)$
-            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
-        $endfor$
-    </ul>
-$endif$
diff --git a/templates/feed.xml b/templates/feed.xml
index f1439eb..d760b04 100644
--- a/templates/feed.xml
+++ b/templates/feed.xml
@@ -42,6 +42,7 @@
                     <link href="$it.url.full$"/>
                     <published>$it.date.rfc3339$</published>
                     <updated>$it.date.rfc3339$</updated>
+                    $-- <content>$it.plain$</content>
                 </entry>
             $endif$
         $endfor$
diff --git a/templates/list.html b/templates/list.html
new file mode 100644
index 0000000..3522754
--- /dev/null
+++ b/templates/list.html
@@ -0,0 +1,4 @@
+$body$
+
+${partials/categoriesById()}
+${partials/pagelistByYear()}
diff --git a/templates/page.html b/templates/page.html
new file mode 100644
index 0000000..36d66c2
--- /dev/null
+++ b/templates/page.html
@@ -0,0 +1 @@
+$body$
diff --git a/templates/pageHeader.html b/templates/pageHeader.html
deleted file mode 100644
index b44f394..0000000
--- a/templates/pageHeader.html
+++ /dev/null
@@ -1,17 +0,0 @@
-$-- ' |      '     '             '     '            '   | |    |           '     '
-$--   |      '     '             '       //\_       '   | ' .  |           '     '
-$--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
-$--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
-$-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
-$--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
-$-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
-$-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-
-<pre class="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/pageHeaderSm.html b/templates/pageHeaderSm.html
deleted file mode 100644
index 4db186c..0000000
--- a/templates/pageHeaderSm.html
+++ /dev/null
@@ -1,10 +0,0 @@
-$-- .|                     //\__      '  .'      |  . |           ' . ' 
-$--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
-$-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
-$--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
-
-<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(is_home)$u-hidden@sm-up$endif$">
-.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
- |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
-'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
- |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>
diff --git a/templates/pagelistByYear.html b/templates/pagelistByYear.html
deleted file mode 100644
index ff55f0f..0000000
--- a/templates/pagelistByYear.html
+++ /dev/null
@@ -1,11 +0,0 @@
-$for(pages)$
-    $for(it.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>
-                </li>
-            $endfor$
-        </ul>
-    $endfor$
-$endfor$
diff --git a/templates/partials/categoriesByCount.html b/templates/partials/categoriesByCount.html
new file mode 100644
index 0000000..871e3db
--- /dev/null
+++ b/templates/partials/categoriesByCount.html
@@ -0,0 +1,7 @@
+$if(categories.by_count)$
+    <ul class="c-hlist">
+        $for(categories.by_count)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
+        $endfor$
+    </ul>
+$endif$
diff --git a/templates/partials/categoriesById.html b/templates/partials/categoriesById.html
new file mode 100644
index 0000000..1f4f433
--- /dev/null
+++ b/templates/partials/categoriesById.html
@@ -0,0 +1,7 @@
+$if(categories.by_id)$
+    <ul class="c-hlist">
+        $for(categories.by_id)$
+            <li class="c-hlist__item"><strong>$it.key/uppercase$</strong>: $it.value.name$ ($it.value.count$)</li>
+        $endfor$
+    </ul>
+$endif$
diff --git a/templates/partials/pageHeader.html b/templates/partials/pageHeader.html
new file mode 100644
index 0000000..b44f394
--- /dev/null
+++ b/templates/partials/pageHeader.html
@@ -0,0 +1,17 @@
+$-- ' |      '     '             '     '            '   | |    |           '     '
+$--   |      '     '             '       //\_       '   | ' .  |           '     '
+$--  .|      '      ____,...,______..,_~``  -`..,   '   |    ' |           '     '
+$--   |       _,~´"'  ,               .    ,~--´    '  _|  | . |~~.__      '     '
+$-- | |    ,-"    _.-|~/  |..,____,) ,/,,"'         '_( | '    |)    )     '     '
+$--  '|    \__,~"´   /:) /       |:\ \            ,~(    ) . | |  )   `,   '   _,--.
+$-- ___\___.___:____(:/\_-,______\:.\_-,____.__\_.\______.__:___\__.___)_.___,/_____
+$-- ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+
+<pre class="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
new file mode 100644
index 0000000..4db186c
--- /dev/null
+++ b/templates/partials/pageHeaderSm.html
@@ -0,0 +1,10 @@
+$-- .|                     //\__      '  .'      |  . |           ' . ' 
+$--  |      _.~-"""-----~``  ,-´      '   '      |'   |           '   ' 
+$-- '|   .´  ,~'\ ).,__,)/,,"         ' . '      |  | |           '  .' 
+$--  |_  `~´   (/\\,   (/\\,         _'   '_    _| '  |_         _'   '_
+
+<pre class="c-page__prefixed c-page__prefixed--pre u-mt0 $if(is_home)$u-hidden@sm-up$endif$">
+.|   <strong>                  //\__</strong>      '  .'      |  . |           ' . ' 
+ |   <strong>   _.~-"""-----~``  ,-´</strong>      '   '      |'   |           '   ' 
+'|   <strong>.´  ,~'\ ).,__,)/,,"   </strong>      ' . '      |  | |           '  .' 
+ |_  <strong>`~´   (/\\,   (/\\,    </strong>     _'   '_    _| '  |_         _'   '_</pre>
diff --git a/templates/partials/pagelistByYear.html b/templates/partials/pagelistByYear.html
new file mode 100644
index 0000000..ff55f0f
--- /dev/null
+++ b/templates/partials/pagelistByYear.html
@@ -0,0 +1,11 @@
+$for(pages)$
+    $for(it.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>
+                </li>
+            $endfor$
+        </ul>
+    $endfor$
+$endfor$
-- 
cgit v1.2.3-54-g00ecf