Re-organize website

bcomnes · Dec 2, 2023 · 3dd952b · 3dd952b
1 parent 05f51f2
commit 3dd952b
Show file tree

Hide file tree

Showing 104 changed files with 889 additions and 739 deletions.
diff --git a/.github/workflows/neocities.yml b/.github/workflows/neocities.yml
@@ -6,7 +6,7 @@ on:
       - master
 
 env:
-  node-version: lts/*
+  node-version: 21
   FORCE_COLOR: 2
 
 concurrency: # prevent concurrent deploys doing starnge things

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/*]
+        node-version: [21]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/package.json b/package.json
@@ -50,8 +50,8 @@
     "tape": "^5.0.0",
     "top-bar.css": "^3.0.0",
     "top-bun": "^7.0.0",
-    "uhtml-isomorphic": "^2.1.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.2.2",
+    "uhtml-isomorphic": "^2.1.0"
   },
   "engines": {
     "node": ">=16.0.0",

diff --git a/src/README.md b/src/README.md
diff --git a/src/about.md b/src/about.md
diff --git a/src/about/README.md b/src/about/README.md
@@ -0,0 +1,7 @@
+# About
+
+This is [Bret Comnes](https://bret.io)' personal website built with the follwowing tools:
+
+```json
+{{{ vars.pkg }}}
+```
diff --git a/src/about/page.vars.js b/src/about/page.vars.js
@@ -0,0 +1,11 @@
+import { readFile } from 'node:fs/promises'
+import { join } from 'node:path'
+const __dirname = import.meta.dirname
+
+export default async () => {
+  const pkg = await readFile(join(__dirname, '../../package.json'))
+
+  return {
+    pkg
+  }
+}
diff --git a/src/blog/2023/page.js b/src/blog/2023/page.js
@@ -1,6 +1,6 @@
 /**
  * @template T
- * @typedef {import('@siteup/cli').PageFunction<T>} PageFunction
+ * @typedef {import('top-bun').PageFunction<T>} PageFunction
  */
 
 export const vars = {

diff --git a/src/blog/2023/reorganized/README.md b/src/blog/2023/reorganized/README.md
@@ -0,0 +1,24 @@
+---
+layout: article
+title: "Reorganized"
+publishDate: "2023-12-02T20:49:41.713Z"
+---
+
+Behold, a mildly redesigned and reorganized landing page:
+
+![screenshot of the new website](./img/screenshot.png)
+
+It's still not great, but it should make it easier to keep it up to date going forward.
+
+It has 3 sections:
+
+- [Featured Projects](/#): important projects of note.
+- [Recent Posts](/#recent-posts  ): now that this site has proper blog support, I can highlight recent posts on the landing page.
+- [Open Source](/#open-source): interesting and notable projects that have found some use and that I still maintain. This section now includes a bunch of open source work from the past year that I've never had time to write about.
+- [Past projects](/#past-projects): inactive projects that are not longer active, but still interesting enough to share.
+
+I removed a bunch of older inactive projects and links and stashed them in a [project](/projects/previous-projects/).
+
+Additionally, the edit button in the page footer now takes you to the correct page in GitHub for editing, so if you ever see a typo, feel free to send in a fix!
+
+Finally, the [about](/about/) page includes a live dump of the dependencies that were used to build the website.
diff --git a/src/blog/2023/reorganized/img/screenshot.png b/src/blog/2023/reorganized/img/screenshot.png
diff --git a/src/blog/page.js b/src/blog/page.js
@@ -3,7 +3,7 @@ import { dirname, basename } from 'node:path'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').PageFunction<T>} PageFunction
+ * @typedef {import('top-bun').PageFunction<T>} PageFunction
  */
 
 export const vars = {

diff --git a/src/booklist.md b/src/booklist.md
diff --git a/src/components/blog-index-list/index.css b/src/components/blog-index-list/index.css
@@ -0,0 +1,15 @@
+.blog-index-list {
+  padding-left: 0px;
+
+  & .blog-entry {
+    width: 100%;
+    display: inline-flex;
+    justify-content: space-between;
+  }
+  & .blog-entry-link {}
+  & .blog-entry-date {
+    color: var(--accent-foreground);
+    font-family: var(--font-code);
+    flex-shrink: 0;
+  }
+}
diff --git a/src/language-bullets.css → src/components/language-bullets.css b/src/language-bullets.css → src/components/language-bullets.css
@@ -40,6 +40,10 @@ li.objc::before {
   color: #6866fb;
 }
 
+li.cpp::before {
+  color: #f34b7d;
+}
+
 li.docker::before {
   color: #384d54;
 }

diff --git a/src/feeds.template.js b/src/feeds.template.js
@@ -3,7 +3,7 @@ import jsonfeedToAtom from 'jsonfeed-to-atom'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').TemplateAsyncIterator<T>} TemplateAsyncIterator
+ * @typedef {import('top-bun').TemplateAsyncIterator<T>} TemplateAsyncIterator
  */
 
 /** @type {TemplateAsyncIterator<{

diff --git a/src/globals/global.css b/src/globals/global.css
@@ -60,15 +60,15 @@ footer > .top-bar-link:first-child {
   margin-left: unset;
 }
 
-@media screen and (max-width: 72em) {
+@media screen and (max-width: 106em) {
   footer.top-bar {
     position: inherit;
     top: inherit;
     bottom: inherit;
   }
 }
 
-@media screen and (max-width: 78em) {
+@media screen and (max-width: 106em) {
   nav.top-bar {
     backdrop-filter: contrast(100%) blur(10px);
     z-index: 1; /* float over interactive content below */

diff --git a/src/globals/global.vars.js b/src/globals/global.vars.js
@@ -6,6 +6,7 @@ export default async function globalVars () {
     authorName: 'Bret Comnes',
     authorUrl: 'https://bret.io',
     authorImgUrl: '/favicons/apple-touch-icon-1024x1024.png',
-    authorImgAlt: 'Picture of author'
+    authorImgAlt: 'Picture of author',
+    githubRootUrl: 'https://github.com/bcomnes/bret.io/blob/master/src/'
   }
 }
diff --git a/src/static/atom.svg → src/globals/static/atom.svg b/src/static/atom.svg → src/globals/static/atom.svg
diff --git a/src/static/bsky.png → src/globals/static/bsky.png b/src/static/bsky.png → src/globals/static/bsky.png
diff --git a/src/static/github.svg → src/globals/static/github.svg b/src/static/github.svg → src/globals/static/github.svg
diff --git a/src/static/jsonfeed.svg → src/globals/static/jsonfeed.svg b/src/static/jsonfeed.svg → src/globals/static/jsonfeed.svg
diff --git a/src/static/light-dark.svg → src/globals/static/light-dark.svg b/src/static/light-dark.svg → src/globals/static/light-dark.svg
diff --git a/src/static/mastodon.svg → src/globals/static/mastodon.svg b/src/static/mastodon.svg → src/globals/static/mastodon.svg
diff --git a/src/static/neocitieshead.svg → src/globals/static/neocitieshead.svg b/src/static/neocitieshead.svg → src/globals/static/neocitieshead.svg
diff --git a/src/static/npm.svg → src/globals/static/npm.svg b/src/static/npm.svg → src/globals/static/npm.svg
diff --git a/src/static/twtr.svg → src/globals/static/twtr.svg b/src/static/twtr.svg → src/globals/static/twtr.svg
diff --git a/src/jobs/landrover.md b/src/jobs/landrover.md
diff --git a/src/jobs/page.js b/src/jobs/page.js
@@ -1,6 +1,6 @@
 /**
  * @template T
- * @typedef {import('@siteup/cli').PageFunction<T>} PageFunction
+ * @typedef {import('top-bun').PageFunction<T>} PageFunction
  */
 
 export const vars = {

diff --git a/src/jobs/psu.md b/src/jobs/psu.md
diff --git a/src/jobs/zhealth.md b/src/jobs/zhealth.md
diff --git a/src/layouts/article.layout.js b/src/layouts/article.layout.js
@@ -14,15 +14,15 @@ export default function articleLayout (args) {
       <header class="article-header">
         <h1 class="p-name article-title" itemprop="headline">${vars.title}</h1>
         <div class="metadata">
-          <address class="author-info" itemprop="author" itemscope itemtype="http://schema.org/Person">
+          <address class="author-info p-author h-card" itemprop="author" itemscope itemtype="http://schema.org/Person">
             ${vars.authorImgUrl
               ? html`<img height="40" width="40"  src="${vars.authorImgUrl}" alt="${vars.authorImgAlt}" class="u-photo" itemprop="image">`
               : null
             }
             ${vars.authorName && vars.authorUrl
               ? html`
-                  <a href="${vars.authorUrl}" class="p-author h-card" itemprop="url">
-                    <span itemprop="name">${vars.authorName}</span>
+                  <a href="${vars.authorUrl}" class="u-url" itemprop="url">
+                    <span itemprop="p-name name">${vars.authorName}</span>
                   </a>`
               : null
             }

diff --git a/src/layouts/blog-auto-index.layout.js b/src/layouts/blog-auto-index.layout.js
@@ -3,7 +3,7 @@ import { dirname } from 'node:path'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').LayoutFunction<T>} LayoutFunction
+ * @typedef {import('top-bun').LayoutFunction<T>} LayoutFunction
  */
 
 /**

diff --git a/src/layouts/blog-index.layout.css b/src/layouts/blog-index.layout.css
@@ -1,19 +1,2 @@
 @import '../components/breadcrumb/index.css';
-
-
-.blog-index-list {
-  padding-left: 0px;
-
-  & .blog-entry {
-    width: 100%;
-    display: inline-flex;
-    justify-content: space-between;
-  }
-  & .blog-entry-link {}
-  & .blog-entry-date {
-    color: var(--accent-foreground);
-    font-family: var(--font-code);
-    flex-shrink: 0;
-  }
-}
-
+@import '../components/blog-index-list/index.css';
diff --git a/src/layouts/blog-index.layout.js b/src/layouts/blog-index.layout.js
@@ -4,7 +4,7 @@ import { breadcrumb } from '../components/breadcrumb/index.js'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').LayoutFunction<T>} LayoutFunction
+ * @typedef {import('top-bun').LayoutFunction<T>} LayoutFunction
  */
 
 /**

diff --git a/src/layouts/root.layout.js b/src/layouts/root.layout.js
@@ -2,13 +2,14 @@ import { html } from 'uhtml-isomorphic'
 
 /**
  * @template T
- * @typedef {import('@siteup/cli').LayoutFunction<T>} LayoutFunction
+ * @typedef {import('top-bun').LayoutFunction<T>} LayoutFunction
  */
 
 /**
  * @typedef {{
  *  title: string,
  *  siteName: string,
+ *  githubRootUrl: string,
  *  [key: string]: any
  * }} RootLayoutVars
  */
@@ -17,11 +18,14 @@ import { html } from 'uhtml-isomorphic'
 export default async function rootLayout ({
   vars: {
     title,
-    siteName
+    siteName,
+    githubRootUrl
   },
   scripts,
   styles,
-  children
+  children,
+  page
+  /* pages */
 }) {
   return html`
 <!DOCTYPE html>
@@ -79,15 +83,15 @@ export default async function rootLayout ({
       <a href="https://hifiwi.fi" class="top-bar-link" title="HifiWi.fi">hifiwi.fi</a>
       <span class="top-bar-right">
         <span class="top-bar-link" >
-            <input class="dark-icon light-dark-button" onclick="window.toggleTheme()" height="14" width="14" type="image" alt="Toogle Theme" height="14" width="14" src="/static/light-dark.svg">
-            <a id="neocities" href="https://neocities.org/site/bret"><img height="14" width="14" src="/static/neocitieshead.svg"></a>
-            <a rel="me" id="mastadon" href="https://fosstodon.org/@bcomnes"><img height="14" width="14" src="/static/mastodon.svg"></a>
-            <a rel="me" href="https://github.com/bcomnes" title="github"><img class="dark-icon" height="14" width="14" src="/static/github.svg"></a>
-            <a href="https://npmjs.com/~bret" title="node packaged modules"><img class="rounded-icon" height="14" width="14" src="/static/npm.svg"></a>
-            <a rel="me" id="bluesky" href="https://bsky.app/profile/bret.io"><img height="14" width="14" src="/static/bsky.png"></a>
-            <a rel="me" href="https://twitter.com/bcomnes" title="twitter: @bcomnes"><img class="rounded-icon" height="14" width="14" src="/static/twtr.svg"></a>
-            <a href="/feed.json"><img class="rounded-icon" height="14" width="14" src="/static/jsonfeed.svg"></a>
-            <a href="/feed.xml"><img height="14" width="14" src="/static/atom.svg" ></a>
+            <input class="dark-icon light-dark-button" onclick="window.toggleTheme()" height="14" width="14" type="image" alt="Toogle Theme" height="14" width="14" src="/globals/static/light-dark.svg">
+            <a id="neocities" href="https://neocities.org/site/bret"><img height="14" width="14" src="/globals/static/neocitieshead.svg"></a>
+            <a rel="me" id="mastadon" href="https://fosstodon.org/@bcomnes"><img height="14" width="14" src="/globals/static/mastodon.svg"></a>
+            <a rel="me" href="https://github.com/bcomnes" title="github"><img class="dark-icon" height="14" width="14" src="/globals/static/github.svg"></a>
+            <a href="https://npmjs.com/~bret" title="node packaged modules"><img class="rounded-icon" height="14" width="14" src="/globals/static/npm.svg"></a>
+            <a rel="me" id="bluesky" href="https://bsky.app/profile/bret.io"><img height="14" width="14" src="/globals/static/bsky.png"></a>
+            <a rel="me" href="https://twitter.com/bcomnes" title="twitter: @bcomnes"><img class="rounded-icon" height="14" width="14" src="/globals/static/twtr.svg"></a>
+            <a href="/feed.json"><img class="rounded-icon" height="14" width="14" src="/globals/static/jsonfeed.svg"></a>
+            <a href="/feed.xml"><img height="14" width="14" src="/globals/static/atom.svg" ></a>
         </span>
       </span>
     </nav>
@@ -96,7 +100,7 @@ export default async function rootLayout ({
     </main>
     <footer class="top-bar hide-print">
       <a href="#" class="top-bar-link">© Bret Comnes</a>
-      <a href="https://github.com/bcomnes/bret.io/tree/master/src" class="top-bar-link" title="edit site on github">edit</a>
+      <a href="${`${githubRootUrl}${page.pageFile.relname}`}" class="top-bar-link" title="edit site on github">edit</a>
       <span class="top-bar-right hide-print">
         <a rel="me" href="mailto:[email protected]" class="top-bar-link" title="email">contact</a>
       </span>