From 340239f990e2dbdb6d42255ddd116d9acc8d899d Mon Sep 17 00:00:00 2001
From: Jiajun Xu <jjxu95@gmail.com>
Date: Sun, 18 Jan 2026 22:38:15 -0800
Subject: [PATCH] rename ../ourprojectspages/... to just .../projects/... in
 the page route

---
 src/components/Navbar.tsx                     |  2 +-
 .../{OurProjects.astro => projects.astro}     | 36 +++++-----
 .../alternatives.astro}                       | 66 +++++++++----------
 .../bookclub.astro}                           |  0
 .../calendar.astro}                           |  0
 .../Pihole.astro => projects/pihole.astro}    |  2 +-
 .../Zines.astro => projects/zines.astro}      |  0
 7 files changed, 53 insertions(+), 53 deletions(-)
 rename src/pages/{OurProjects.astro => projects.astro} (83%)
 rename src/pages/{OurProjectsPages/Alternatives.astro => projects/alternatives.astro} (69%)
 rename src/pages/{OurProjectsPages/BookClub.astro => projects/bookclub.astro} (100%)
 rename src/pages/{OurProjectsPages/Calendar.astro => projects/calendar.astro} (100%)
 rename src/pages/{OurProjectsPages/Pihole.astro => projects/pihole.astro} (98%)
 rename src/pages/{OurProjectsPages/Zines.astro => projects/zines.astro} (100%)

diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 5697ad2..54b889e 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -31,7 +31,7 @@ export default function Navbar({ activePage = "" }: NavbarProps) {
             Points of Unity
           </a>
           <a
-            href="/OurProjects/"
+            href="/projects/"
             className={cn(
               "rounded-full px-6 py-2 transition-colors",
               "bg-gray-200 text-red-700 hover:bg-gray-300",
diff --git a/src/pages/OurProjects.astro b/src/pages/projects.astro
similarity index 83%
rename from src/pages/OurProjects.astro
rename to src/pages/projects.astro
index 48fde9b..2703f33 100644
--- a/src/pages/OurProjects.astro
+++ b/src/pages/projects.astro
@@ -11,7 +11,7 @@ import "../styles/globals.css";
       <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">
+        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-8">
           <!-- <div class="justify-items-center">
             <img
               src="/assets/calendar.png"
@@ -21,24 +21,11 @@ import "../styles/globals.css";
             />
 
             <a
-              href="/OurProjectsPages/Calendar/"
+              href="/projects/calendar/"
               class="underline decoration-solid">Calendar</a
             >
           </div> -->
 
-          <div class="justify-items-center">
-            <img
-              src="/assets/pihole.jpeg"
-              alt="pihole parts"
-              width="250"
-              class="border"
-            />
-            <a
-              href="/OurProjectsPages/Pihole/"
-              class="underline decoration-solid">Pihole Workshop</a
-            >
-          </div>
-
           <div class="justify-items-center">
             <img
               src="/assets/book-club.jpg"
@@ -47,7 +34,7 @@ import "../styles/globals.css";
               class="border"
             />
             <a
-              href="/OurProjectsPages/BookClub/"
+              href="/projects/bookclub/"
               class="underline decoration-solid">Book Club</a
             >
           </div>
@@ -59,7 +46,7 @@ import "../styles/globals.css";
               width="250"
               class="border"
             />
-            <a href="/OurProjectsPages/Alternatives/" class="underline decoration-solid">Big Tech Alternatives</a>
+            <a href="/projects/alternatives/" class="underline decoration-solid">Big Tech Alternatives</a>
           </div>
 
           <div class="justify-items-center">
@@ -69,7 +56,20 @@ import "../styles/globals.css";
               width="250"
               class="border object-cover w-[250px] h-[250px]"
             />
-            <a href="/OurProjectsPages/Zines/" class="underline decoration-solid">Zines</a>
+            <a href="/projects/zines/" class="underline decoration-solid">Zines</a>
+          </div>
+
+          <div class="justify-items-center">
+            <img
+              src="/assets/pihole.jpeg"
+              alt="pihole parts"
+              width="250"
+              class="border"
+            />
+            <a
+              href="/projects/pihole/"
+              class="underline decoration-solid">Pihole Workshop</a
+            >
           </div>
         </div>
       </div>
diff --git a/src/pages/OurProjectsPages/Alternatives.astro b/src/pages/projects/alternatives.astro
similarity index 69%
rename from src/pages/OurProjectsPages/Alternatives.astro
rename to src/pages/projects/alternatives.astro
index eb15a6b..759390d 100644
--- a/src/pages/OurProjectsPages/Alternatives.astro
+++ b/src/pages/projects/alternatives.astro
@@ -16,79 +16,79 @@ import Card from "../../components/Card.astro";
       <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>
-        
+
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
-          <Card 
-            title="Browsers" 
-            bigTech="Chrome (Google)" 
+          <Card
+            title="Browsers"
+            bigTech="Chrome (Google)"
             alternatives={[
               { name: 'Firefox', description: 'Privacy-focused browser.', url: 'https://www.mozilla.org/firefox' },
             ]}
-            bgClass="bg-blue-50" 
+            bgClass="bg-blue-50"
           />
 
-          <Card 
-            title="Cloud Storage" 
-            bigTech="Google Drive" 
+          <Card
+            title="Cloud Storage"
+            bigTech="Google Drive"
             alternatives={[
               { name: 'Nextcloud', description: 'Self-hosted file sync and share.', url: 'https://nextcloud.com' }
             ]}
-            bgClass="bg-indigo-50" 
+            bgClass="bg-indigo-50"
           />
 
-          <Card 
-            title="Email" 
-            bigTech="Gmail (Google)" 
+          <Card
+            title="Email"
+            bigTech="Gmail (Google)"
             alternatives={[
               { name: 'ProtonMail', description: 'Encrypted email.', url: 'https://protonmail.com' },
             ]}
-            bgClass="bg-yellow-50" 
+            bgClass="bg-yellow-50"
           />
 
-          <Card 
-            title="Maps" 
-            bigTech="Google Maps" 
+          <Card
+            title="Maps"
+            bigTech="Google Maps"
             alternatives={[
               { name: 'OpenStreetMap', description: 'Community-driven maps.', url: 'https://www.openstreetmap.org' }
             ]}
-            bgClass="bg-teal-50" 
+            bgClass="bg-teal-50"
           />
 
-          <Card 
-            title="Messaging" 
-            bigTech="WhatsApp (Meta), Slack" 
+          <Card
+            title="Messaging"
+            bigTech="WhatsApp (Meta), Slack"
             alternatives={[
               { name: 'Signal', description: 'Encrypted messaging (alternative to WhatsApp).', url: 'https://signal.org' },
               { name: 'Element', description: 'Matrix-based chat (alternative to Slack).', url: 'https://element.io' }
             ]}
-            bgClass="bg-red-50" 
+            bgClass="bg-red-50"
           />
 
-          <Card 
-            title="Search Engines" 
-            bigTech="Google Search" 
+          <Card
+            title="Search Engines"
+            bigTech="Google Search"
             alternatives={[
               { name: 'DuckDuckGo', description: 'Privacy-protecting search.', url: 'https://duckduckgo.com' },
             ]}
-            bgClass="bg-green-50" 
+            bgClass="bg-green-50"
           />
 
-          <Card 
-            title="Social Media" 
-            bigTech="Twitter (X), Facebook (Meta)" 
+          <Card
+            title="Social Media"
+            bigTech="Twitter (X), Facebook (Meta)"
             alternatives={[
               { name: 'Mastodon', description: 'Decentralized social network (alternative to Twitter).', url: 'https://joinmastodon.org' },
             ]}
-            bgClass="bg-purple-50" 
+            bgClass="bg-purple-50"
           />
 
-          <Card 
-            title="Video Platforms" 
-            bigTech="YouTube (Google)" 
+          <Card
+            title="Video Platforms"
+            bigTech="YouTube (Google)"
             alternatives={[
               { name: 'PeerTube', description: 'Decentralized video hosting.', url: 'https://joinpeertube.org' },
             ]}
-            bgClass="bg-pink-50" 
+            bgClass="bg-pink-50"
           />
 
         </div>
diff --git a/src/pages/OurProjectsPages/BookClub.astro b/src/pages/projects/bookclub.astro
similarity index 100%
rename from src/pages/OurProjectsPages/BookClub.astro
rename to src/pages/projects/bookclub.astro
diff --git a/src/pages/OurProjectsPages/Calendar.astro b/src/pages/projects/calendar.astro
similarity index 100%
rename from src/pages/OurProjectsPages/Calendar.astro
rename to src/pages/projects/calendar.astro
diff --git a/src/pages/OurProjectsPages/Pihole.astro b/src/pages/projects/pihole.astro
similarity index 98%
rename from src/pages/OurProjectsPages/Pihole.astro
rename to src/pages/projects/pihole.astro
index 9b287bd..c10da01 100644
--- a/src/pages/OurProjectsPages/Pihole.astro
+++ b/src/pages/projects/pihole.astro
@@ -11,7 +11,7 @@ import "../../styles/globals.css";
       <Navbar />
       <div class="pl-4 pr-4">
         <h1 class="text-3xl font-semibold">Pihole</h1>
-       
+
       </div>
     </div>
     <Footer />
diff --git a/src/pages/OurProjectsPages/Zines.astro b/src/pages/projects/zines.astro
similarity index 100%
rename from src/pages/OurProjectsPages/Zines.astro
rename to src/pages/projects/zines.astro