From 3c35688b19fb833f7644d943f5a8613a111d21e3 Mon Sep 17 00:00:00 2001 From: bhavberi Date: Fri, 4 Oct 2024 11:41:34 +0000 Subject: [PATCH 1/2] Apply Prettier Formatting Fixes --- src/components/Calendar.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Calendar.jsx b/src/components/Calendar.jsx index 357303f9..d8252605 100644 --- a/src/components/Calendar.jsx +++ b/src/components/Calendar.jsx @@ -73,14 +73,14 @@ export default function Calendar({ events, holidays, allClubs }) { }; const allEvents = events?.filter( - (event) => event?.status?.state !== "deleted" + (event) => event?.status?.state !== "deleted", ); const mergedEvents = [...allEvents, ...holidays]; const handleEventMouseEnter = (info) => { const { event, el } = info; const clubName = allClubs.find( - (club) => club.cid === event.extendedProps.clubid + (club) => club.cid === event.extendedProps.clubid, )?.name; const content = `${event.title} ${ event.extendedProps.clubid ? "by" : "" @@ -122,7 +122,7 @@ export default function Calendar({ events, holidays, allClubs }) { border: 1px solid ${theme.palette.background.neutral}!important; } `} - + Date: Fri, 4 Oct 2024 18:00:27 +0530 Subject: [PATCH 2/2] Minor changes linked to CSS and a warning on events page --- src/app/cc-recruitments/all/[id]/page.jsx | 2 +- src/app/clubs/[id]/page.jsx | 1 + src/app/profile/[id]/page.jsx | 2 +- src/components/clubs/ClubBanner.jsx | 2 ++ src/components/events/EventsFilter.jsx | 2 +- src/components/members/MemberForm.jsx | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/cc-recruitments/all/[id]/page.jsx b/src/app/cc-recruitments/all/[id]/page.jsx index b8865818..a5d51933 100644 --- a/src/app/cc-recruitments/all/[id]/page.jsx +++ b/src/app/cc-recruitments/all/[id]/page.jsx @@ -90,10 +90,10 @@ export default async function CCApplicantDetails({ params }) { {user.firstName} {user.lastName} diff --git a/src/app/clubs/[id]/page.jsx b/src/app/clubs/[id]/page.jsx index 24eb8336..35148006 100644 --- a/src/app/clubs/[id]/page.jsx +++ b/src/app/clubs/[id]/page.jsx @@ -44,6 +44,7 @@ export default async function Club({ params }) { banner={club.banner} width={640} height={480} + priority={true} /> diff --git a/src/app/profile/[id]/page.jsx b/src/app/profile/[id]/page.jsx index 704eb2cc..d4767e9f 100644 --- a/src/app/profile/[id]/page.jsx +++ b/src/app/profile/[id]/page.jsx @@ -122,10 +122,10 @@ export default async function Profile({ params }) { {user.firstName} {user.lastName} diff --git a/src/components/clubs/ClubBanner.jsx b/src/components/clubs/ClubBanner.jsx index 0a5db630..4bcdde6b 100644 --- a/src/components/clubs/ClubBanner.jsx +++ b/src/components/clubs/ClubBanner.jsx @@ -21,6 +21,7 @@ export default function ClubBanner({ objectFit = null, dim = false, imageProps = {}, + priority = false, }) { const theme = useTheme(); const isDesktop = useMediaQuery(theme.breakpoints.up("lg")); @@ -63,6 +64,7 @@ export default function ClubBanner({ onError={() => setImg(getPlaceholder({ seed: name, w: width, h: height })) } + priority={priority} {...imageProps} /> {logo ? ( diff --git a/src/components/events/EventsFilter.jsx b/src/components/events/EventsFilter.jsx index e28ebf4a..fcc1dd94 100644 --- a/src/components/events/EventsFilter.jsx +++ b/src/components/events/EventsFilter.jsx @@ -120,7 +120,7 @@ export default function EventsFilter({ name, club, state }) { `${pathname}?${createQueryString("club", e.target.value)}`, ); }} - value={club} + value={clubs.length ? club : ""} > All Clubs diff --git a/src/components/members/MemberForm.jsx b/src/components/members/MemberForm.jsx index ad399df5..e177d476 100644 --- a/src/components/members/MemberForm.jsx +++ b/src/components/members/MemberForm.jsx @@ -300,7 +300,7 @@ function MemberUserInput({ control, watch, setValue, user, setUser }) { height={80} /> - + {user.firstName} {user.lastName}