Merge branch 'master' into scp

Clubs-Council-IIITH · Oct 4, 2024 · a9df579 · a9df579
2 parents b5c22d7 + e579cae
commit a9df579
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git 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 }) {
             <Stack direction="column" spacing={1}>
               <Typography
                 variant="h2"
-                wordWrap="break-word"
                 textAlign={{ xs: "center", lg: "left" }}
                 sx={{
                   fontSize: { xs: 25, lg: 38 },
+                  wordBreak: "break-word"
                 }}
               >
                 {user.firstName} {user.lastName}

diff --git 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}
         />
       </Card>
       <Box my={4}>

diff --git a/src/app/profile/[id]/page.jsx b/src/app/profile/[id]/page.jsx
@@ -122,10 +122,10 @@ export default async function Profile({ params }) {
             <Stack direction="column" spacing={1}>
               <Typography
                 variant="h2"
-                wordWrap="break-word"
                 textAlign={{ xs: "center", lg: "left" }}
                 sx={{
                   fontSize: { xs: 25, lg: 38 },
+                  wordBreak: "break-word"
                 }}
               >
                 {user.firstName} {user.lastName}

diff --git 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 = `<strong>${event.title}</strong> ${
       event.extendedProps.clubid ? "by" : ""
@@ -122,7 +122,7 @@ export default function Calendar({ events, holidays, allClubs }) {
           border: 1px solid ${theme.palette.background.neutral}!important;
         }
       `}</style>
-      
+
       <FullCalendar
         ref={calendarRef}
         events={mergedEvents}

diff --git 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
@@ -120,7 +120,7 @@ export default function EventsFilter({ name, club, state }) {
                   `${pathname}?${createQueryString("club", e.target.value)}`,
                 );
               }}
-              value={club}
+              value={clubs.length ? club : ""}
             >
               <MenuItem key="all" value="">
                 All Clubs

diff --git 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}
       />
       <Stack direction="column" spacing={1}>
-        <Typography variant="h4" wordWrap="break-word">
+        <Typography variant="h4" sx={{ wordBreak: "break-word" }}>
           {user.firstName} {user.lastName}
         </Typography>
         <Typography