From 0e8b6b8e4b5017bb195de4c419a0f16d63701f76 Mon Sep 17 00:00:00 2001
From: lucashlaing <mhlaing@ucsd.edu>
Date: Tue, 30 Sep 2025 00:05:33 -0700
Subject: [PATCH 1/2] added 2 events

---
 frontend/src/App.tsx                  |  2 +-
 frontend/src/components/Home/Home.tsx | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index b7cfdb3..00dada1 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -28,7 +28,7 @@ function App() {
           <Route path="/events" element={<Events />} />
           <Route path="/opportunities" element={<Opportunities />} />
           <Route path="/membership" element={<Membership />} />
-          {/* <Route path="/login" element={<Login />} /> */}
+           <Route path="/login" element={<Login />} /> 
           <Route path="/editprofile" element={<EditForm />} />
           <Route path="/initiatives" element={<Initiatives />} />
           <Route path="/templatewebsite" element={<TemplateWebsite />} />
diff --git a/frontend/src/components/Home/Home.tsx b/frontend/src/components/Home/Home.tsx
index ea26d5e..ae92e06 100644
--- a/frontend/src/components/Home/Home.tsx
+++ b/frontend/src/components/Home/Home.tsx
@@ -18,6 +18,7 @@ import pranavsoma from '../../images/homepage/pranavsoma.jpg';
 import nikithamaderamitla from '../../images/homepage/nikithaM.jpg';
 import westonzong from '../../images/homepage/westonzong.jpg';
 import vanditajain from '../../images/homepage/vanditajain.jpg';
+import EventCard from '../NewEvents/EventCard';
 
 
 interface EventData {
@@ -43,6 +44,7 @@ const Home = () => {
   const [eventsToShow, setEventsToShow] = useState(4);
   const [currentEventPage, setCurrentEventPage] = useState(0);
 
+
   const teamMembers = [
     {
       name: "Jesus Gonzalez",
@@ -265,7 +267,7 @@ const Home = () => {
                   <Box sx={styles.statsNumber}>
                     <CountUp end={totalEvents} duration={2} />+
                   </Box>
-                  <Box sx={styles.statsLabel}>Events</Box>
+                  <Box sx={styles.statsLabel}>Annual Events</Box>
                 </Box>
               </Grid>
 
@@ -295,17 +297,23 @@ const Home = () => {
               <Grid container spacing={3} justifyContent="center" sx={styles.eventsGrid}>
                 {displayedFutureEvents.length > 0 ? (
                   displayedFutureEvents.map((event, index) => (
-                    <Grid item xs={12} sm={12} md={3} key={event._id}>
-                      <Box sx={styles.eventCard}>
-                        <Box sx={styles.eventCardContent}></Box>
-                        <Box sx={styles.eventLabel}>{event.title}</Box>
-                      </Box>
+                    <Grid item xs={12} sm={6} md={4} key={event._id}>
+                      <EventCard
+                        title={event.title}
+                        startDate={event.start_time}
+                        endDate={event.end_time}
+                        location={event.location}
+                        calendar_link={event.calendar_link}
+                        description={event.description}
+                        instagram_link={event.instagram_link}
+                        _id={event._id}
+                      />
                     </Grid>
                   ))
                 ) : (
                   // Fallback for when no events are available
                   Array.from({ length: eventsToShow }, (_, index) => index + 1).map((event, index) => (
-                    <Grid item xs={12} sm={12} md={3} key={index}>
+                    <Grid item xs={12} sm={12} md={4} key={index}>
                       <Box sx={styles.eventCard}>
                         <Box sx={styles.eventCardContent}></Box>
                         <Box sx={styles.eventLabel}>[Event {event}]</Box>

From 71eafdfec7f6cfc960f3c0e40aeaca9d5d6dea92 Mon Sep 17 00:00:00 2001
From: lucashlaing <mhlaing@ucsd.edu>
Date: Tue, 30 Sep 2025 00:09:33 -0700
Subject: [PATCH 2/2] comment out login

---
 frontend/src/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 00dada1..b44f31c 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -28,7 +28,7 @@ function App() {
           <Route path="/events" element={<Events />} />
           <Route path="/opportunities" element={<Opportunities />} />
           <Route path="/membership" element={<Membership />} />
-           <Route path="/login" element={<Login />} /> 
+          { /* <Route path="/login" element={<Login />} /> */}
           <Route path="/editprofile" element={<EditForm />} />
           <Route path="/initiatives" element={<Initiatives />} />
           <Route path="/templatewebsite" element={<TemplateWebsite />} />