From cf2073ee70620d7ffa4e0a7c255ce3daec4aefaf Mon Sep 17 00:00:00 2001
From: Jiajun Xu <jjxu95@gmail.com>
Date: Sun, 18 Jan 2026 21:02:11 -0800
Subject: [PATCH] update bookclub page; rename What Were Working On to Our
 Projects in the code

---
 src/components/Navbar.tsx                     |  4 ++--
 ...tWereWorkingOn.astro => OurProjects.astro} | 10 ++++-----
 .../Alternatives.astro                        |  2 +-
 .../BookClub.astro                            | 21 +++++++------------
 .../Calendar.astro                            |  0
 .../Pihole.astro                              |  0
 6 files changed, 16 insertions(+), 21 deletions(-)
 rename src/pages/{WhatWereWorkingOn.astro => OurProjects.astro} (82%)
 rename src/pages/{WhatWereWorkingOnPages => OurProjectsPages}/Alternatives.astro (98%)
 rename src/pages/{WhatWereWorkingOnPages => OurProjectsPages}/BookClub.astro (62%)
 rename src/pages/{WhatWereWorkingOnPages => OurProjectsPages}/Calendar.astro (100%)
 rename src/pages/{WhatWereWorkingOnPages => OurProjectsPages}/Pihole.astro (100%)

diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 088975e..5697ad2 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -31,12 +31,12 @@ export default function Navbar({ activePage = "" }: NavbarProps) {
             Points of Unity
           </a>
           <a
-            href="/WhatWereWorkingOn/"
+            href="/OurProjects/"
             className={cn(
               "rounded-full px-6 py-2 transition-colors",
               "bg-gray-200 text-red-700 hover:bg-gray-300",
               "dark:bg-gray-800 dark:text-red-400 dark:hover:bg-gray-700",
-              activePage === "WhatWereWorkingOn" && "ring-2 ring-red-500 ring-offset-2",
+              activePage === "OurProjects" && "ring-2 ring-red-500 ring-offset-2",
             )}
           >
             Our Projects
diff --git a/src/pages/WhatWereWorkingOn.astro b/src/pages/OurProjects.astro
similarity index 82%
rename from src/pages/WhatWereWorkingOn.astro
rename to src/pages/OurProjects.astro
index 3a6de05..b434d83 100644
--- a/src/pages/WhatWereWorkingOn.astro
+++ b/src/pages/OurProjects.astro
@@ -8,7 +8,7 @@ import "../styles/globals.css";
 <Layout>
   <main class="flex min-h-screen flex-col justify-between">
     <div>
-      <Navbar client:load activePage="WhatWereWorkingOn" />
+      <Navbar client:load activePage="OurProjects" />
       <div class="pl-4 pr-4">
         <h1 class="pb-4 pt-4 text-3xl font-semibold">What We're Working On</h1>
         <div class="flex flex-row gap-8">
@@ -21,7 +21,7 @@ import "../styles/globals.css";
             />
 
             <a
-              href="/WhatWereWorkingOnPages/Calendar/"
+              href="/OurProjectsPages/Calendar/"
               class="underline decoration-solid">Calendar</a
             >
           </div> -->
@@ -34,7 +34,7 @@ import "../styles/globals.css";
               class="border"
             />
             <a
-              href="/WhatWereWorkingOnPages/Pihole/"
+              href="/OurProjectsPages/Pihole/"
               class="underline decoration-solid">Pihole Workshop</a
             >
           </div>
@@ -47,7 +47,7 @@ import "../styles/globals.css";
               class="border"
             />
             <a
-              href="/WhatWereWorkingOnPages/BookClub/"
+              href="/OurProjectsPages/BookClub/"
               class="underline decoration-solid">Book Club</a
             >
           </div>
@@ -59,7 +59,7 @@ import "../styles/globals.css";
               width="250"
               class="border"
             />
-            <a href="/WhatWereWorkingOnPages/Alternatives/" class="underline decoration-solid">Big Tech Alternatives</a>
+            <a href="/OurProjectsPages/Alternatives/" class="underline decoration-solid">Big Tech Alternatives</a>
           </div>
         </div>
       </div>
diff --git a/src/pages/WhatWereWorkingOnPages/Alternatives.astro b/src/pages/OurProjectsPages/Alternatives.astro
similarity index 98%
rename from src/pages/WhatWereWorkingOnPages/Alternatives.astro
rename to src/pages/OurProjectsPages/Alternatives.astro
index 23ca41c..eb15a6b 100644
--- a/src/pages/WhatWereWorkingOnPages/Alternatives.astro
+++ b/src/pages/OurProjectsPages/Alternatives.astro
@@ -12,7 +12,7 @@ import Card from "../../components/Card.astro";
 <Layout>
   <main class="flex min-h-screen flex-col justify-between">
     <div>
-      <Navbar client:load activePage="WhatWereWorkingOn" />
+      <Navbar client:load activePage="OurProjects" />
       <div class="pl-4 pr-4">
         <h1 class="pb-4 pt-4 text-3xl font-semibold">Big Tech Alternatives</h1>
         <p class="mb-4">Explore open-source and privacy-focused alternatives to popular big tech software.</p>
diff --git a/src/pages/WhatWereWorkingOnPages/BookClub.astro b/src/pages/OurProjectsPages/BookClub.astro
similarity index 62%
rename from src/pages/WhatWereWorkingOnPages/BookClub.astro
rename to src/pages/OurProjectsPages/BookClub.astro
index e7298a9..23edeaa 100644
--- a/src/pages/WhatWereWorkingOnPages/BookClub.astro
+++ b/src/pages/OurProjectsPages/BookClub.astro
@@ -8,8 +8,8 @@ import "../../styles/globals.css";
 <Layout>
   <main class="flex min-h-screen flex-col justify-between">
     <div>
-      <Navbar client:load activePage="WhatWereWorkingOn" />
-      <div class="pl-4 pr-4">
+      <Navbar client:load activePage="OurProjects" />
+      <div class="px-4">
         <h1 class="pb-4 pt-4 text-3xl font-semibold">Book Club</h1>
         <p class="mb-4">
           We read and discuss books about technology, power, and resistance. If
@@ -23,22 +23,17 @@ import "../../styles/globals.css";
           <div class="rounded-lg border p-6">
             <h2 class="mb-4 text-2xl font-semibold">Current Book</h2>
             <div>
-              Race After Technology - Ruha Benjamin (see <a
-                class="underline"
-                href="https://www.dropbox.com/scl/fi/jnzvtiry7jn3xrts2n703/RAT-Discussion-Guide.pdf?rlkey=pq6ovaeydhcm8yi2u7lzzmiuj&e=2&dl=0"
-                >discussion guide</a
-              >)
+              Holding Change - adrienne maree brown
             </div>
           </div>
 
           <div class="rounded-lg border p-6">
             <h2 class="mb-4 text-2xl font-semibold">Past Books</h2>
-            <div class="flex flex-col gap-4">
-              <ul class="list-disc pl-6">
-                <li>Common Circuits - Luis Felipe R. Murillo</li>
-                <li>Internet for the People - Ben Tarnoff</li>
-              </ul>
-            </div>
+            <ul class="list-disc pl-6">
+              <li>Race After Technology - Ruha Benjamin</li>
+              <li>Common Circuits - Luis Felipe R. Murillo</li>
+              <li>Internet for the People - Ben Tarnoff</li>
+            </ul>
           </div>
         </div>
       </div>
diff --git a/src/pages/WhatWereWorkingOnPages/Calendar.astro b/src/pages/OurProjectsPages/Calendar.astro
similarity index 100%
rename from src/pages/WhatWereWorkingOnPages/Calendar.astro
rename to src/pages/OurProjectsPages/Calendar.astro
diff --git a/src/pages/WhatWereWorkingOnPages/Pihole.astro b/src/pages/OurProjectsPages/Pihole.astro
similarity index 100%
rename from src/pages/WhatWereWorkingOnPages/Pihole.astro
rename to src/pages/OurProjectsPages/Pihole.astro