DrewMcArthur · DrewMcArthur · Feb 3, 2024 · Feb 3, 2024 · Feb 3, 2024 · Feb 3, 2024
diff --git a/.github/workflows/url-check.yml b/.github/workflows/url-check.yml
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
     "node": ">=18.14.1"
   },
   "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev",
+    "dev": "astro dev --host",
+    "start": "astro dev --host",
     "build": "astro build",
     "preview": "astro preview",
     "check": "astro check",

diff --git a/public/images/trident-logo.jpeg b/public/images/trident-logo.jpeg
diff --git a/scripts/checkUrls.sh b/scripts/checkUrls.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Define an array of your JSON files
+files=("projects" "links")
+acceptable_codes=(200 301 302 000 999)
+failed=false
+
+# Loop through each file
+for file in "${files[@]}"
+do
+  echo "Processing $file..."
+  # Extract URLs and loop through each
+  jq -r ".${file}[] | .url" "./src/data/${file}.json" | while read -r url; do
+    # Prepend http if not present
+    [[ "$url" != http* ]] && url="https:$url"
+    # Perform health check
+    http_status=$(curl -o /dev/null -s -w "%{http_code}\n" "$url")
+    if [[ "${acceptable_codes[@]}" =~ "$http_status" ]]; then
+      echo "URL check passed: $url"
+    else
+      echo "URL check failed: $url with status $http_status"
+      failed=true
+    fi
+  done
+done
+
+if [ $failed ]; then exit 1; fi
diff --git a/src/components/About.astro b/src/components/About.astro
@@ -1,20 +1,25 @@
 ---
+
 ---
 
 <div id="about" class="about section">
   <p>
-    I'm a software engineer from New England, now living in Boulder, CO.  I
-    currently work with <a href="https://mathematica.org/about-mathematica">Mathematica Policy Research</a>
+    I'm a software engineer from New England, now living in Boulder, CO. I
+    currently work with <a href="https://mathematica.org/about-mathematica"
+      >Mathematica Policy Research</a
+    >
     on their infrastructure and data platforms.
   </p>
   <p>
     I'm also working towards a master's degree in <a
       href="https://www.colorado.edu/cmci/academics/media-studies/ma-media-and-public-engagement"
       >Media and Public Engagement</a
-    > at CU Boulder, where I focus on cooperatives, worker ownership, 
-    governance, and enterprise design.
+    > at CU Boulder, where I focus on cooperatives, worker ownership, governance,
+    and enterprise design.
   </p>
   <p>
-    I'm passionate about systems that enable and encourage collaboration, transparency, equity, and autonomy.
+    I'm passionate about systems that enable and encourage collaboration,
+    transparency, equity, and autonomy.
   </p>
+  <p>Check out some of my <a href="/projects">projects</a>.</p>
 </div>
diff --git a/src/components/SocialLinks.astro b/src/components/SocialLinks.astro
@@ -1,8 +1,8 @@
 ---
 import SocialLink from "./SocialLink.astro";
-import links from "../data/links.json";
+import { links } from "../data/links.json";
 ---
 
 <div id="links" class="social-links section">
-  {links.linkData.map((linkData) => <SocialLink data={linkData} />)}
+  {links.map((link) => <SocialLink data={link} />)}
 </div>
diff --git a/src/components/projects/trident/TridentIndex.astro b/src/components/projects/trident/TridentIndex.astro
@@ -1,49 +1,37 @@
 ---
-import "../../../styles/main.css";
+import { Image } from "astro:assets";
 import "../../../styles/trident/trident.css";
 
 import TridentFooter from "./TridentFooter.astro";
 import TridentPrevNextButtons from "./TridentPrevNextButtons.astro";
 import TridentSection from "./TridentSection.astro";
 import TridentSectionSelector from "./TridentSectionSelector.astro";
 import { sections } from "../../../data/tridentConfig.json";
