using rich-text for event description

SSWConsulting · Jun 17, 2024 · cea8f1e · cea8f1e
1 parent bc943a0
commit cea8f1e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/app/live-steam-banner/liveStreamWidget.tsx b/app/live-steam-banner/liveStreamWidget.tsx
@@ -246,9 +246,7 @@ export const LiveStreamWidget = ({ isLive, event }: LiveStreamWidgetProps) => {
                     }
                   )}
                 >
-                  {event?.description
-                    .split("\n\n")
-                    .map((p, i) => <p key={i}>{p}</p>)}
+                  <TinaMarkdown content={event.description} />
                 </div>
                 {eventDescriptionCollapsable && (
                   <div

diff --git a/components/blocks/upcomingEvents.tsx b/components/blocks/upcomingEvents.tsx
@@ -106,7 +106,7 @@ const UpcomingEvent = ({ event }: UpcomingEventProps) => {
           <div className="col-span-1 flex items-center justify-center sm:mr-2 sm:justify-end">
             <Image
               className={"rounded-md"}
-              src={event.thumbnail.url}
+              src={event.thumbnail?.url}
               alt={`${event.title} logo`}
               width={90}
               height={90}

diff --git a/components/filter/events.tsx b/components/filter/events.tsx
@@ -44,7 +44,7 @@ export type EventTrimmed = {
   presenterProfileUrl?: string;
   calendarType?: string;
   category?: string;
-  description?: string;
+  description?: TinaMarkdownContent;
 };
 
 export const EventsFilter = ({
@@ -282,9 +282,7 @@ const Event = ({ visible, event, jsonLd }: EventProps) => {
           </div>
         </div>
         <div className="prose max-w-full prose-img:mx-1 prose-img:my-0 prose-img:inline">
-          {event.description.split("\n\n").map((p, i) => (
-            <p key={i}>{p}</p>
-          ))}
+          <TinaMarkdown content={event?.description} />
         </div>
         <div className="mb-1 mt-6 p-0 text-end">
           <CustomLink

diff --git a/components/liveStream/liveStreamWidget.tsx b/components/liveStream/liveStreamWidget.tsx
@@ -247,9 +247,7 @@ export const LiveStreamWidget = ({ isLive, event }: LiveStreamWidgetProps) => {
                     }
                   )}
                 >
-                  {event?.description
-                    .split("\n\n")
-                    .map((p, i) => <p key={i}>{p}</p>)}
+                  <TinaMarkdown content={event.description} />
                 </div>
                 {eventDescriptionCollapsable && (
                   <div

diff --git a/tina/collections/events-calendar.tsx b/tina/collections/events-calendar.tsx
@@ -190,12 +190,9 @@ export const eventsCalendarSchema: Collection = {
         "Only necessary for User Groups - shown on the landing page for user groups e.g. https://www.ssw.com.au/netug/sydney Ensure this is concise enough to fit on the above page, and does not double up on any information that already exists on the page",
     },
     {
-      type: "string",
+      type: "rich-text",
       label: "Description",
       name: "description",
-      ui: {
-        component: "textarea",
-      },
     },
     {
       type: "object",

diff --git a/tina/tina-lock.json b/tina/tina-lock.json