aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorLibravatar cel 🌸 <cel@blos.sm>2024-01-30 16:16:05 +0000
committerLibravatar cel 🌸 <cel@blos.sm>2024-01-30 16:16:05 +0000
commitf00159f53b3774601500ec65345791311ff6efa1 (patch)
treecc65a487e71a056126e1935108a494c7851863f9 /templates
parent8c03d9a53f4bc2f70fb5c1e0487bc74fe0137fcb (diff)
downloadblossom-f00159f53b3774601500ec65345791311ff6efa1.tar.gz
blossom-f00159f53b3774601500ec65345791311ff6efa1.tar.bz2
blossom-f00159f53b3774601500ec65345791311ff6efa1.zip
migrate to poem and askama
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html88
-rw-r--r--templates/base.html.tera82
-rw-r--r--templates/blog.html23
-rw-r--r--templates/blog.html.tera22
-rw-r--r--templates/blogpost-panel.html10
-rw-r--r--templates/blogpost-panel.html.tera8
-rw-r--r--templates/blogpost.html7
-rw-r--r--templates/blogpost.html.tera7
-rw-r--r--templates/contact.html (renamed from templates/contact.html.tera)14
-rw-r--r--templates/error.html (renamed from templates/error.html.tera)6
-rw-r--r--templates/filtertags.html10
-rw-r--r--templates/filtertags.html.tera7
-rw-r--r--templates/home.html (renamed from templates/home.html.tera)34
-rw-r--r--templates/latestposts.html13
-rw-r--r--templates/latestposts.html.tera10
-rw-r--r--templates/latestskweets.html (renamed from templates/latestskweets.html.tera)0
16 files changed, 177 insertions, 164 deletions
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..59e7984
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,88 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="stylesheet" href="/static/style.css">
+ <link rel="stylesheet" href="/static/fonts.css">
+ <title>celeste's hard drive</title>
+</head>
+
+<body>
+
+ <img class="branch" id="branch1" src="/static/branches/branch837-1.png" alt="">
+ <img class="branch" id="branch2" src="/static/branches/branch878.png" alt="">
+ <img class="branch" id="branch3" src="/static/branches/branch837-2.png" alt="">
+ <img class="branch" id="branch4" src="/static/branches/branch840.png" alt="">
+ <img class="branch" id="branch5" src="/static/branches/branch869.png" alt="">
+ <img class="branch" id="branch6" src="/static/branches/branch871.png" alt="">
+ <img class="branch" id="branch7" src="/static/branches/branch879.png" alt="">
+ <img class="branch" id="branch8" src="/static/branches/branch880.png" alt="">
+ <img class="branch" id="branch9" src="/static/branches/branch881-1.png" alt="">
+ <img class="branch" id="branch10" src="/static/branches/branch881-2.png" alt="">
+ <img class="branch" id="branch11" src="/static/branches/branch882-1.png" alt="">
+ <img class="branch" id="branch12" src="/static/branches/branch882-2.png" alt="">
+ <img class="branch" id="branch13" src="/static/branches/branch883-1.png" alt="">
+ <img class="branch" id="branch14" src="/static/branches/branch883-2.png" alt="">
+
+ <div id="page">
+
+ {% block header %}
+ {% endblock header %}
+
+ <nav class="panel">
+ <ul id="nav">
+ <li><a class="{% block nav_home %}{% endblock %}" href="/">home</a></li>
+ <li><a class="{% block nav_contact %}{% endblock %}" style="font-family: 'Compagnon Roman';"
+ href="/contact">kontakt</a></li>
+ <li><a class="{% block nav_poetry %}{% endblock %}" href="/poetry" style="font-family: Louise">poesia</a></li>
+ <li><a class="{% block nav_blog %}{% endblock %}" style="font-family: Sligoil" href="/blog">weblog</a></li>
+ <li><a class="{% block nav_projects %}{% endblock %}" style="font-family: 'DeGerm LoCase';"
+ href="/projects">projetos</a></li>
+ <!--<li><a class="{% block nav_sound %}{% endblock %}" style="font-family: 'kirieji'" href="/sound">音</a></li>-->
+ <li><a class="{% block nav_listens %}{% endblock %}" style="font-family: 'Almendra Display'; font-weight: 900;"
+ href="https://listenbrainz.org/user/celblossom">Γ©coute</a></li>
+ <li><a href="https://bimbo.video/a/cel" style="font-family: 'Mon Hugo In'">video</a></li>
+ <li><a href="https://weirdstar.stream" style="font-family: id_kana018">πŸ”΄γƒ©γ‚€γƒ–</a></li>
+ <!--<li><a class="{% block nav_pix %}{% endblock %}" style="font-family: Minecraftia" href="/pix">pix</a></li>-->
+ <!--<li><a class="{% block nav_shodo %}{% endblock %}" href="/shodo">書道</a></li>-->
+ <!--<li><a class="{% block nav_cute %}{% endblock %}" style="font-family: 'Darumadrop One'" href="/cute">cute linkz</a></li>-->
+ <!--<li><a class="{% block nav_zk %}{% endblock %}" href="https://garden.blos.sm" style="font-family: Louise">zettelkasten</a></li>-->
+ <!--<li><a class="{% block nav_read %}{% endblock %}" style="font-family: ukikusa" href="/read">γ‚ˆγ‚€</a></li>-->
+ <li><a href="https://bunny.garden/cel">πŸ¦‹πŸŒ·πŸ°πŸŒ»πŸπŸ•·πŸͺ»πŸ‡πŸŒ±</a></li>
+ <!--<li><a class="{% block nav_plants %}{% endblock %}" style="font-family: 'Almendra Display'; font-weight: 900;" href="/plants">plantas</a></li>-->
+ <li><a style="font-family: Abordage;" href="https://pussy.accountants">pussy</a></li>
+ <li class="suscakke"><a href="https://ass-sma.cc"><img src="/static/suscakke.png"></a></li>
+ <!--<li><a class="{% block nav_guestbook %}{% endblock %}" style="font-family: Compagnon; font-weight: bold;" href="/guestbook">visitas</a></li>-->
+ </ul>
+ </nav>
+
+ <main class="{% block reverse %}{% endblock %}">
+ <div class="main-content">
+
+ {% block content %}
+ {% endblock content %}
+
+ </div>
+
+ {% block aside %}
+ {% endblock aside %}
+
+ </main>
+
+ <footer class="panel">
+ <a class="badge" href="https://blos.sm"><img src="https://blos.sm/badges/cel.png"></a>
+ <a class="badge" href="https://skinnyver.se"><img src="/static/badges/badussyflops.png"></a>
+ <img class="badge" src="/static/badges/mothracompat.gif">
+ <img class="badge" src="/static/badges/flexbox.png">
+ {# TODO: random skin tone #}
+ <img class="badge" src="/static/badges/servinghttps_{{ self::thread_rng().gen_range(1..=7) }}.png">
+ <a class="badge" href="https://keithhacks.cyou"><img src="/static/badges/keith.gif"></a>
+ <a class="badge" href="https://webb.spiderden.org"><img src="/static/badges/webb.png"></a>
+ </footer>
+
+ </div>
+</body>
+
+</html> \ No newline at end of file
diff --git a/templates/base.html.tera b/templates/base.html.tera
deleted file mode 100644
index 9884964..0000000
--- a/templates/base.html.tera
+++ /dev/null
@@ -1,82 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- <meta charset="UTF-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="stylesheet" href="/style.css">
- <link rel="stylesheet" href="/fonts.css">
- <title>cel's garden</title>
- </head>
-
- <body>
-
- <img class="branch" id="branch1" src="/branches/branch837-1.png" alt="cherry blossom branch">
- <img class="branch" id="branch2" src="/branches/branch878.png" alt="cherry blossom branch">
- <img class="branch" id="branch3" src="/branches/branch837-2.png" alt="cherry blossom branch">
- <img class="branch" id="branch4" src="/branches/branch840.png" alt="cherry blossom branch">
- <img class="branch" id="branch5" src="/branches/branch869.png" alt="cherry blossom branch">
- <img class="branch" id="branch6" src="/branches/branch871.png" alt="cherry blossom branch">
- <img class="branch" id="branch7" src="/branches/branch879.png" alt="cherry blossom branch">
- <img class="branch" id="branch8" src="/branches/branch880.png" alt="cherry blossom branch">
- <img class="branch" id="branch9" src="/branches/branch881-1.png" alt="cherry blossom branch">
- <img class="branch" id="branch10" src="/branches/branch881-2.png" alt="cherry blossom branch">
- <img class="branch" id="branch11" src="/branches/branch882-1.png" alt="cherry blossom branch">
- <img class="branch" id="branch12" src="/branches/branch882-2.png" alt="cherry blossom branch">
- <img class="branch" id="branch13" src="/branches/branch883-1.png" alt="cherry blossom branch">
- <img class="branch" id="branch14" src="/branches/branch883-2.png" alt="cherry blossom branch">
-
- <div id="page">
-
- {% block header %}
- {% endblock header %}
-
- <nav class="panel">
- <ul id="nav">
- <li><a class="{% block nav_home %}{% endblock %}" href="/">home</a></li>
- <li><a class="{% block nav_contact %}{% endblock %}" style="font-family: 'Compagnon Roman';" href="/contact">kontakt</a></li>
- <li><a class="{% block nav_poetry %}{% endblock %}" href="/poetry" style="font-family: Louise">poesia</a></li>
- <li><a class="{% block nav_blog %}{% endblock %}" style="font-family: Sligoil" href="/blog">weblog</a></li>
- <li><a class="{% block nav_projects %}{% endblock %}" style="font-family: 'DeGerm LoCase';" href="/projects">projetos</a></li>
- <!--<li><a class="{% block nav_sound %}{% endblock %}" style="font-family: 'kirieji'" href="/sound">音</a></li>-->
- <li><a class="{% block nav_listens %}{% endblock %}" style="font-family: 'Almendra Display'; font-weight: 900;" href="https://listenbrainz.org/user/celblossom">Γ©coute</a></li>
- <li><a href="https://bimbo.video/a/cel" style="font-family: 'Mon Hugo In'">video</a></li>
- <li><a href="https://weirdstar.stream" style="font-family: id_kana018" >πŸ”΄γƒ©γ‚€γƒ–</a></li>
- <!--<li><a class="{% block nav_pix %}{% endblock %}" style="font-family: Minecraftia" href="/pix">pix</a></li>-->
- <!--<li><a class="{% block nav_shodo %}{% endblock %}" href="/shodo">書道</a></li>-->
- <!--<li><a class="{% block nav_cute %}{% endblock %}" style="font-family: 'Darumadrop One'" href="/cute">cute linkz</a></li>-->
- <!--<li><a class="{% block nav_zk %}{% endblock %}" href="https://garden.blos.sm" style="font-family: Louise">zettelkasten</a></li>-->
- <!--<li><a class="{% block nav_read %}{% endblock %}" style="font-family: ukikusa" href="/read">γ‚ˆγ‚€</a></li>-->
- <li><a href="https://bunny.garden/cel">πŸ¦‹πŸŒ·πŸ°πŸŒ»πŸπŸ•·πŸͺ»πŸ‡πŸŒ±</a></li>
- <!--<li><a class="{% block nav_plants %}{% endblock %}" style="font-family: 'Almendra Display'; font-weight: 900;" href="/plants">plantas</a></li>-->
- <li><a style="font-family: Abordage;" href="https://pussy.accountants">pussy</a></li>
- <li class="suscakke"><a href="https://ass-sma.cc"><img src="/suscakke.png"></a></li>
- <!--<li><a class="{% block nav_guestbook %}{% endblock %}" style="font-family: Compagnon; font-weight: bold;" href="/guestbook">visitas</a></li>-->
- </ul>
- </nav>
-
- <main class="{% if reverse %}reverse{% endif %}">
- <div class="main-content">
-
- {% block content %}
- {% endblock content %}
-
- </div>
-
- {% block aside %}
- {% endblock aside %}
-
- </main>
-
- <footer class="panel">
- <a class="badge" href="https://blos.sm"><img src="https://blos.sm/badges/cel.png"></a>
- <a class="badge" href="https://skinnyver.se"><img src="https://skinnyver.se/instance/skinnyversebadge.png"></a>
- <img class="badge" src="/badges/mothracompat.gif">
- <img class="badge" src="/badges/flexbox.png">
- <img class="badge" src="/badges/servinghttps_{{ get_random(start=1, end=7) }}.png">
- <a class="badge" href="https://keithhacks.cyou"><img src="/badges/keith.gif"></a>
- <a class="badge" href="https://webb.spiderden.org"><img src="/badges/webb.png"></a>
- </footer>
-
- </div>
- </body>
-</html>
diff --git a/templates/blog.html b/templates/blog.html
new file mode 100644
index 0000000..42cf95f
--- /dev/null
+++ b/templates/blog.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block reverse %}reverse{% endblock %}
+{% block nav_blog %}active{% endblock %}
+
+{% block content %}
+
+{% for blogpost in blogposts %}
+{% include "blogpost-panel.html" %}
+{% endfor %}
+
+{% endblock content %}
+
+{% block aside %}
+
+<aside>
+
+ {% include "latestposts.html" %}
+ {% include "filtertags.html" %}
+
+</aside>
+
+{% endblock aside %} \ No newline at end of file
diff --git a/templates/blog.html.tera b/templates/blog.html.tera
deleted file mode 100644
index 20ec08e..0000000
--- a/templates/blog.html.tera
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "base" %}
-
-{% block nav_blog %}active{% endblock %}
-
-{% block content %}
-
-{% for blogpost in blogposts %}
-{% include "blogpost-panel" %}
-{% endfor %}
-
-{% endblock content %}
-
-{% block aside %}
-
-<aside>
-
- {% include "latestposts" %}
- {% include "filtertags" %}
-
-</aside>
-
-{% endblock aside %}
diff --git a/templates/blogpost-panel.html b/templates/blogpost-panel.html
new file mode 100644
index 0000000..6375012
--- /dev/null
+++ b/templates/blogpost-panel.html
@@ -0,0 +1,10 @@
+<div class="panel content blogpost">
+ <h1 class="title">{{ blogpost.subject().unwrap_or("untitled") }}</h1>
+ <h2 class="created-at">{{ blogpost.published_at() }} <a href="/blog/{{ blogpost.file_name() }}">permalink</a></h2>
+ <div class="tags">{% for tag in blogpost.tags().clone() %}<a
+ class="tag {% if filter_tags.contains(tag) %}active{% endif %}" href="/blog?filter={{ tag }}">{{ tag }}</a>{%
+ endfor %}</div>
+ <div class="blogpost-content">
+ {{ blogpost.content()|safe }}
+ </div>
+</div> \ No newline at end of file
diff --git a/templates/blogpost-panel.html.tera b/templates/blogpost-panel.html.tera
deleted file mode 100644
index 64f064c..0000000
--- a/templates/blogpost-panel.html.tera
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="panel content blogpost">
- <h1 class="title">{{ blogpost.subject }}</h1>
- <h2 class="created-at">{{ blogpost.created_at }} <a href="/blog/{{ blogpost.data.name }}">permalink</a></h2>
- <div class="tags">{% for tag in blogpost.tags %}<a class="tag {% if filter_hashset %}{% if tag in filter_hashset %}active{% endif %}{% endif %}" href="/blog?filter={{ tag }}">{{ tag }}</a>{% endfor %}</div>
- <div class="blogpost-content">
- {{ blogpost.render }}
- </div>
-</div>
diff --git a/templates/blogpost.html b/templates/blogpost.html
new file mode 100644
index 0000000..935d581
--- /dev/null
+++ b/templates/blogpost.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% include "blogpost-panel.html" %}
+
+{% endblock content %} \ No newline at end of file
diff --git a/templates/blogpost.html.tera b/templates/blogpost.html.tera
deleted file mode 100644
index b73a24b..0000000
--- a/templates/blogpost.html.tera
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "base" %}
-
-{% block content %}
-
-{% include "blogpost-panel" %}
-
-{% endblock content %}
diff --git a/templates/contact.html.tera b/templates/contact.html
index 28ec6e6..4302e88 100644
--- a/templates/contact.html.tera
+++ b/templates/contact.html
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block nav_contact %}active{% endblock %}
@@ -6,7 +6,7 @@
<header>
<div class="panel" id="title">
- <h1>cel 🌸</h1>
+ <h1>celeste 🌸</h1>
</div>
</header>
@@ -16,15 +16,19 @@
<div class="content panel h-card" rel="author">
<h1 class="p-name">cel</h1>
-
+
<ul>
- <li><h3>pronouns: <span class="p-x-pronoun-nominative">she</span>/<span class="p-x-pronoun-accusative">her</span></h3></li>
+ <li>
+ <h3>pronouns: <span class="p-x-pronoun-nominative">she</span>/<span class="p-x-pronoun-accusative">her</span></h3>
+ </li>
<li>email: <a class="u-email" href="mailto:cel@blos.sm">cel@blos.sm</a></li>
<li>jabber: <a class="u-impp" href="xmpp:cel@blos.sm?message">cel@blos.sm</a></li>
<li>scrobbles: <a class="u-url" href="https://listenbrainz.org/user/celblossom">listenbrainz/celblossom</a></li>
<li>bandcamp fan: <a class="u-url" href="https://bandcamp.com/celblossom">bandcamp/celblossom</a></li>
<br>
- <li><span class="p-note">languages (in rough skill order): english, portuguese, french, japanese, german, chinese, latin, toki pona, korean</span></li></li>
+ <li><span class="p-note">languages (in rough skill order): english, portuguese, french, japanese, german, chinese,
+ latin, toki pona, korean</span></li>
+ </li>
<li><span class="p-note">programming: rust, erlang, go, haskell, webdev, lisp</span></li>
</ul>
</div>
diff --git a/templates/error.html.tera b/templates/error.html
index 5a4cc17..a3ffff4 100644
--- a/templates/error.html.tera
+++ b/templates/error.html
@@ -1,10 +1,10 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block content %}
<div class="content panel">
- <h2>Error {{ status }}: {{ req }}</h2>
+ <h2>Error {{ status }}</h2>
<h3>{{ message }}</h3>
</div>
-{% endblock %}
+{% endblock %} \ No newline at end of file
diff --git a/templates/filtertags.html b/templates/filtertags.html
new file mode 100644
index 0000000..55c802f
--- /dev/null
+++ b/templates/filtertags.html
@@ -0,0 +1,10 @@
+<div class="panel" id="filter-tags">
+ <h2>filter by tags</h2>
+ <div class="tags">
+ {% for tag in tags.clone() %}{% let contains_tag = filter_tags.contains(tag) %}<a
+ class="{% if contains_tag %}active{% endif %}"
+ href="{% if contains_tag %}/blog{% else %}/blog?filter={{ tag }}{% endif %}">{{ tag }}</a>{% endfor
+ %}
+ </div>
+ <br>
+</div> \ No newline at end of file
diff --git a/templates/filtertags.html.tera b/templates/filtertags.html.tera
deleted file mode 100644
index f79ee94..0000000
--- a/templates/filtertags.html.tera
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="panel" id="filter-tags">
-<h2>filter by tags</h2>
-<div class="tags">
- {% for tag in tags %}<a class="{% if tag in filter_hashset %}active{% endif %}" href="{% if tag in filter_hashset %}/blog{% else %}/blog?filter={{ tag }}{% endif %}">{{ tag }}</a>{% endfor %}
-</div>
-<br>
-</div>
diff --git a/templates/home.html.tera b/templates/home.html
index 5017ea3..7cd8c0f 100644
--- a/templates/home.html.tera
+++ b/templates/home.html
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block nav_home %}active{% endblock %}
@@ -6,27 +6,23 @@
<header>
<div class="panel" id="title">
- <h1>cel 🌸</h1>
+ <h1>celeste 🌸</h1>
</div>
{% if is_live %}
- <iframe
- class="panel"
- id="stream"
- src="https://weirdstar.stream/embed/video"
- title="girlstream"
- referrerpolicy="origin"
- scrolling="no"
- allowfullscreen>
+ <iframe class="panel" id="stream" src="https://weirdstar.stream/embed/video" title="girlstream"
+ referrerpolicy="origin" scrolling="no" allowfullscreen>
</iframe>
{% endif %}
{% if listenbrainz.is_scrobbling %}
- <a href="https://listenbrainz.org/user/celblossom" class="panel" id="scrobble">now playing: {{ listenbrainz.song }} - {{ listenbrainz.artist }}</a>
+ <a href="https://listenbrainz.org/user/celblossom" class="panel" id="scrobble">now playing: {{
+ listenbrainz.song.clone().unwrap_or_default() }} -
+ {{ listenbrainz.artist.clone().unwrap_or_default() }}</a>
{% endif %}
</header>
-
+
{% endblock header %}
{% block content %}
@@ -36,9 +32,9 @@
<p>this is where i do the posting</p>
<p>i wish u a wonderful day</p>
<br>
- <img src="/quinntyping.png">
+ <img src="/static/quinntyping.png">
<p>perpetually under construction</p>
- <img style="border: 0;" src="/barraconstruction.gif">
+ <img style="border: 0;" src="/static/barraconstruction.gif">
</div>
{% endblock content %}
@@ -47,12 +43,10 @@
<aside>
- <div class="panel" style="background-color: #b52f6a; z-index: -1; font-family: 'Terminal Grotesque'; font-size: 2em">latest update: the skweets begone</div>
- {% include "latestposts" %}
+ <div class="panel" style="background-color: #b52f6a; z-index: -1; font-family: 'Terminal Grotesque'; font-size: 2em">
+ latest update: the skweets begone</div>
+ {% include "latestposts.html" %}
</aside>
-{% endblock aside %}
-
-
-
+{% endblock aside %} \ No newline at end of file
diff --git a/templates/latestposts.html b/templates/latestposts.html
new file mode 100644
index 0000000..e2dfa9f
--- /dev/null
+++ b/templates/latestposts.html
@@ -0,0 +1,13 @@
+<div class="panel" id="posts">
+ <h2>latest posts <a class="small-badge" href="/feed"><img class="small-badge" src="/static/atombadge.png"
+ alt="atom newsfeed"></a></h2>
+ <table id="post-list">
+ {% for blogpost in blogposts %}
+ <tr>
+ <td><a class="post-entry" href="/blog/{{ blogpost.file_name() }}">{{ blogpost.subject().unwrap_or("untitled")
+ }}<span class="post-date">{{
+ blogpost.published_at()|mytruncate(10) }}</span></a></td>
+ </tr>
+ {% endfor %}
+ </table>
+</div> \ No newline at end of file
diff --git a/templates/latestposts.html.tera b/templates/latestposts.html.tera
deleted file mode 100644
index 11528a4..0000000
--- a/templates/latestposts.html.tera
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="panel" id="posts">
- <h2>latest posts <a class="small-badge" href="/feed"><img class="small-badge" src="/atombadge.png" alt="atom newsfeed"></a></h2>
- <table id="post-list">
- {% for blogpost in blogposts %}
- <tr>
- <td><a class="post-entry" href="/blog/{{ blogpost.data.name }}">{{ blogpost.subject }}<span class="post-date">{{ blogpost.created_at | truncate(length=10, end="") }}</span></a></td>
- </tr>
- {% endfor %}
- </table>
-</div> \ No newline at end of file
diff --git a/templates/latestskweets.html.tera b/templates/latestskweets.html
index 84798de..84798de 100644
--- a/templates/latestskweets.html.tera
+++ b/templates/latestskweets.html