From 2a65541f7223fb7156cd4d364d29e5b781ac63e3 Mon Sep 17 00:00:00 2001
From: Ninad-S <144244166+Ninad-S@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:53:04 -0500
Subject: [PATCH 1/3] Updated the about page

---
 src/app/about/page.tsx | 86 +++++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 2a0e1b80..af774c62 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,4 +1,4 @@
-import Header from '@src/components/header/BaseHeader';
+import Header from '@src/components/BaseHeader';
 import type { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -14,40 +14,48 @@ export const metadata: Metadata = {
 };
 
 const About = () => {
+  const teamMembers = [
+    { name: "Ethan Bickel", position: "Project Lead" },
+    { name: "Braeden Kotko", position: "Engineer" },
+    { name: "Connor Harris", position: "Engineer" },
+    { name: "Jonathan Le", position: "Engineer" },
+    { name: "Alex Vazquez", position: "Engineer" },
+    { name: "Ishaan Gupta", position: "Engineer" },
+    { name: "Ritvik Thota", position: "Engineer" }
+    
+  ];
+  const recruits= [
+    { name: "Jordan Joelson", position: "Engineer" },
+    { name: "Mansi Cherukupally", position: "Engineer" },
+    { name: "Aryav Rastogi", position: "Engineer" },
+    { name: "Sreevasan Siasubramanian", position: "Engineer" },
+    { name: "Ninad Sudarsanam", position: "Engineer" },
+    { name: "Shivesh Gupta", position: "Engineer" },
+    { name: "Natalia Sekulic", position: "Engineer" },
+    { name: "Mamoun Elmamoun", position: "Engineer" },
+    { name: "Chloe Alzaga", position: "Engineer" },
+    { name: "Joshua Perez", position: "Engineer" },
+    { name: "Ankith Ganji", position: "Engineer" },
+    { name: "Valeria Gallardo", position: "Designer" },
+    { name: "Waseef Kabir", position: "Designer" },
+    { name: "Ved Mahant", position: "Designer" }
+  ];
   return (
     <main className="h-full md:pl-72">
       <Header />
       <div className="mx-6 h-full">
-        <h1 className="p-2 py-12 text-2xl font-bold text-slate-500">
-          About us
-        </h1>
+        
         <div className="rounded-lg bg-slate-100 p-8 shadow-md">
           <h2 className="mb-4 text-lg font-semibold text-slate-500">
-            Project Jupiter
+            About Jupiter
           </h2>
-          <h3 className="mb-2 text-base text-slate-500">Our Goal</h3>
+          
           <p className="mt-2 space-y-4 text-sm font-light text-slate-500">
-            Jupiter is a user-friendly platform that can be utilized by students
-            to seamlessly join school clubs. This tool allows students to browse
-            through the list of available clubs, their activities, and
-            objectives, all in one place. Students can easily sign up for clubs
-            that interest them and receive real-time updates on events,
-            meetings, and other activities organized by the clubs. The platform
-            also enables club leaders to manage and promote their clubs more
-            efficiently, keeping members informed about important details and
-            facilitating communication between members.
-            <br />
-            <br />
-            Jupiter comes with several features that make it an ideal tool for
-            school club management. For instance, the platform provides a
-            comprehensive dashboard that enables club leaders to track
-            attendance, monitor club performance, and collect feedback from
-            members. The tool also integrates with the school&apos;s social
-            media pages and website, making it easy for students to discover
-            clubs that match their interests. With Jupiter, students can easily
-            find and join clubs, and club leaders can manage their clubs more
-            effectively, leading to more successful and fulfilling club
-            experiences for everyone involved.
+            Jupiter is a platform being developed by nebula labs in order to help students find organizations and events on and around campus.  
+            
+            Jupiter let's you track organizations you're interested in, find new organizations, and keep up to date on events you want to attend.
+            
+            For organizations we offer a better way to keep your info up to date, and for people well suited for your organization to find out about you and your events.
           </p>
         </div>
         <div className="mt-16 py-3">
@@ -55,18 +63,36 @@ const About = () => {
             Our Team
           </h1>
           <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-4">
-            {Array.from({ length: 8 }).map((_, key) => (
+            {teamMembers.map((member, key) => (
               <div
                 key={key}
                 className="rounded-lg bg-slate-100 p-5 shadow-md transition-shadow duration-300 hover:shadow-lg"
               >
                 <h2 className="mb-2 text-xl font-medium text-slate-500">
-                  Name
+                  {member.name}
                 </h2>
-                <h3 className="text-lg text-slate-500">Position</h3>
+                <h3 className="text-lg text-slate-500">{member.position}</h3>
               </div>
             ))}
           </div>
+          <div className="mt-16 py-3">
+          <h1 className="mb-10 text-center text-3xl font-bold text-slate-500">
+            Recruits
+          </h1>
+          <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-4">
+            {recruits.map((member, key) => (
+              <div
+                key={key}
+                className="rounded-lg bg-slate-100 p-5 shadow-md transition-shadow duration-300 hover:shadow-lg"
+              >
+                <h2 className="mb-2 text-xl font-medium text-slate-500">
+                  {member.name}
+                </h2>
+                <h3 className="text-lg text-slate-500">{member.position}</h3>
+              </div>
+            ))}
+          </div>
+          </div>
         </div>
       </div>
     </main>

From 090abc1a54ded1eb9455de507bf471e37788c8d9 Mon Sep 17 00:00:00 2001
From: Ethan Bickel <notethanbickel@gmail.com>
Date: Tue, 8 Oct 2024 14:35:08 -0500
Subject: [PATCH 2/3] Fix Import on about page

---
 src/app/about/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index af774c62..b2e356f8 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,4 +1,4 @@
-import Header from '@src/components/BaseHeader';
+import Header from '@src/components/header/BaseHeader';
 import type { Metadata } from 'next';
 
 export const metadata: Metadata = {

From b7a9e23061a8baa3f18a0361508bedac3b298dfc Mon Sep 17 00:00:00 2001
From: Ethan Bickel <notethanbickel@gmail.com>
Date: Tue, 8 Oct 2024 14:44:41 -0500
Subject: [PATCH 3/3] formatting fixes

---
 src/app/about/page.tsx | 111 ++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index b2e356f8..1b0b80fb 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -15,47 +15,66 @@ export const metadata: Metadata = {
 
 const About = () => {
   const teamMembers = [
-    { name: "Ethan Bickel", position: "Project Lead" },
-    { name: "Braeden Kotko", position: "Engineer" },
-    { name: "Connor Harris", position: "Engineer" },
-    { name: "Jonathan Le", position: "Engineer" },
-    { name: "Alex Vazquez", position: "Engineer" },
-    { name: "Ishaan Gupta", position: "Engineer" },
-    { name: "Ritvik Thota", position: "Engineer" }
-    
+    { name: 'Ethan Bickel', position: 'Project Lead' },
+    { name: 'Braeden Kotko', position: 'Engineer' },
+    { name: 'Connor Harris', position: 'Engineer' },
+    { name: 'Jonathan Le', position: 'Engineer' },
+    { name: 'Alex Vazquez', position: 'Engineer' },
+    { name: 'Ishaan Gupta', position: 'Engineer' },
+    { name: 'Ritvik Thota', position: 'Engineer' },
   ];
-  const recruits= [
-    { name: "Jordan Joelson", position: "Engineer" },
-    { name: "Mansi Cherukupally", position: "Engineer" },
-    { name: "Aryav Rastogi", position: "Engineer" },
-    { name: "Sreevasan Siasubramanian", position: "Engineer" },
-    { name: "Ninad Sudarsanam", position: "Engineer" },
-    { name: "Shivesh Gupta", position: "Engineer" },
-    { name: "Natalia Sekulic", position: "Engineer" },
-    { name: "Mamoun Elmamoun", position: "Engineer" },
-    { name: "Chloe Alzaga", position: "Engineer" },
-    { name: "Joshua Perez", position: "Engineer" },
-    { name: "Ankith Ganji", position: "Engineer" },
-    { name: "Valeria Gallardo", position: "Designer" },
-    { name: "Waseef Kabir", position: "Designer" },
-    { name: "Ved Mahant", position: "Designer" }
+  const recruits = [
+    { name: 'Jordan Joelson', position: 'Engineer' },
+    { name: 'Mansi Cherukupally', position: 'Engineer' },
+    { name: 'Aryav Rastogi', position: 'Engineer' },
+    { name: 'Sreevasan Siasubramanian', position: 'Engineer' },
+    { name: 'Ninad Sudarsanam', position: 'Engineer' },
+    { name: 'Shivesh Gupta', position: 'Engineer' },
+    { name: 'Natalia Sekulic', position: 'Engineer' },
+    { name: 'Mamoun Elmamoun', position: 'Engineer' },
+    { name: 'Chloe Alzaga', position: 'Engineer' },
+    { name: 'Joshua Perez', position: 'Engineer' },
+    { name: 'Ankith Ganji', position: 'Engineer' },
+    { name: 'Valeria Gallardo', position: 'Designer' },
+    { name: 'Waseef Kabir', position: 'Designer' },
+    { name: 'Ved Mahant', position: 'Designer' },
   ];
   return (
     <main className="h-full md:pl-72">
       <Header />
       <div className="mx-6 h-full">
-        
         <div className="rounded-lg bg-slate-100 p-8 shadow-md">
           <h2 className="mb-4 text-lg font-semibold text-slate-500">
             About Jupiter
           </h2>
-          
+
+          <p className="mt-2 space-y-4 text-sm font-light text-slate-500">
+            Jupiter is a platform being developed by nebula labs in order to
+            help students find organizations and events on and around campus.
+            <br />
+            You&apos;re able to track organizations you&apos;re interested in,
+            find new organizations, and keep up to date on events you want to
+            attend.
+            <br />
+            For organizations we offer a better way to keep your info up to
+            date, and for people well suited for your organization to find out
+            about you and your events.
+          </p>
           <p className="mt-2 space-y-4 text-sm font-light text-slate-500">
-            Jupiter is a platform being developed by nebula labs in order to help students find organizations and events on and around campus.  
-            
-            Jupiter let's you track organizations you're interested in, find new organizations, and keep up to date on events you want to attend.
-            
-            For organizations we offer a better way to keep your info up to date, and for people well suited for your organization to find out about you and your events.
+            If you&apos;re interested in contributing to Jupiter check out the{' '}
+            <a
+              href="https://discord.utdnebula.com/"
+              className="text-blue-primary hover:underline"
+            >
+              Nebula Discord
+            </a>
+            , or our{' '}
+            <a
+              href="https://github.com/UTDNebula/jupiter"
+              className="text-blue-primary hover:underline"
+            >
+              Github
+            </a>
           </p>
         </div>
         <div className="mt-16 py-3">
@@ -76,22 +95,22 @@ const About = () => {
             ))}
           </div>
           <div className="mt-16 py-3">
-          <h1 className="mb-10 text-center text-3xl font-bold text-slate-500">
-            Recruits
-          </h1>
-          <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-4">
-            {recruits.map((member, key) => (
-              <div
-                key={key}
-                className="rounded-lg bg-slate-100 p-5 shadow-md transition-shadow duration-300 hover:shadow-lg"
-              >
-                <h2 className="mb-2 text-xl font-medium text-slate-500">
-                  {member.name}
-                </h2>
-                <h3 className="text-lg text-slate-500">{member.position}</h3>
-              </div>
-            ))}
-          </div>
+            <h1 className="mb-10 text-center text-3xl font-bold text-slate-500">
+              Recruits
+            </h1>
+            <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-4">
+              {recruits.map((member, key) => (
+                <div
+                  key={key}
+                  className="rounded-lg bg-slate-100 p-5 shadow-md transition-shadow duration-300 hover:shadow-lg"
+                >
+                  <h2 className="mb-2 text-xl font-medium text-slate-500">
+                    {member.name}
+                  </h2>
+                  <h3 className="text-lg text-slate-500">{member.position}</h3>
+                </div>
+              ))}
+            </div>
           </div>
         </div>
       </div>