From c9f921ba5bdd722e55b9e8476c987120840f5bb8 Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Tue, 11 Nov 2025 15:16:15 -0800
Subject: [PATCH] Fixed weird floating footer behavior, updated Timeline to
 handle new growing scrolling content div, fixed grammar issue on chubby
 buttons, removed used nginx configs and Dockerfile comments, made Table not
 go full-w automatically, added tests to ensure no orphaned astro pages or
 site layout entries exist, dummy sitemap index so code analysis doesn't freak
 out

---
 Dockerfile                                    |  6 +---
 astro.config.mjs                              |  8 ++++-
 entrypoint.sh                                 | 14 --------
 nginx/nginx.conf                              |  6 ----
 src/components/Footer.astro                   |  2 +-
 src/components/Table.astro                    |  2 +-
 src/components/Timeline/Timeline.astro        |  1 -
 src/components/Timeline/timeline.ts           | 24 +++++++-------
 src/data/site-layout.ts                       |  7 ++--
 src/layouts/BaseLayout.astro                  | 23 +++++++------
 .../chubby-buttons-2-mount.astro              |  3 +-
 src/pages/index.astro                         |  2 +-
 src/pages/sitemap-index.xml                   |  5 +++
 ...navigable.spec.ts => static-pages.spec.ts} |  1 -
 test/components/navbar.spec.ts                | 15 ---------
 test/endpoints.spec.ts                        | 32 +++++++++++++++++++
 vitest.config.ts                              |  3 +-
 17 files changed, 78 insertions(+), 76 deletions(-)
 delete mode 100755 entrypoint.sh
 create mode 100644 src/pages/sitemap-index.xml
 rename test-e2e/{all-site-layout-pages-navigable.spec.ts => static-pages.spec.ts} (91%)
 delete mode 100644 test/components/navbar.spec.ts
 create mode 100644 test/endpoints.spec.ts

diff --git a/Dockerfile b/Dockerfile
index 69fbe83..115becf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,4 @@ COPY --from=build /app/dist /usr/share/nginx/html
 
 RUN chown -R nginx:nginx /usr/share/nginx/html
 
-#COPY entrypoint.sh /entrypoint.sh
-
-EXPOSE 80
-
-#ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
+EXPOSE 80
\ No newline at end of file
diff --git a/astro.config.mjs b/astro.config.mjs
index c0fb8ba..bd47dd1 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -3,11 +3,14 @@ import {defineConfig} from 'astro/config';
 import sitemap from "@astrojs/sitemap";
 import tailwindcss from "@tailwindcss/vite";
 
+// We don't have access to short imports this early in the build chain
+// noinspection ES6PreferShortImport
 import {siteLayout, getPaths} from "./src/data/site-layout.ts";
 
 const disabledPaths = getPaths(siteLayout, [], true)
 
 // https://astro.build/config
