Rearrange blog layout (#382)

* rearrange pages * fix paths * add path prefix * fix icons * fix about page path * first post
pyohio · Nov 18, 2024 · 1e1c117 · 1e1c117
1 parent 60f84fc
commit 1e1c117
Show file tree

Hide file tree

Showing 30 changed files with 1,033 additions and 742 deletions.
diff --git a/blog/astro.config.mjs b/blog/astro.config.mjs
@@ -4,9 +4,11 @@ import mdx from "@astrojs/mdx"
 
 import sitemap from "@astrojs/sitemap"
 
+import icon from "astro-icon";
+
 // https://astro.build/config
 export default defineConfig({
   site: "https://www.pyohio.org/blog",
   base: "/blog",
-  integrations: [mdx(), sitemap()],
-})
+  integrations: [mdx(), sitemap(), icon()],
+})
diff --git a/blog/package.json b/blog/package.json
@@ -10,11 +10,13 @@
     "astro": "astro"
   },
   "dependencies": {
+    "@astrojs/check": "^0.9.4",
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/rss": "^4.0.9",
     "@astrojs/sitemap": "^3.2.1",
+    "@iconify-json/mdi": "^1.2.1",
     "astro": "^4.16.13",
-    "@astrojs/check": "^0.9.4",
+    "astro-icon": "^1.1.2",
     "typescript": "^5.6.3"
   }
 }
diff --git a/blog/public/admin/config.yml b/blog/public/admin/config.yml
@@ -2,13 +2,14 @@ backend:
   name: github
   repo: pyohio/pyohio-static-website
   branch: main
-media_folder: "blog/src/assets/media"
-public_folger: "blog/src/assets/media"
+media_folder: "blog/public/media"
+public_folder: "/blog/media"
 publish_mode: editorial_workflow
 collections:
-  - name: "blog"
-    label: "Blog Post"
-    folder: "blog/src/content/blog"
+  - name: "posts"
+    label: "Blog Posts"
+    label_singular: "Blog Post"
+    folder: "blog/src/content/posts"
     create: true
     slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
     fields:

diff --git a/blog/src/assets/media/.gitkeep → blog/public/media/.gitkeep b/blog/src/assets/media/.gitkeep → blog/public/media/.gitkeep
diff --git a/blog/public/blog-placeholder-1.jpg → blog/public/media/blog-placeholder-1.jpg b/blog/public/blog-placeholder-1.jpg → blog/public/media/blog-placeholder-1.jpg
diff --git a/blog/public/blog-placeholder-2.jpg → blog/public/media/blog-placeholder-2.jpg b/blog/public/blog-placeholder-2.jpg → blog/public/media/blog-placeholder-2.jpg
diff --git a/blog/public/blog-placeholder-3.jpg → blog/public/media/blog-placeholder-3.jpg b/blog/public/blog-placeholder-3.jpg → blog/public/media/blog-placeholder-3.jpg
diff --git a/blog/public/blog-placeholder-4.jpg → blog/public/media/blog-placeholder-4.jpg b/blog/public/blog-placeholder-4.jpg → blog/public/media/blog-placeholder-4.jpg
diff --git a/blog/public/blog-placeholder-5.jpg → blog/public/media/blog-placeholder-5.jpg b/blog/public/blog-placeholder-5.jpg → blog/public/media/blog-placeholder-5.jpg
diff --git a/blog/public/blog-placeholder-about.jpg → blog/public/media/blog-placeholder-about.jpg b/blog/public/blog-placeholder-about.jpg → blog/public/media/blog-placeholder-about.jpg
diff --git a/blog/src/components/BaseHead.astro b/blog/src/components/BaseHead.astro
@@ -1,17 +1,21 @@
 ---
 // Import the global.css file here so that it is included on
 // all pages through the use of the <BaseHead /> component.
-import '../styles/global.css';
+import "../styles/global.css"
 
 interface Props {
-	title: string;
-	description: string;
-	image?: string;
+  title: string
+  description: string
+  image?: string
 }
 
-const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+const canonicalURL = new URL(Astro.url.pathname, Astro.site)
 
-const { title, description, image = '/blog-placeholder-1.jpg' } = Astro.props;
+const {
+  title,
+  description,
+  image = "/blog/media/blog-placeholder-1.jpg",
+} = Astro.props
 ---
 
 <!-- Global Metadata -->
@@ -21,8 +25,20 @@ const { title, description, image = '/blog-placeholder-1.jpg' } = Astro.props;
 <meta name="generator" content={Astro.generator} />
 
 <!-- Font preloads -->
-<link rel="preload" href="/fonts/atkinson-regular.woff" as="font" type="font/woff" crossorigin />
-<link rel="preload" href="/fonts/atkinson-bold.woff" as="font" type="font/woff" crossorigin />
+<link
+  rel="preload"
+  href="/blog/fonts/atkinson-regular.woff"
+  as="font"
+  type="font/woff"
+  crossorigin
+/>
+<link
+  rel="preload"
+  href="/blog/fonts/atkinson-bold.woff"
+  as="font"
+  type="font/woff"
+  crossorigin
+/>
 
 <!-- Canonical URL -->
 <link rel="canonical" href={canonicalURL} />

diff --git a/blog/src/components/Footer.astro b/blog/src/components/Footer.astro
@@ -1,62 +1,43 @@
 ---
-const today = new Date();
+const today = new Date()
+import { Icon } from "astro-icon/components"
 ---
 
 <footer>