+import Layout from "../../../layouts/Layout.astro";
+
+import tridentLogo from "../../../images/trident-logo.png";
 
 const section = Astro.props.section as number;
 ---
 
-<html>
-  <head>
-    <title>drewmca.dev</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="robots" content="noindex, nofollow" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <!-- htmx -->
-    <script src="https://unpkg.com/htmx.org@1.9.9"></script>
-  </head>
-  <body>
-    <div class="trident-header">
-      <h1>Trident Audio Tour</h1>
-      <img
-        src="/images/trident-logo.jpeg"
-        alt="Trident Logo"
-        class="trident-logo"
-      />
-    </div>
-    <span class="date">{sections[section].date}</span>
-    <p class="lead">
-      <em>
-        Trident is an employee-owned bookstore and cafe located in Boulder,
-        Colorado. Experience an audio tour of the location below.
-      </em>
-    </p>
+<Layout
+  title="Trident Audio Tour | drewmca.dev"
+  desc="An audio project exploring the dynamics of work at Trident, Booksellers & Cafe, by Drew McArthur"
+>
+  <div class="trident-header">
+    <h1>Trident Audio Tour</h1>
+    <Image src={tridentLogo} alt="Trident Logo" class="trident-logo" />
+  </div>
+  <span class="date">{sections[section].date}</span>
+  <p class="lead">
+    <em>
+      Trident is an employee-owned bookstore and cafe located in Boulder,
+      Colorado. Experience an audio tour of the location below.
+    </em>
+  </p>
 