+
 export default defineConfig({
     site: "https://caperren.com",
     prefetch: {
@@ -20,6 +23,9 @@ export default defineConfig({
         })
     ],
     vite: {
-        plugins: [tailwindcss()],
+        plugins: [
+            // @ts-ignore
+            tailwindcss()
+        ],
     },
 });
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
index 1aa3eac..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-# Generate a unique token per container launch
-TOKEN="$(cat /proc/sys/kernel/random/uuid)"  # or: TOKEN="$(date +%s%N)"
-
-# Write it into a file NGINX will include
-cat >/etc/nginx/conf.d/_release_token.conf <<EOF
-# auto-generated at container start
-set \$release_token "$TOKEN";
-EOF
-
-# Then exec nginx
-exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index d11fbf2..24be4b8 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -14,12 +14,6 @@ http {
     root   /usr/share/nginx/html;
     index  index.html index.htm;
     include /etc/nginx/mime.types;
-    #include /etc/nginx/conf.d/_release_token.conf;
-
-    #etag off;
-
-    #add_header ETag "\"W/$release_token\"" always;
-    #add_header Cache-Control "max-age=0, must-revalidate" always;
 
     gzip on;
     gzip_proxied any;
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 9deacd6..b597784 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -1,7 +1,7 @@
 ---
 ---
 
-<footer class="fixed bottom-0 left-0 z-20 w-full px-6 py-2 bg-black border-t border-t-caperren-green-dark text-caperren-green-dark text-sm flex items-center justify-between">
+<footer class="z-50 w-full max-w-full px-6 py-2 bg-black border-t border-t-caperren-green-dark text-caperren-green-dark text-sm flex items-center justify-between">
     <span>{import.meta.env.PUBLIC_BUILD_ENVIRONMENT || "development"}</span>
     <span>{import.meta.env.PUBLIC_REPO_VERSION_HASH || "invalid"}</span>
 </footer>
diff --git a/src/components/Table.astro b/src/components/Table.astro
index b2432e4..88cf20c 100644
--- a/src/components/Table.astro
+++ b/src/components/Table.astro
@@ -8,7 +8,7 @@ const paddingClasses: string = `px-${columnPadding} py-${rowPadding}`;
 ---
 
 <div class="relative max-w-full overflow-x-auto">
-    <table class="w-full text-sm text-left">
+    <table class="text-sm text-left">
         <thead class="text-xs border-b-3 border-caperren-green uppercase bg-black">
         <tr>
             {data.header.map(headingText => (
diff --git a/src/components/Timeline/Timeline.astro b/src/components/Timeline/Timeline.astro
index bc10cba..40d5b77 100644
--- a/src/components/Timeline/Timeline.astro
+++ b/src/components/Timeline/Timeline.astro
@@ -5,7 +5,6 @@ const timeline: timelineEntry[] = Astro.props.timeline || [];
 ---
 
 <custom-timeline>
-
     <div class="relative z-10 grid gap-6 grid-flow-row sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 3xl:grid-cols-6"
          data-timeline>
         {timeline.map((entry, index) => (
diff --git a/src/components/Timeline/timeline.ts b/src/components/Timeline/timeline.ts
index e1678f3..57095c9 100644
--- a/src/components/Timeline/timeline.ts
+++ b/src/components/Timeline/timeline.ts
@@ -7,7 +7,6 @@ class CustomTimeline extends HTMLElement {
         super();
         this._eventElements = this._getNodeElements();
 
-
         window.addEventListener("load", this._paintLeaderLines);
 
     }
@@ -26,17 +25,20 @@ class CustomTimeline extends HTMLElement {
             }
         }).filter(pair => pair !== undefined)
 
+        let contentBodyScrolling = document.getElementById("content-body-scrolling")
+
         pairs.forEach(pair => {
-            new LeaderLine({
-                start: pair[0],
-                end: pair[1],
-                color: '#10ac25',
-                size: 3,
-                startSocket: "right",
-                endSocket: "left",
-                startPlug: "square",
-                endPlug: "arrow3"
-            });
+            let line = new LeaderLine({
+                    start: pair[0],
+                    end: pair[1],
+                    color: '#10ac25',
+                    size: 3,
+                    startSocket: "right",
+                    endSocket: "left",
+                    startPlug: "square",
+                    endPlug: "arrow3"
+                });
+            contentBodyScrolling?.addEventListener("scroll", () => line.position())
         });
     }
 }
diff --git a/src/data/site-layout.ts b/src/data/site-layout.ts
index 8f9b77d..a0c2b4c 100644
--- a/src/data/site-layout.ts
+++ b/src/data/site-layout.ts
@@ -4,22 +4,18 @@ export const siteLayout: navLink[] = [
     {navText: "About", path: ""},
     {navText: "Education", path: "education"},
     {
-        enabled: false,
         navText: "Experiences",
         path: "experience",
         children: [
             {
-                enabled: false,
                 navText: "SpaceX",
                 path: "spacex",
                 children: [
                     {
-                        enabled: false,
                         navText: "Hardware Test Engineer I/II",
                         path: "hardware-test-engineer-i-ii"
                     },
                     {
-                        enabled: false,
                         navText: "Avionics Test Engineering Internship",
                         path: "avionics-test-engineering-internship"
                     }
@@ -151,8 +147,9 @@ export const siteLayout: navLink[] = [
                 navText: "Projects",
                 path: "projects",
                 children: [
-                    {navText: "Shed Solar", path: "shed-solar", enabled: false},
                     {navText: "OSSM Overkill Edition", path: "ossm-overkill-edition", enabled: false},
+                    {navText: "Rachael Ray Light Box", path: "rachael-ray-light-box", enabled: false},
+                    {navText: "Shed Solar", path: "shed-solar", enabled: false},
                 ]
             },
             {enabled: false, navText: "NixOS", path: "nixos"},
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index d8d316a..98fe9fb 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -16,20 +16,23 @@ const pageEnabled = pathToMetadata(Astro.url.pathname).enabled ?? true;
 <head>
     <meta charset="UTF-8"/>
     <link rel="icon" href="/favicon-solid.png" type="image/png"/>
+    <!--suppress HtmlUnknownTarget -->
     <link rel="sitemap" href="/sitemap-index.xml"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>{pageEnabled ? pageTitle : "Corwin Perren"}</title>
 </head>
-<body class="bg-black text-white">
-<Navbar/>
-<main class="mx-6 mt-6 mb-14">
-    {(Astro.props.title && showTitle && pageEnabled) && (
-            <h1 class="font-extrabold md:text-3xl md:mb-6">{Astro.props.title}</h1>
-    )}
-    {pageEnabled && (
-            <slot/>
-    )}
-</main>
+<body class="flex flex-col bg-black text-white h-dvh">
+<div id="content-body-scrolling" class="grow overflow-y-scroll">
+    <Navbar/>
+    <main class="mx-6 my-6">
+        {(Astro.props.title && showTitle && pageEnabled) && (
+                <h1 class="font-extrabold md:text-3xl md:mb-6">{Astro.props.title}</h1>
+        )}
+        {pageEnabled && (
+                <slot/>
+        )}
+    </main>
+</div>
 <Footer/>
 <script src="../scripts/main.ts"></script>
 </body>
diff --git a/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro b/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro
index 2ba17d5..8269d56 100644
--- a/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro
+++ b/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro
@@ -68,7 +68,6 @@ const headerCarouselGroup: carouselGroup = {
         While my first iteration was sized appropriately and went together with no issues, the ball mount neck ended up
         snapping due to a low infill percentage. After changing that area to 100% infill, including a handful of the
         rear mount layers that it attached to, a second iteration has worked perfectly for a few years now! If you're
-        interested in printing this yourself, feel free to download the model and print it yourself using the button
-        under the photos!
+        interested in printing this yourself, feel free to download the model using the button under the photos!
     </p>
 </HobbyLayout>
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 67dca05..4f6b602 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -39,7 +39,7 @@ const headerCarouselGroup: carouselGroup = {
         Through college, I learned electronics and PCB design, embedded and pc programming, basic mechanical design and
         fabrication, on top of learning how to work well with others in a team.
         I quickly realized that robotics was an ideal focus due to its inherent multi-disciplinary nature, and joined
-        the OSU Robotics club, which introduced me to people who are still my best friends today.
+        the OSU Robotics Club, which introduced me to people who are still my best friends today.
         Through student engineering jobs, I had the unique opportunity to work on some incredible projects such as the
         <a class="text-blue-500 hover:text-blue-300"
            href="/experience/osu-ceoas-ocean-mixing-group/robotic-oceanographic-surface-sampler">robotic oceanographic
diff --git a/src/pages/sitemap-index.xml b/src/pages/sitemap-index.xml
new file mode 100644
index 0000000..0b50b5c
--- /dev/null
+++ b/src/pages/sitemap-index.xml
@@ -0,0 +1,5 @@
+<sitemapindex>
+    <sitemap>
+        <loc>https://caperren.com/sitemap-0.xml</loc>
+    </sitemap>
+</sitemapindex>
\ No newline at end of file
diff --git a/test-e2e/all-site-layout-pages-navigable.spec.ts b/test-e2e/static-pages.spec.ts
similarity index 91%
rename from test-e2e/all-site-layout-pages-navigable.spec.ts
rename to test-e2e/static-pages.spec.ts
index abd2c99..048a811 100644
--- a/test-e2e/all-site-layout-pages-navigable.spec.ts
+++ b/test-e2e/static-pages.spec.ts
@@ -11,7 +11,6 @@ for (const pagePath of getPaths()) {
 
     test(`${pagePath}: Has Title`, async ({page}) => {
         await page.goto(pagePath);
-        console.log(await page.title());
         expect(await page.title()).not.toBe("Corwin Perren")
     });
 }
diff --git a/test/components/navbar.spec.ts b/test/components/navbar.spec.ts
deleted file mode 100644
index d00bc6c..0000000
--- a/test/components/navbar.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { experimental_AstroContainer as AstroContainer } from 'astro/container';
-import { expect, test } from 'vitest';
-import Navbar from "@components/Navbar.astro"
-
-test('Card with slots', async () => {
-    const container = await AstroContainer.create();
-    const result = await container.renderToString(Navbar, {
-        slots: {
-            default: 'Card content',
-        },
-    });
-
-    // expect(result).toContain('This is a card');
-    // expect(result).toContain('Card content');
-});
\ No newline at end of file
diff --git a/test/endpoints.spec.ts b/test/endpoints.spec.ts
new file mode 100644
index 0000000..a8e221e
--- /dev/null
+++ b/test/endpoints.spec.ts
@@ -0,0 +1,32 @@
+import {expect, test} from "vitest";
+
+import {siteLayout, getPaths} from "@data/site-layout.ts";
+
+// Paths that should be known to Astro statically
+const astroStaticPaths = new Set(
+    Object.keys(import.meta.glob("/src/pages/**/*.astro"))
+        .map((path) =>
+            path
+                .replace("/src/pages", "")
+                .replace(/index\.astro$/, "")
+                .replace(/\.astro$|\.md$/, "")
+                .replace(/\/$/, "")
+            || "/"
+        ));
+
+// Paths that exist in the site layout
+const siteLayoutPaths = new Set([...getPaths(siteLayout), ...getPaths(siteLayout, [], true)]);
+
+// Paths that exist in Astro's static paths, but not in site layout
+const astroNotLayoutPaths = astroStaticPaths.difference(siteLayoutPaths);
+
+// Paths that exist in site layout, but not in Astro's static paths
+const siteLayoutNotAstroPaths = siteLayoutPaths.difference(astroStaticPaths);
+
+test('Pages Missing from Site Layout', async () => {
+    expect(astroNotLayoutPaths).toHaveLength(0);
+});
+
+test('Pages Missing from Astro Paths', async () => {
+    expect(siteLayoutNotAstroPaths).toHaveLength(0);
+});
diff --git a/vitest.config.ts b/vitest.config.ts
index 1216f8b..296be29 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -3,6 +3,7 @@ import {getViteConfig} from 'astro/config';
 
 export default getViteConfig(
     {
+        // @ts-ignore
         test: {
             exclude: [
                 "test-e2e/**",
@@ -13,8 +14,6 @@ export default getViteConfig(
                     '@': path.resolve(__dirname, './src')
                 },
             },
-            /* for example, use global to avoid globals imports (describe, test, expect): */
-            // globals: true,
         },
     },
     {