Skip to content
Snippets Groups Projects
Commit 0c423ed7 authored by xaralis's avatar xaralis
Browse files

feat: parse announcement content as Markdown

parent 08d767ce
No related branches found
No related tags found
No related merge requests found
Pipeline #1939 passed
......@@ -75,6 +75,10 @@ const Announcement = ({
"announcement",
].includes(type);
const htmlContent = {
__html: content,
};
return (
<div className={wrapperClassName} ref={ref}>
<div className="flex items-center justify-between mb-2">
......@@ -117,7 +121,10 @@ const Announcement = ({
</DropdownMenu>
)}
</div>
<span className="leading-tight text-sm lg:text-base">{content}</span>
<div
className="leading-tight text-sm lg:text-base content-block"
dangerouslySetInnerHTML={htmlContent}
></div>
</div>
);
};
......
......@@ -43,7 +43,7 @@ const AnnouncementList = ({
key={item.id}
datetime={item.datetime}
type={item.type}
content={item.content}
content={item.contentHtml}
link={item.link}
seen={item.seen}
canRunActions={canRunActions}
......
......@@ -164,6 +164,7 @@ export const parseRawPost = (rawPost) => {
export const parseRawAnnouncement = (rawAnnouncement) => {
const announcement = {
...pick(rawAnnouncement, ["id", "content", "link"]),
contentHtml: markdownConverter.makeHtml(rawAnnouncement.content),
datetime: parse(
rawAnnouncement.datetime,
"yyyy-MM-dd HH:mm:ss",
......
......@@ -70,6 +70,7 @@ declare namespace CF2021 {
datetime: Date;
type: AnnouncementType;
content: string;
contentHtml: string;
link?: string;
relatedPostId: string;
seen: boolean;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment