Skip to content

Fix/lucas/add events #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CSES-UCSD merged 2 commits into from
Sep 30, 2025
Merged

Fix/lucas/add events #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8b6b8
added 2 events
lucashlaing Sep 30, 2025
71eafdf
comment out login
lucashlaing Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />} />
Expand Down
22 changes: 15 additions & 7 deletions frontend/src/components/Home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -43,6 +44,7 @@ const Home = () => {
const [eventsToShow, setEventsToShow] = useState(4);
const [currentEventPage, setCurrentEventPage] = useState(0);


const teamMembers = [
{
name: "Jesus Gonzalez",
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down