-    <TridentSectionSelector section={section} />
-    <TridentSection section={section} />
-    <TridentPrevNextButtons section={section} />
-    <TridentFooter />
-  </body>
-</html>
+  <TridentSectionSelector section={section} />
+  <TridentSection section={section} />
+  <TridentPrevNextButtons section={section} />
+  <TridentFooter />
+</Layout>
diff --git a/src/data/links.json b/src/data/links.json
@@ -1,5 +1,5 @@
 {
-  "linkData": [
+  "links": [
     {
       "type": "gmail",
       "text": "hi@drewmca.dev",
@@ -8,7 +8,7 @@
     {
       "type": "GitHub",
       "text": "@drewmcarthur",
-      "url": "https://github.com/drewmcarthur"
+      "url": "https://github.com/drewmcarthur/"
     },
     {
       "type": "GitLab",
@@ -18,7 +18,7 @@
     {
       "type": "LinkedIn",
       "text": "@drewmcarthur",
-      "url": "https://linkedin.com/in/drewmcarthur"
+      "url": "https://www.linkedin.com/in/drewmcarthur"
     },
     {
       "type": "Facebook",

diff --git a/src/data/projects.json b/src/data/projects.json
@@ -0,0 +1,43 @@
+{
+    "projects": [
+        {
+            "url": "//allielind.com",
+            "title": "allielind.com",
+            "desc": "a website for my partner, who happens to be an incredible aerialist!"
+        },
+        {
+            "url": "//qrstats.drewmca.dev",
+            "title": "qrstats",
+            "desc": "an extremely simple webapp to track link redirects.  I mostly wanted to mess around with writing rust code deployed to cloudflare's serverless workers."
+        },
+        {
+            "url": "/papers/inflationary-equity.pdf",
+            "title": "Inflationary Equity",
+            "type": "school",
+            "desc": "a paper I wrote on the potential ramifications of lifting the cap in company stock, and automatically allocating it to employees."
+        },
+        {
+            "url": "https://www.medicaid.gov/state-overviews/scorecard/welcome",
+            "title": "Medicaid Scorecard ETL",
+            "type": "work",
+            "desc": "I built the majority of the ETL pipeline that provides data for Medicaid Scorecard website."
+        },
+        {
+            "url": "https://www.cms.gov/priorities/key-initiatives/hospital-price-transparency",
+            "title": "Price Transparency",
+            "type": "work",
+            "desc": "a set of infrastructure that scrapes the machine readable files that were mandated by legislation as of Summer 2022"
+        },
+        {
+            "url": "//github.com/drewmcarthur/msgpack-bal",
+            "title": "msgpack-bal",
+            "desc": "a msgpack library written in ballerina."
+        },
+        {
+            "url": "/projects/trident",
+            "title": "Trident Audio Project",
+            "type": "school",
+            "desc": "a class project on a local bookstore and cafe."
+        }
+    ]
+}
diff --git a/src/images/apple-touch-icon.png b/src/images/apple-touch-icon.png
diff --git a/src/images/favicon-16x16.png b/src/images/favicon-16x16.png
diff --git a/src/images/favicon-32x32.png b/src/images/favicon-32x32.png
diff --git a/src/images/favicon.ico b/src/images/favicon.ico
diff --git a/src/images/trident-logo.png b/src/images/trident-logo.png
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -0,0 +1,40 @@
+---
+import "../styles/main.css";
+import appleTouchIcon from "../images/apple-touch-icon.png";
+import favicon16 from "../images/favicon-16x16.png";
+import favicon32 from "../images/favicon-32x32.png";
+
+type Props = {
+  title?: string,
+  desc?: string
+}
+
+let { title, desc } = Astro.props;
+if (!title || title == "") title = "drewmca.dev";
+---
+
+<html lang="en">
+  <head>
+    <title>{title}</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    { desc ?  <meta name="description" content={desc} /> : "" }
+    <link rel="apple-touch-icon" sizes="180x180" href={appleTouchIcon.src} />
+    <link rel="icon" type="image/png" sizes="32x32" href={favicon32.src} />
+    <link rel="icon" type="image/png" sizes="16x16" href={favicon16.src} />
+    <link rel="manifest" href="/site.webmanifest" />
+    <meta
+      name="theme-color"
+      content="#FAF0E6"
+      media="(prefers-color-scheme: light)"
+    />
+    <meta
+      name="theme-color"
+      content="#292726"
+      media="(prefers-color-scheme: dark)"
+    />
+  </head>
+  <body>
+    <slot />
+  </body>
+</html>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -1,33 +1,11 @@
 ---
 import App from "../components/App.astro";
-import "../styles/main.css";
+import Layout from "../layouts/Layout.astro";
 ---
 
-<html lang="en">
-  <head>
-    <title>drew mca | drewmca.dev</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta
-      name="description"
-      content="Homepage for Drew McArthur, @drewmca.dev.  A software engineer, media scholar, and systems thinker."
-    />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <meta
-      name="theme-color"
-      content="#FAF0E6"
-      media="(prefers-color-scheme: light)"
-    />
-    <meta
-      name="theme-color"
-      content="#292726"
-      media="(prefers-color-scheme: dark)"
-    />
-  </head>
-  <body>
-    <App />
-  </body>
-</html>
+<Layout
+  title="drew mca | drewmca.dev"
+  desc="Homepage for Drew McArthur, @drewmca.dev.  A software engineer, media scholar, and systems thinker."
+>
+  <App />
+</Layout>
diff --git a/src/pages/projects.astro b/src/pages/projects.astro
@@ -0,0 +1,23 @@
+---
+import Layout from "../layouts/Layout.astro";
+import "../styles/projects.css";
+
+import { projects } from "../data/projects.json";
+---
+
+<Layout title="projects | drewmca.dev">
+  <div class="header"><a href="/">drewmca.dev</a>&nbsp;/ projects</div>
+  <ul class="projects scrollable">
+    {
+      projects.map((p) => (
+        <li>
+          <a href={p.url}>
+            <p>{p.title}</p>
+            {p.type ? <span class="type">{p.type}</span> : ""}
+            <p>{p.desc}</p>
+          </a>
+        </li>
+      ))
+    }
+  </ul>
+</Layout>