joeac/joeac.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: joeac/joeac.net:ce1ebb3ad3f705a1a8e3764e6c18f1af12eed795
Branches Tags
joeac/joeac.net:main
...
compare: joeac/joeac.net:e10f74c5b696c836eb39f569932190896dec926a
Branches Tags
joeac/joeac.net:main

4 Commits
ce1ebb3ad3 ... e10f74c5b6

Author SHA1 Message Date
joeac e10f74c5b6 http: adds blog index page 2026-06-12 10:16:09 +01:00
joeac e2b8cdbce3 http: default layout passes SITE_URL to pages 2026-06-12 10:15:56 +01:00
joeac 6cd664dba6 remove unnecessary backslash from grep expression in http/bin/blog 2026-06-12 10:12:25 +01:00
joeac 0d8f27357a rename SRC -> PAGE in blog.layout.upphtml to avoid overwriting SRC 2026-06-12 09:32:59 +01:00
4 changed files with 85 additions and 7 deletions
Expand all files Collapse all files
http/bin/blog
+2 -2
View File
@@ -96,9 +96,9 @@ do
title="$name" title="$name"
cat "$entry" | eval "POST_TITLE=\"${title}\" ${postprocess_cmd}" > "$dest" cat "$entry" | eval "POST_TITLE=\"${title}\" ${postprocess_cmd}" > "$dest"
else else
title="$(grep --regexp "^\# " --max-count 1 "$entry" | cut -c3-)" title="$(grep --regexp "^# " --max-count 1 "$entry" | cut -c3-)"
export POST_TITLE="$title" export POST_TITLE="$title"
cat "$entry" | grep --regexp "^\# " --invert-match | eval "$postprocess_cmd" > "$dest" cat "$entry" | grep --regexp "^# " --invert-match | eval "$postprocess_cmd" > "$dest"
fi fi
cat "$entry" | eval "$extract_args_cmd" > "${dest}.args" cat "$entry" | eval "$extract_args_cmd" > "${dest}.args"
echo "Processed ${entry#$(dirname ${BLOGS})/} to ${dest#$(dirname ${SRC})/}" echo "Processed ${entry#$(dirname ${BLOGS})/} to ${dest#$(dirname ${SRC})/}"
http/share/layouts/blog.layout.upphtml
+4 -4
View File
@@ -1,8 +1,8 @@
#! #!
SRC="$1" PAGE="$1"
SITE_URL="$2" SITE_URL="$2"
DATE_PUBLISHED="${DATE_PUBLISHED:-$(basename "${SRC}" | cut -c1-10)}" DATE_PUBLISHED="${DATE_PUBLISHED:-$(basename "${PAGE}" | cut -c1-10)}"
CANONICAL_URL="${SITE_URL}/blog/$(basename "${SRC}")" CANONICAL_URL="${SITE_URL}/blog/$(basename "${PAGE}")"
#! #!
<!doctype html> <!doctype html>
@@ -57,7 +57,7 @@ fi
<section class='e-content'> <section class='e-content'>
#! #!
pp "${SRC}" pp "${PAGE}"
#! #!
</section> </section>
http/share/layouts/default.layout.upphtml
+1 -1
View File
@@ -10,7 +10,7 @@ pp "${SHARE}"/components/head.upphtml
<body> <body>
#! #!
pp "${SHARE}"/components/navbar.upphtml pp "${SHARE}"/components/navbar.upphtml
pp "$1" pp "$1" "$2"
#! #!
</body> </body>
</html> </html>
http/src/blog.upphtml
+78
View File
@@ -0,0 +1,78 @@
#!
PAGE="$1"
SITE_URL="$2"
export TITLE="Joe Carstairs"
export DESCRIPTION="Joe Carstairs' personal website"
POSTS="$(ls "${SRC}/blog/" | grep "^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\.blog.upphtml$")"
set --
for post in $POSTS
do
this_year="$( echo "$post" | cut -c1-4 )"
has_this_year=0
for year in $@
do
if [ "$this_year" = "$year" ]
then
has_this_year=1
break
fi
done
if [ $has_this_year -eq 0 ]
then
set -- $@ "$this_year"
fi
done
YEARS="$@"
pp "${SHARE}"/components/meta.upphtml
#!
<main>
<section class='h-feed'>
<h1>My blog</h1>
<aside>
<p>This blog is written by <a class='p-author h-card' href='/'>Joe Carstairs</a>.</p>
<p hidden><a class='u-url' href='${SITE_URL}/blog'>Permalink</a></p>
</aside>
<section>
<p><a href='/blog/subscribe'>How to subscribe to this blog</a></p>
</section>
#!
for year in $YEARS; do
#!
<h2>${year}</h2>
<ul>
#!
for post in $POSTS; do if [ "$(echo "${post}" | cut -c1-4)" = "$year" ]; then
title="$(grep "^export TITLE=" "${SRC}/blog/${post}" | cut -c15-)"
title="${title::${#title}-16}"
date_published="$(echo "${post}" | cut -c1-10)"
href="${SITE_URL}/blog/$(echo "$post" | cut -c1-10).html"
#!
<li class='h-entry'>
<h3><a class='u-url p-name' href='${href}'>${title}</a></h3>
#!
DATE="${date_published}" CLASS="dt-published" pp "${SHARE}/components/formatted_date.upphtml"
#!
</li>
#!
fi; done
#!
</ul>
#!
done
#!
</section>