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

feat: parse announcement content as Markdown

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