From 153b178c40ef71ce8afdd712fd1fe7d9913a62b5 Mon Sep 17 00:00:00 2001 From: Nathan Upchurch Date: Thu, 23 Jan 2025 14:24:51 -0600 Subject: [PATCH] UI updates --- _includes/layouts/home.njk | 4 +-- _includes/layouts/post.njk | 7 ++--- _includes/postslist.njk | 59 +++++++++++++++++++++++++------------ content/about/index.md | 2 +- content/blog.njk | 4 +-- content/feeds.njk | 3 +- content/galleries/index.njk | 11 +++++-- content/index.njk | 15 +++++++--- content/now.njk | 4 +-- content/tags-list.njk | 4 +-- 10 files changed, 73 insertions(+), 40 deletions(-) diff --git a/_includes/layouts/home.njk b/_includes/layouts/home.njk index 9a7868e..b068bdc 100644 --- a/_includes/layouts/home.njk +++ b/_includes/layouts/home.njk @@ -2,7 +2,7 @@ layout: layouts/base.njk showPostListHeader: yep --- -

Hi there, friend.

-

My name is Nathan Upchurch. Welcome to my personal website and blog, where I write about all sorts of things that I find interesting. On this website, you can learn more about me, see what I’ve been up to lately, read my blog, look at some pictures, or explore the sitemap to see what else you can do here.

+

I'm Nathan; welcome friend.

+

My name is Nathan Upchurch, and this is my personal website and blog, where I write about all sorts of things that I find interesting. On this website, you can learn more about me, see what I’ve been up to lately, read my blog, look at some pictures, or explore the sitemap to see what else you can do here.