-	&copy; {today.getFullYear()} Your name here. All rights reserved.
-	<div class="social-links">
-		<a href="https://m.webtoo.ls/@astro" target="_blank">
-			<span class="sr-only">Follow Astro on Mastodon</span>
-			<svg
-				viewBox="0 0 16 16"
-				aria-hidden="true"
-				width="32"
-				height="32"
-				astro-icon="social/mastodon"
-				><path
-					fill="currentColor"
-					d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"
-				></path></svg
-			>
-		</a>
-		<a href="https://twitter.com/astrodotbuild" target="_blank">
-			<span class="sr-only">Follow Astro on Twitter</span>
-			<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/twitter"
-				><path
-					fill="currentColor"
-					d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"
-				></path></svg
-			>
-		</a>
-		<a href="https://github.com/withastro/astro" target="_blank">
-			<span class="sr-only">Go to Astro's GitHub repo</span>
-			<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/github"
-				><path
-					fill="currentColor"
-					d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"
-				></path></svg
-			>
-		</a>
-	</div>
+  &copy; {today.getFullYear()} PyOhio. All rights reserved.
+  <div class="social-links">
+    <a href="https://fosstodon.org/@pyohio" target="_blank">
+      <span class="sr-only">Follow PyOhio on Mastodon</span>
+      <Icon height="32" width="32" name="mdi:mastodon" />
+    </a>
+    <a href="https://www.linkedin.com/company/pyohio/" target="_blank">
+      <span class="sr-only">Follow PyOhio on LinkedIn</span>
+      <Icon height="32" width="32" name="mdi:linkedin" />
+    </a>
+    <a href="https://www.pyohio.org/" target="_blank">
+      <span class="sr-only">Go to PyOhio's conference website</span>
+      <Icon height="32" width="32" name="mdi:web" />
+    </a>
+  </div>
 </footer>
 <style>
-	footer {
-		padding: 2em 1em 6em 1em;
-		background: linear-gradient(var(--gray-gradient)) no-repeat;
-		color: rgb(var(--gray));
-		text-align: center;
-	}
-	.social-links {
-		display: flex;
-		justify-content: center;
-		gap: 1em;
-		margin-top: 1em;
-	}
-	.social-links a {
-		text-decoration: none;
-		color: rgb(var(--gray));
-	}
-	.social-links a:hover {
-		color: rgb(var(--gray-dark));
-	}
+  footer {
+    padding: 2em 1em 6em 1em;
+    background: linear-gradient(var(--gray-gradient)) no-repeat;
+    color: rgb(var(--gray));
+    text-align: center;
+  }
+  .social-links {
+    display: flex;
+    justify-content: center;
+    gap: 1em;
+    margin-top: 1em;
+  }
+  .social-links a {
+    text-decoration: none;
+    color: rgb(var(--gray));
+  }
+  .social-links a:hover {
+    color: rgb(var(--gray-dark));
+  }
 </style>
diff --git a/blog/src/components/Header.astro b/blog/src/components/Header.astro
@@ -1,43 +1,29 @@
 ---
 import HeaderLink from "./HeaderLink.astro"
 import { SITE_TITLE } from "../consts"
+import { Icon } from "astro-icon/components"
 ---
 
 <header>
   <nav>
     <h2><a href="/blog">{SITE_TITLE}</a></h2>
     <div class="internal-links">
-      <HeaderLink href="/blog">Blog Home</HeaderLink>
+      <HeaderLink href="/blog/about">About PyOhio</HeaderLink>
+      <HeaderLink href="/blog/archive">Archive</HeaderLink>
       <HeaderLink href="/2025">2025 Conference</HeaderLink>
-      <HeaderLink href="/about">About</HeaderLink>
     </div>
     <div class="social-links">
-      <a href="https://m.webtoo.ls/@astro" target="_blank">
-        <span class="sr-only">Follow Astro on Mastodon</span>
-        <svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32"
-          ><path
-            fill="currentColor"
-            d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"
-          ></path></svg
-        >
+      <a href="https://fosstodon.org/@pyohio" target="_blank">
+        <span class="sr-only">Follow PyOhio on Mastodon</span>
+        <Icon height="32" width="32" name="mdi:mastodon" />
       </a>
-      <a href="https://twitter.com/astrodotbuild" target="_blank">
-        <span class="sr-only">Follow Astro on Twitter</span>
-        <svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32"
-          ><path
-            fill="currentColor"
-            d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"
-          ></path></svg
-        >
+      <a href="https://www.linkedin.com/company/pyohio/" target="_blank">
+        <span class="sr-only">Follow PyOhio on LinkedIn</span>
+        <Icon height="32" width="32" name="mdi:linkedin" />
       </a>
-      <a href="https://github.com/withastro/astro" target="_blank">
-        <span class="sr-only">Go to Astro's GitHub repo</span>
-        <svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32"
-          ><path
-            fill="currentColor"
-            d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"
-          ></path></svg
-        >
+      <a href="https://www.pyohio.org/" target="_blank">
+        <span class="sr-only">Go to PyOhio's conference website</span>
+        <Icon height="32" width="32" name="mdi:web" />
       </a>
     </div>
   </nav>

diff --git a/blog/src/content/blog/2024-11-17-test-post.md b/blog/src/content/blog/2024-11-17-test-post.md
diff --git a/blog/src/content/blog/first-post.md b/blog/src/content/blog/first-post.md