small fixes

UoaWDCC · Oct 19, 2024 · 749bd3c · 749bd3c
1 parent b5cf91f
commit 749bd3c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/client/src/components/composite/EventsView/EventsView.tsx b/client/src/components/composite/EventsView/EventsView.tsx
@@ -67,7 +67,7 @@ const EventsPage = ({
         }
 
         /**
-         * Determine the ordering of each the lists
+         * Start dates ascending for upcoming and current events
          */
         buf.upcomingAndCurrentEvents.sort(
           (
@@ -131,12 +131,12 @@ const EventsPage = ({
     )
   }, [selectedEventObject])
 
-  const formattedCurrentEvents: IEventsCardPreview[] =
+  const previewCurrentEvents: IEventsCardPreview[] =
     eventList.upcomingAndCurrentEvents?.map((event) => {
       return EventRenderingUtils.previewTransformer(event, setSelectedEventId)
     }) || []
 
-  const formattedPastEvents: IEventsCardPreview[] =
+  const previewPastEvents: IEventsCardPreview[] =
     eventList.pastEvents?.map((event) => {
       return EventRenderingUtils.previewTransformer(event, setSelectedEventId)
     }) || []
@@ -155,17 +155,17 @@ const EventsPage = ({
                 Upcoming Events
               </h5>
             )}
-            {formattedCurrentEvents.map((event) => (
+            {previewCurrentEvents.map((event) => (
               <EventsCardPreview key={event.title} {...event} />
             ))}
 
-            {formattedPastEvents.map((event) => (
+            {previewPastEvents.map((event) => (
               <EventsCardPreview key={event.title} {...event} />
             ))}
           </>
         )}
 
-        {hasMoreEvents && (
+        {hasMoreEvents && !selectedEventId && (
           <Button
             variant="default"
             onClick={fetchMoreEvents}

diff --git a/client/src/components/generic/Event/EventDetailed/EventDetailed.tsx b/client/src/components/generic/Event/EventDetailed/EventDetailed.tsx
@@ -107,18 +107,20 @@ const EventDetailed = ({
           <Divider />
 
           <div className="flex flex-col gap-4">
-            <div className="text-left">{content}</div>
+            <div className="whitespace-pre-line text-left">{content}</div>
 
             {signUpOpenDate &&
               !isPastEvent &&
+              googleFormLink &&
               (signUpOpenDate <= new Date() ? (
                 <>
-                  <h5 className="font-bold uppercase">
+                  <h5 className="font-bold uppercase">Sign Ups Open!</h5>
+                  <h5 className="text-dark-blue-100 font-bold uppercase italic">
                     <a href={googleFormLink} target="_blank" rel="noreferrer">
-                      Sign Ups Open!
+                      CLICK ME TO GO TO FORM
                     </a>
                   </h5>
-                  {googleFormLink && <iframe src={googleFormLink} />}
+                  <iframe height={"500"} src={googleFormLink} />
                 </>
               ) : (
                 <>