{{ content | safe }} diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk index 715a753..0b1023f 100644 --- a/_includes/layouts/post.njk +++ b/_includes/layouts/post.njk @@ -4,7 +4,7 @@ layout: layouts/base.njk {# Only include the syntax highlighter CSS on blog posts #} {%- css %}{% include "public/css/code.css" %}{% endcss %}
-

{{ title }}

+

{{ title | safe }}

{% if not hideMetadata %}
{% if author %} @@ -13,7 +13,7 @@ layout: layouts/base.njk {% endif %}

{% if author.url %}{% endif %} - {% if author.name %}{{ author.name }}{% endif %}{% if author.url %}, {% endif %}

+ {% if author.name %}By {{ author.name }}{% endif %}{% if author.url %} • {% endif %}

{% else %} {% if metadata.author.profilePic %} @@ -21,7 +21,7 @@ layout: layouts/base.njk {% endif %}

{% if metadata.author.url %}{% endif %} - {% if metadata.author.name %}{{ metadata.author.name }}{% endif %}{% if metadata.author.url %}, {% endif %}

+ {% if metadata.author.name %}By {{ metadata.author.name }}{% endif %}{% if metadata.author.url %} • {% endif %}

{% endif %} @@ -44,4 +44,3 @@ layout: layouts/base.njk {{ content | safe }}
{% include "mastodonComments.njk" %} -{% include "nextLast.njk" %} diff --git a/_includes/postslist.njk b/_includes/postslist.njk index 7fc3523..e85daa6 100644 --- a/_includes/postslist.njk +++ b/_includes/postslist.njk @@ -1,23 +1,44 @@
-{% if showPostListHeader %}

{{ metadata.postlistHeaderText }}

{% endif %} -
- {% for post in postslist | reverse %} - - {% endfor %} -
+ +
+ +

+ {% if post.data.title %}{{ post.data.title | safe }}{% else %}{{ post.url }}{% endif %} +

+ + +
+
+

+ {% if post.data.author %} + {% if post.data.author.url %}{% endif %}{% if post.data.author.name %}By {{ post.data.author.name }}{% endif %}{% if post.data.author.url %} • {% endif %}{% else %}By {{ metadata.author.name }} • {% endif %} +

+
    + {%- for tag in post.data.tags | filterTagList %} + {%- set tagUrl %}/tags/{{ tag | slugify }}/{% endset %} +
  • + + {{ tag }}  + +
    • + {%- endfor %} +
+
+
+
+ +
+ {% endfor %} +
diff --git a/content/about/index.md b/content/about/index.md index 021eff3..645c746 100644 --- a/content/about/index.md +++ b/content/about/index.md @@ -5,7 +5,7 @@ eleventyNavigation: order: 2 ---
-

About me and my website.

+

About me and my website.

I’m a prolific vegan home cook, classical trombonist, incense maker, a FLOSS enthusiast, daily GNU/Linux user and unabashed KDE stan, designer, programmer, music producer, print lover, and human with too many interests and too little time. This is my little corner of the internet where I talk about whatever I like without worrying about maintaining a ‘personal brand’, or constraining subject matter to topics which might help advance my career or establish me as a ‘thought leader’. I’m here to express myself and have fun writing about topics I enjoy. If you’d like to learn more about my professional accomplishments and work, I’ll link my professional website here when I get around to it.

diff --git a/content/blog.njk b/content/blog.njk index a79f6eb..79dbb85 100644 --- a/content/blog.njk +++ b/content/blog.njk @@ -6,10 +6,10 @@ eleventyNavigation: key: Blog order: 3 --- -

Nathan’s blog.

+

My personal blog.

-Thank you for visiting my blog; I write about lots of things here, from personal stories, to tech, food, and incense. Explore all posts below or choose a topic. Want to know what I've been reading? Exlore the blogroll.
+I write about whatever I like here, from personal stories, to tech, food, and incense.
diff --git a/content/feeds.njk b/content/feeds.njk index dd7e696..379815a 100644 --- a/content/feeds.njk +++ b/content/feeds.njk @@ -33,7 +33,7 @@ permalink: "/feeds/{{ tag | slugify }}.xml" {% if post.data.imageURL %}{% set imageURL %}{{ post.data.imageURL | htmlBaseUrl(metadata.url) }}{% endset %}{% endif %} {% set defaultImageURL %}{{ metadata.defaultPostImageURL | htmlBaseUrl(metadata.url) }}{% endset %} - {{ post.data.title }} + {{ post.data.title | safe }} {{ post.data.description | truncate(150) }} {{ post.date | dateToRfc3339 }} @@ -44,6 +44,7 @@ permalink: "/feeds/{{ tag | slugify }}.xml" {{ post.templateContent | transformWithHtmlBase(absolutePostUrl, post.url) }} +

{%- endfor %} diff --git a/content/galleries/index.njk b/content/galleries/index.njk index 28984cc..9063913 100644 --- a/content/galleries/index.njk +++ b/content/galleries/index.njk @@ -4,9 +4,9 @@ eleventyNavigation: key: Pics order: 4 --- -

Image Galleries

+

My image galleries.

-Some pictures I thought would be worth posting. +Photography trips, memes, and other pictures I thought would be worth sharing.

@@ -23,10 +23,15 @@ Some pictures I thought would be worth posting. {{ gallery.title }} -

{{ gallery.synopsis | truncate(105) | safe }}

+
+
+

Posted on the 

+
+
+
{% endfor %} diff --git a/content/index.njk b/content/index.njk index c2758c6..0b0b7fc 100644 --- a/content/index.njk +++ b/content/index.njk @@ -3,7 +3,7 @@ layout: layouts/home.njk eleventyNavigation: key: Home order: 1 -numberOfLatestPostsToShow: 5 +numberOfLatestPostsToShow: 3 numberOfNowPostsToShow: 1 ---
@@ -14,11 +14,15 @@ numberOfNowPostsToShow: 1 {% set postslistCounter = postsCount %} {% set showPostListHeader = false %} {% include "postslist.njk" %} + +{% set morePosts = postsCount - numberOfNowPostsToShow %} +{% if morePosts > 0 %} +{% endif %}
{% set postsCount = collections.posts | length %} @@ -32,7 +36,10 @@ numberOfNowPostsToShow: 1 {% if morePosts > 0 %} - +  {% endif %} + + + diff --git a/content/now.njk b/content/now.njk index 8c79181..c5b3ff3 100644 --- a/content/now.njk +++ b/content/now.njk @@ -4,12 +4,12 @@ title: Nathan Upchurch | Now structuredData: none ---
-

Now: What’s Been Going on Lately?

+

Now: Life updates.

{% set now = collections.now | last %}

{{ now.data.title }}

{{ now.content | safe }}
-

Updated: {{ now.date | readableDate }} | What is a now page?

+

Updated on the {{ now.date | niceDate }} by {{ metadata.author.name }} | What is a now page?

{% set postsCount = collections.now | removeMostRecent | length %} {% if postsCount > 1 %} diff --git a/content/tags-list.njk b/content/tags-list.njk index d03b6de..b8f3af8 100644 --- a/content/tags-list.njk +++ b/content/tags-list.njk @@ -4,10 +4,10 @@ layout: layouts/base.njk title: Nathan Upchurch | Tags structuredData: none --- -

Here are some things I like to talk about.

+

Some things I like to talk about:

-Click on a tag to see all posts on the topic. +Click on a tag to see all posts on the topic; you can also subscribe to an RSS feed of any individual topic on the topic page.